diff options
Diffstat (limited to 'meta/packages')
31 files changed, 282 insertions, 69 deletions
diff --git a/meta/packages/apt/apt-0.6.45exp2/noconfigure.patch b/meta/packages/apt/apt-0.6.45exp2/noconfigure.patch new file mode 100644 index 0000000000..682a96da24 --- /dev/null +++ b/meta/packages/apt/apt-0.6.45exp2/noconfigure.patch @@ -0,0 +1,35 @@ +--- + apt-pkg/packagemanager.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +--- apt-0.6.45exp2.orig/apt-pkg/packagemanager.cc ++++ apt-0.6.45exp2/apt-pkg/packagemanager.cc +@@ -534,10 +534,12 @@ bool pkgPackageManager::SmartUnPack(PkgI + + List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States); + ++#if 0 + // Perform immedate configuration of the package. + if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true) + if (SmartConfigure(Pkg) == false) + return _error->Error("Internal Error, Could not perform immediate configuration (2) on %s",Pkg.Name()); ++#endif + + return true; + } +@@ -609,6 +611,7 @@ pkgPackageManager::OrderResult pkgPackag + DoneSomething = true; + } + ++#if 0 + // Final run through the configure phase + if (ConfigureAll() == false) + return Failed; +@@ -623,6 +626,7 @@ pkgPackageManager::OrderResult pkgPackag + return Failed; + } + } ++#endif + + return Completed; + } diff --git a/meta/packages/apt/apt-native.inc b/meta/packages/apt/apt-native.inc index 4ace9e94bb..de9426bf70 100644 --- a/meta/packages/apt/apt-native.inc +++ b/meta/packages/apt/apt-native.inc @@ -19,39 +19,43 @@ python do_stage_config () { data = bb.data.expand(data, d) - outpath = bb.data.expand('${STAGING_DIR}/${sysconfdir}/apt.conf', d) + outdir = os.path.join(bb.data.getVar('sysconfdir', d, 1), 'apt') + if not os.path.exists(outdir): + os.makedirs(outdir) + outpath = os.path.join(outdir, 'apt.conf') + outfile = file(outpath, 'w') outfile.write(data) outfile.close() } do_stage_base () { - install -d ${STAGING_BINDIR} - install -m 0755 bin/apt-cdrom ${STAGING_BINDIR}/ - install -m 0755 bin/apt-get ${STAGING_BINDIR}/ - install -m 0755 bin/apt-config ${STAGING_BINDIR}/ - install -m 0755 bin/apt-cache ${STAGING_BINDIR}/ + install -d ${bindir} + install -m 0755 bin/apt-cdrom ${bindir}/ + install -m 0755 bin/apt-get ${bindir}/ + install -m 0755 bin/apt-config ${bindir}/ + install -m 0755 bin/apt-cache ${bindir}/ - install -m 0755 bin/apt-sortpkgs ${STAGING_BINDIR}/ - install -m 0755 bin/apt-extracttemplates ${STAGING_BINDIR}/ + install -m 0755 bin/apt-sortpkgs ${bindir}/ + install -m 0755 bin/apt-extracttemplates ${bindir}/ eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` - oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${STAGING_LIBDIR}/ - ln -sf libapt-pkg$GLIBC_VER-6.so ${STAGING_LIBDIR}/libapt-pkg.so - oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${STAGING_LIBDIR}/ - ln -sf libapt-inst$GLIBC_VER-6.so ${STAGING_LIBDIR}/libapt-inst.so - - install -d ${STAGING_LIBDIR}/apt/methods - install -m 0755 bin/methods/* ${STAGING_LIBDIR}/apt/methods/ - - install -d ${STAGING_LIBDIR}/dpkg/methods/apt - install -m 0644 dselect/desc.apt ${STAGING_LIBDIR}/dpkg/methods/apt/ - install -m 0644 dselect/names ${STAGING_LIBDIR}/dpkg/methods/apt/ - install -m 0755 dselect/install ${STAGING_LIBDIR}/dpkg/methods/apt/ - install -m 0755 dselect/setup ${STAGING_LIBDIR}/dpkg/methods/apt/ - install -m 0755 dselect/update ${STAGING_LIBDIR}/dpkg/methods/apt/ - - install -d ${STAGING_DIR}${sysconfdir}/apt - install -d ${STAGING_DIR}${localstatedir}/lib/apt/lists/partial - install -d ${STAGING_DIR}${localstatedir}/cache/apt/archives/partial + oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${libdir}/ + ln -sf libapt-pkg$GLIBC_VER-6.so ${libdir}/libapt-pkg.so + oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${libdir}/ + ln -sf libapt-inst$GLIBC_VER-6.so ${libdir}/libapt-inst.so + + install -d ${libdir}/apt/methods + install -m 0755 bin/methods/* ${libdir}/apt/methods/ + + install -d ${libdir}/dpkg/methods/apt + install -m 0644 dselect/desc.apt ${libdir}/dpkg/methods/apt/ + install -m 0644 dselect/names ${libdir}/dpkg/methods/apt/ + install -m 0755 dselect/install ${libdir}/dpkg/methods/apt/ + install -m 0755 dselect/setup ${libdir}/dpkg/methods/apt/ + install -m 0755 dselect/update ${libdir}/dpkg/methods/apt/ + + install -d ${sysconfdir}/apt + install -d ${localstatedir}/lib/apt/lists/partial + install -d ${localstatedir}/cache/apt/archives/partial } diff --git a/meta/packages/apt/apt-native_0.6.45exp2.bb b/meta/packages/apt/apt-native_0.6.45exp2.bb index 32f19e8e4c..43f73889f7 100644 --- a/meta/packages/apt/apt-native_0.6.45exp2.bb +++ b/meta/packages/apt/apt-native_0.6.45exp2.bb @@ -1,3 +1,4 @@ require apt-native.inc -SRC_URI += "file://nodoc.patch;patch=1" +SRC_URI += "file://nodoc.patch;patch=1 \ + file://noconfigure.patch;patch=1" diff --git a/meta/packages/apt/files/apt.conf b/meta/packages/apt/files/apt.conf index 944233c347..37785871db 100644 --- a/meta/packages/apt/files/apt.conf +++ b/meta/packages/apt/files/apt.conf @@ -3,7 +3,7 @@ Dir "${STAGING_DIR}/" State "var/lib/apt/" { Lists "lists/"; - status "${IMAGE_ROOTFS}/${localstatedir}/lib/dpkg/status"; + status "${IMAGE_ROOTFS}/var/dpkg/status"; }; Cache "var/cache/apt/" { @@ -22,3 +22,17 @@ Dir "${STAGING_DIR}/" apt-cache "apt-cache"; }; }; + +APT +{ + Immediate-Configure "false"; + Architecture "i586"; + Get + { + Assume-Yes "true"; + Force-Yes "true" + }; +}; + +DPkg::Options {"--root=${IMAGE_ROOTFS}";"--admindir=${IMAGE_ROOTFS}/var/dpkg";"--force-all";"--no-debsig"}; +}; diff --git a/meta/packages/dpkg/dpkg-native_1.13.22.bb b/meta/packages/dpkg/dpkg-native_1.13.22.bb index 2f196c2ea6..db71ab08e8 100644 --- a/meta/packages/dpkg/dpkg-native_1.13.22.bb +++ b/meta/packages/dpkg/dpkg-native_1.13.22.bb @@ -1,8 +1,9 @@ require dpkg.inc +PR = "r1" +DEPENDS += "ncurses-native zlib-native virtual/update-alternatives" SRC_URI += "file://noman.patch;patch=1" inherit native -inherit autotools gettext EXTRA_OECONF = "--without-static-progs \ --without-dselect \ diff --git a/meta/packages/dpkg/dpkg.inc b/meta/packages/dpkg/dpkg.inc index 3c3f29c304..0d2053ab0f 100644 --- a/meta/packages/dpkg/dpkg.inc +++ b/meta/packages/dpkg/dpkg.inc @@ -1,10 +1,34 @@ DESCRIPTION = "Package maintenance system for Debian." LICENSE = "GPL" SECTION = "base" -DEPENDS = "ncurses zlib" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" -SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz" +SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \ + file://noupdalt.patch;patch=1" S = "${WORKDIR}/dpkg-${PV}" +DEPENDS_${PN} += "update-alternatives" + PARALLEL_MAKE = "" + +inherit autotools gettext + +DPKG_INIT_POSITION = "98" +DPKG_INIT_POSITION_slugos = "41" + +pkg_postinst_dpkg () { +#!/bin/sh +if [ "x$D" != "x" ]; then + install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d + # this happens at S98 where our good 'ole packages script used to run + echo -e "#!/bin/sh + dpkg --configure -a +" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure + chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure +fi +} + +do_configure () { + echo >> m4/compiler.m4 + autotools_do_configure +} diff --git a/meta/packages/dpkg/dpkg_1.13.22.bb b/meta/packages/dpkg/dpkg_1.13.22.bb index 08a9c06fbf..bcf45392b4 100644 --- a/meta/packages/dpkg/dpkg_1.13.22.bb +++ b/meta/packages/dpkg/dpkg_1.13.22.bb @@ -1,7 +1,6 @@ require dpkg.inc -DEPENDS += "bzip2" - -inherit autotools gettext +PR = "r2" +DEPENDS += "ncurses zlib bzip2" EXTRA_OECONF = "--without-static-progs \ --without-dselect \ diff --git a/meta/packages/dpkg/files/nochroot.patch b/meta/packages/dpkg/files/nochroot.patch new file mode 100644 index 0000000000..3a8beaebbf --- /dev/null +++ b/meta/packages/dpkg/files/nochroot.patch @@ -0,0 +1,18 @@ +--- + src/help.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- dpkg-1.13.22.orig/src/help.c ++++ dpkg-1.13.22/src/help.c +@@ -175,9 +175,11 @@ static const char* preexecscript(const c + */ + size_t instdirl; + ++#if 0 + if (*instdir) { + if (chroot(instdir)) ohshite(_("failed to chroot to `%.250s'"),instdir); + } ++#endif + if (f_debug & dbg_scripts) { + fprintf(stderr,"D0%05o: fork/exec %s (",dbg_scripts,path); + while (*++argv) fprintf(stderr," %s",*argv); diff --git a/meta/packages/dpkg/files/noupdalt.patch b/meta/packages/dpkg/files/noupdalt.patch new file mode 100644 index 0000000000..023e99ae8d --- /dev/null +++ b/meta/packages/dpkg/files/noupdalt.patch @@ -0,0 +1,16 @@ +--- + scripts/Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- dpkg-1.13.22.orig/scripts/Makefile.am ++++ dpkg-1.13.22/scripts/Makefile.am +@@ -20,8 +20,7 @@ bin_SCRIPTS = \ + sbin_SCRIPTS = \ + cleanup-info \ + dpkg-divert \ +- dpkg-statoverride \ +- update-alternatives ++ dpkg-statoverride + + changelogdir = $(pkglibdir)/parsechangelog + changelog_SCRIPTS = \ diff --git a/meta/packages/glibc/glibc-package.bbclass b/meta/packages/glibc/glibc-package.bbclass index 3ce10b54de..6b191434ed 100644 --- a/meta/packages/glibc/glibc-package.bbclass +++ b/meta/packages/glibc/glibc-package.bbclass @@ -194,6 +194,10 @@ python package_do_split_gconvs () { if m: dp = legitimize_package_name('glibc-localedata-%s' % m.group(1)) if not dp in deps: + if '<' in dp: + bb.note('warning, dp is %s' % dp) + bb.note(' fn is %s' % fn) + bb.note(' line was %s' % l) deps.append(dp) f.close() if deps != []: diff --git a/meta/packages/images/oh-image-base.bb b/meta/packages/images/oh-image-base.bb index 2bc152b998..4a61e70519 100644 --- a/meta/packages/images/oh-image-base.bb +++ b/meta/packages/images/oh-image-base.bb @@ -6,7 +6,7 @@ DEPENDS = "task-oh" RDEPENDS = "task-oh-boot task-oh-boot-extras" -export IPKG_INSTALL = "${RDEPENDS}" +export PACKAGE_INSTALL = "${RDEPENDS}" -inherit image_ipk +inherit image LICENSE = MIT diff --git a/meta/packages/images/oh-image-core.bb b/meta/packages/images/oh-image-core.bb index 73f7afbe16..e416d84843 100644 --- a/meta/packages/images/oh-image-core.bb +++ b/meta/packages/images/oh-image-core.bb @@ -9,7 +9,7 @@ RDEPENDS = "\ task-oh-boot-extras \ task-oh-base " -export IPKG_INSTALL = "${RDEPENDS}" +export PACKAGE_INSTALL = "${RDEPENDS}" -inherit image_ipk +inherit image LICENSE = MIT diff --git a/meta/packages/images/oh-image-pda.bb b/meta/packages/images/oh-image-pda.bb index de2f3e0a4c..d4576a0c55 100644 --- a/meta/packages/images/oh-image-pda.bb +++ b/meta/packages/images/oh-image-pda.bb @@ -12,7 +12,7 @@ RDEPENDS = "\ ${@base_conditional("DISTRO_TYPE", "debug", "task-oh-devtools", "",d)} \ ${@base_conditional("DISTRO_TYPE", "debug", "task-oh-testapps", "",d)} " -export IPKG_INSTALL = "${RDEPENDS}" +export PACKAGE_INSTALL = "${RDEPENDS}" -inherit image_ipk +inherit image LICENSE = MIT diff --git a/meta/packages/images/oh-image-sdk.bb b/meta/packages/images/oh-image-sdk.bb index 71b1c300b5..08e37a7b89 100644 --- a/meta/packages/images/oh-image-sdk.bb +++ b/meta/packages/images/oh-image-sdk.bb @@ -15,7 +15,7 @@ RDEPENDS = "\ task-oh-testapps \ task-oh-sdk " -export IPKG_INSTALL = "${RDEPENDS}" +export PACKAGE_INSTALL = "${RDEPENDS}" -inherit image_ipk +inherit image LICENSE = MIT diff --git a/meta/packages/ipkg/files/noupdalt.patch b/meta/packages/ipkg/files/noupdalt.patch new file mode 100644 index 0000000000..f668e82f6b --- /dev/null +++ b/meta/packages/ipkg/files/noupdalt.patch @@ -0,0 +1,15 @@ +--- + Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +--- C.orig/Makefile.am ++++ C/Makefile.am +@@ -10,8 +10,6 @@ bin_PROGRAMS = ipkg-cl + + lib_LTLIBRARIES = libipkg.la + +-bin_SCRIPTS = update-alternatives +- + # ipkg_LDADD = libbb/libbb.a replace/libreplace.a + + #ipkg_cl_LDADD = libipkg.la libbb/libbb.la replace/libreplace.a diff --git a/meta/packages/ipkg/ipkg-native.inc b/meta/packages/ipkg/ipkg-native.inc index b52b7b5e20..070086a638 100644 --- a/meta/packages/ipkg/ipkg-native.inc +++ b/meta/packages/ipkg/ipkg-native.inc @@ -7,6 +7,6 @@ inherit native EXTRA_OECONF += "--with-ipkgdir=${target_libdir}/ipkg" -DEPENDS = "libtool-native automake-native" +DEPENDS = "libtool-native automake-native virtual/update-alternatives" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-${PV}" PROVIDES = "" diff --git a/meta/packages/ipkg/ipkg.inc b/meta/packages/ipkg/ipkg.inc index 49bdd22c08..e72ece633b 100644 --- a/meta/packages/ipkg/ipkg.inc +++ b/meta/packages/ipkg/ipkg.inc @@ -5,13 +5,15 @@ LICENSE = "GPL" PROVIDES = "virtual/ipkg libipkg" PACKAGES =+ "libipkg-dev libipkg" +RDEPENDS_${PN} += "update-alternatives" FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so" FILES_libipkg = "${libdir}" AUTO_LIBNAME_PKGS = "libipkg" SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \ file://fix_tar_extension.patch;patch=1 \ - file://terse.patch;patch=1" + file://terse.patch;patch=1 \ + file://noupdalt.patch;patch=1" S = "${WORKDIR}/ipkg/C" diff --git a/meta/packages/ipkg/ipkg_0.99.154.bb b/meta/packages/ipkg/ipkg_0.99.154.bb index 20a1996658..eb36fa67cb 100644 --- a/meta/packages/ipkg/ipkg_0.99.154.bb +++ b/meta/packages/ipkg/ipkg_0.99.154.bb @@ -1,2 +1,2 @@ require ipkg.inc -PR = "r4" +PR = "r5" diff --git a/meta/packages/ncurses/ncurses.inc b/meta/packages/ncurses/ncurses.inc index 030cd1034c..bc0bb4603c 100644 --- a/meta/packages/ncurses/ncurses.inc +++ b/meta/packages/ncurses/ncurses.inc @@ -3,8 +3,8 @@ HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html" LICENSE = "MIT" SECTION = "libs" DEPENDS = "ncurses-native" -PACKAGES_prepend = "ncurses-tools " -PACKAGES_append = " ncurses-terminfo" +PACKAGES =+ "ncurses-tools " +PACKAGES += " ncurses-terminfo" FILES_ncurses_append = " ${datadir}/tabset" RSUGGESTS_${PN} = "ncurses-terminfo" RPROVIDES = "libncurses5" diff --git a/meta/packages/sysfsutils/sysfsutils_2.0.0.bb b/meta/packages/sysfsutils/sysfsutils_2.0.0.bb index 176c8870e4..252990cba5 100644 --- a/meta/packages/sysfsutils/sysfsutils_2.0.0.bb +++ b/meta/packages/sysfsutils/sysfsutils_2.0.0.bb @@ -12,8 +12,8 @@ inherit autotools includedir += "/sysfs" -PACKAGES_prepend = "libsysfs " -FILES_libsysfs = "${libdir}/*.so.2.0.0" +# PACKAGES_prepend = "libsysfs " +# FILES_libsysfs = "${libdir}/*.so.2.0.0" do_stage () { oe_libinstall -a -so -C lib libsysfs ${STAGING_LIBDIR} diff --git a/meta/packages/tasks/task-oh.bb b/meta/packages/tasks/task-oh.bb index 6b8125966b..e0ffb73cfb 100644 --- a/meta/packages/tasks/task-oh.bb +++ b/meta/packages/tasks/task-oh.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Tasks for OpenedHand Poky" MAINTAINER = "Richard Purdie <richard@openedhand.com>" -PR = "r41" +PR = "r42" PACKAGES = "\ task-oh-base \ @@ -27,7 +27,7 @@ RDEPENDS_task-oh-boot = "\ modutils-initscripts \ fuser \ setserial \ - ipkg \ + update-alternatives \ module-init-tools-depmod" # linux-hotplug \ diff --git a/meta/packages/update-alternatives/update-alternatives-cworth-native_0.99.154.bb b/meta/packages/update-alternatives/update-alternatives-cworth-native_0.99.154.bb new file mode 100644 index 0000000000..99f8c07244 --- /dev/null +++ b/meta/packages/update-alternatives/update-alternatives-cworth-native_0.99.154.bb @@ -0,0 +1,11 @@ +require update-alternatives-cworth.inc +inherit native + +PROVIDES += "virtual/update-alternatives" + +do_stage () { + install -d ${sbindir} \ + ${libdir}/ipkg/alternatives + + install -m 0755 update-alternatives ${sbindir}/update-alternatives +} diff --git a/meta/packages/update-alternatives/update-alternatives-cworth.inc b/meta/packages/update-alternatives/update-alternatives-cworth.inc new file mode 100644 index 0000000000..e5bf1c8e27 --- /dev/null +++ b/meta/packages/update-alternatives/update-alternatives-cworth.inc @@ -0,0 +1,6 @@ +LICENSE = "GPL" +SECTION = "base" +MAINTAINER = "Chris Larson <kergoth@handhelds.org>" +SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')}" +S = "${WORKDIR}/ipkg/C" +PACKAGE_ARCH = "all" diff --git a/meta/packages/update-alternatives/update-alternatives-cworth_0.99.154.bb b/meta/packages/update-alternatives/update-alternatives-cworth_0.99.154.bb new file mode 100644 index 0000000000..18dab4e65f --- /dev/null +++ b/meta/packages/update-alternatives/update-alternatives-cworth_0.99.154.bb @@ -0,0 +1,11 @@ +require update-alternatives-cworth.inc + +RPROVIDES_${PN} = "update-alternatives" + +do_install () { + install -d ${D}${sbindir} \ + ${D}${sysconfdir}/alternatives \ + ${D}${libdir}/ipkg/alternatives + + install -m 0755 update-alternatives ${D}${sbindir}/update-alternatives +} diff --git a/meta/packages/update-alternatives/update-alternatives-dpkg-native_1.13.22.bb b/meta/packages/update-alternatives/update-alternatives-dpkg-native_1.13.22.bb new file mode 100644 index 0000000000..f621e6a13f --- /dev/null +++ b/meta/packages/update-alternatives/update-alternatives-dpkg-native_1.13.22.bb @@ -0,0 +1,14 @@ +require update-alternatives-dpkg.inc +inherit native + +PROVIDES += "virtual/update-alternatives" +DEPENDS += "perl-native dpkg-native" +DEFAULT_PREFERENCE = "-1" + +do_stage () { + install -d ${sbindir} \ + ${localstatedir}/dpkg/alternatives \ + ${sysconfdir}/alternatives + + install -m 0755 scripts/update-alternatives ${sbindir}/update-alternatives +} diff --git a/meta/packages/update-alternatives/update-alternatives-dpkg.inc b/meta/packages/update-alternatives/update-alternatives-dpkg.inc new file mode 100644 index 0000000000..e767ed632b --- /dev/null +++ b/meta/packages/update-alternatives/update-alternatives-dpkg.inc @@ -0,0 +1,20 @@ +LICENSE = "GPL" +SECTION = "base" +MAINTAINER = "Chris Larson <kergoth@handhelds.org>" +SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz" +S = "${WORKDIR}/dpkg-${PV}" +PACKAGE_ARCH = "all" + +do_patch () { + cat ${S}/scripts/update-alternatives.pl | \ + sed -n -e ' + /^\$admindir=.*staging/{ + x + s/^.*$/$D=$ENV{"D"} || ""\;/; + p; + x; + s,^\$admindir=.*staging.*$,$admindir="$D${localstatedir}/dpkg"\;,; + }; + s,^\$altdir=.*$,$altdir="$D${sysconfdir}/alternatives"\;,; + p;' > ${S}/scripts/update-alternatives +} diff --git a/meta/packages/update-alternatives/update-alternatives-dpkg_1.13.22.bb b/meta/packages/update-alternatives/update-alternatives-dpkg_1.13.22.bb new file mode 100644 index 0000000000..a07d5e36d4 --- /dev/null +++ b/meta/packages/update-alternatives/update-alternatives-dpkg_1.13.22.bb @@ -0,0 +1,12 @@ +require update-alternatives-dpkg.inc + +RPROVIDES_${PN} = "update-alternatives" +RDEPENDS_${PN} = "perl dpkg" + +do_install () { + install -d ${D}${sbindir} \ + ${D}${localstatedir}/dpkg/alternatives \ + ${D}${sysconfdir}/alternatives + + install -m 0755 scripts/update-alternatives ${D}${sbindir}/update-alternatives +} diff --git a/meta/packages/web/web_svn.bb b/meta/packages/web/web_svn.bb index f79df30c42..018cbc9bec 100755 --- a/meta/packages/web/web_svn.bb +++ b/meta/packages/web/web_svn.bb @@ -4,6 +4,7 @@ DEPENDS = "libxml2 glib-2.0 gtk+ libglade gtkhtml2 curl gconf js" MAINTAINER = "Chris Lord <chris@openedhand.com>" DESCRIPTION = "Web is a multi-platform web browsing application." +PV = "0.0+svn${SRCDATE}" PR = "r1" SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http" S = "${WORKDIR}/trunk" diff --git a/meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb index b31ed72998..bbd4993345 100644 --- a/meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb +++ b/meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Base X libs." DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxdmcp xf86bigfontproto kbproto inputproto" PROVIDES = "virtual/libx11" -RPROVIDES = "virtual/libx11" +# RPROVIDES = "virtual/libx11" XORG_PN = "libX11" diff --git a/meta/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch b/meta/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch index 89a56719d7..a8f002ea2a 100644 --- a/meta/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch +++ b/meta/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch @@ -1,8 +1,18 @@ -diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c -index 86384f0..904d5f3 100644 ---- a/hw/kdrive/fbdev/fbdev.c -+++ b/hw/kdrive/fbdev/fbdev.c -@@ -38,11 +38,17 @@ fbdevInitialize (KdCardInfo *card, Fbdev +--- + hw/kdrive/fbdev/fbdev.c | 17 ++++++++++++----- + hw/kdrive/fbdev/fbdev.h | 1 + + hw/kdrive/fbdev/fbinit.c | 20 ++++++++++++++++---- + 3 files changed, 29 insertions(+), 9 deletions(-) + +--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/fbdev/fbdev.c ++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/fbdev/fbdev.c +@@ -33,16 +33,23 @@ + + extern int KdTsPhyScreen; + ++char *fbdevDevicePath = NULL; + Bool + fbdevInitialize (KdCardInfo *card, FbdevPriv *priv) { int k; unsigned long off; @@ -25,10 +35,8 @@ index 86384f0..904d5f3 100644 /* quiet valgrind */ memset (&priv->fix, '\0', sizeof (priv->fix)); if ((k=ioctl(priv->fd, FBIOGET_FSCREENINFO, &priv->fix)) < 0) { -diff --git a/hw/kdrive/fbdev/fbdev.h b/hw/kdrive/fbdev/fbdev.h -index d37b995..b7951db 100644 ---- a/hw/kdrive/fbdev/fbdev.h -+++ b/hw/kdrive/fbdev/fbdev.h +--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/fbdev/fbdev.h ++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/fbdev/fbdev.h @@ -53,6 +53,7 @@ typedef struct _fbdevScrPriv { } FbdevScrPriv; @@ -37,11 +45,9 @@ index d37b995..b7951db 100644 Bool fbdevInitialize (KdCardInfo *card, FbdevPriv *priv); -diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c -index ba9d1c6..1a7e4bf 100644 ---- a/hw/kdrive/fbdev/fbinit.c -+++ b/hw/kdrive/fbdev/fbinit.c -@@ -54,17 +54,30 @@ InitInput (int argc, char **argv) +--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/fbdev/fbinit.c ++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/fbdev/fbinit.c +@@ -59,16 +59,28 @@ InitInput (int argc, char **argv) void ddxUseMsg (void) { @@ -72,7 +78,5 @@ index ba9d1c6..1a7e4bf 100644 + return KdProcessArgument (argc, argv, i); +} -+char *fbdevDevicePath = NULL; KdCardFuncs fbdevFuncs = { fbdevCardInit, /* cardinit */ - fbdevScreenInit, /* scrinit */ diff --git a/meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb index 92857dc62b..987b46021f 100644 --- a/meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ b/meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -2,7 +2,7 @@ LICENSE = "MIT" DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" PROVIDES = "virtual/xserver" -RPROVIDES = "virtual/xserver" +# RPROVIDES = "virtual/xserver" PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale" SECTION = "x11/base" DESCRIPTION = "X server from freedesktop.org" @@ -32,6 +32,7 @@ SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.ta SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" +SRC_URI_append_qemux86 = " file://xserver-kdrive-poodle.patch;patch=1" PACKAGE_ARCH_poodle = "poodle" S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0" |