diff options
39 files changed, 449 insertions, 116 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 293340c478..2e6a2bbc5f 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -14,8 +14,8 @@ SRCREV_pn-aircrack-ng ?= "802" SRCREV_pn-assassin ?= "93" SRCREV_pn-bfin-uclibc ?= "1857" -SRCREV_pn-uclibc ?= "21926" -SRCREV_pn-uclibc-initial ?= "21926" +SRCREV_pn-uclibc ?= "21996" +SRCREV_pn-uclibc-initial ?= "21996" SRCREV_pn-contact ?= "1410" SRCREV_pn-dbus-c++-native ?= "13131" SRCREV_pn-dbus-c++ ?= "13131" @@ -24,9 +24,9 @@ SRCREV_pn-dfu-util-native ?= "4160" SRCREV_pn-diversity-daemon ?= "277" SRCREV_pn-diversity-nav ?= "340" SRCREV_pn-eds-dbus ?= "659" -SRCREV_pn-eglibc ?= "5963" -SRCREV_pn-eglibc-initial ?= "5963" -SRCREV_pn-eglibc-intermediate ?= "5963" +SRCREV_pn-eglibc ?= "6229" +SRCREV_pn-eglibc-initial ?= "6229" +SRCREV_pn-eglibc-intermediate ?= "6229" SRCREV_pn-enlazar ?= "37" SRCREV_pn-exalt ?= "79" SRCREV_pn-exalt-daemon ?= "78" diff --git a/packages/glibc/eglibc-svn/.mtn2git_empty b/packages/eglibc/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/glibc/eglibc-svn/.mtn2git_empty +++ b/packages/eglibc/.mtn2git_empty diff --git a/packages/eglibc/eglibc-initial.inc b/packages/eglibc/eglibc-initial.inc new file mode 100644 index 0000000000..342711c157 --- /dev/null +++ b/packages/eglibc/eglibc-initial.inc @@ -0,0 +1,31 @@ +SECTION = "libs" +DEPENDS = "linux-libc-headers" +PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" + +PACKAGES = "" +PACKAGES_DYNAMIC = "" + +do_configure () { + sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure + chmod +x ${S}/configure + CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" \ + ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \ + --without-cvs --disable-sanity-checks \ + --with-headers=${STAGING_DIR_TARGET}${layout_includedir} \ + --enable-hacker-mode +} + +do_compile () { + : +} + +do_stage () { + oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} \ + includedir='${layout_includedir}' prefix='${layout_prefix}' install-headers + +} + +do_install () { + : +} diff --git a/packages/eglibc/eglibc-initial_svn.bb b/packages/eglibc/eglibc-initial_svn.bb new file mode 100644 index 0000000000..787c762609 --- /dev/null +++ b/packages/eglibc/eglibc-initial_svn.bb @@ -0,0 +1,6 @@ +require eglibc_${PV}.bb +require eglibc-initial.inc + +do_configure_prepend () { + unset CFLAGS +} diff --git a/packages/glibc/eglibc-intermediate_svn.bb b/packages/eglibc/eglibc-intermediate.inc index 5ecbdb6ed8..c226d8658d 100644 --- a/packages/glibc/eglibc-intermediate_svn.bb +++ b/packages/eglibc/eglibc-intermediate.inc @@ -1,20 +1,12 @@ -require eglibc_${PV}.bb +SECTION = "libs" +PACKAGES = "" +PACKAGES_DYNAMIC = "" +PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc" +DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers" do_install () { : } -# gcc uses -Werror which break on a "you have no thumb interwork" _warning_ -do_configure_prepend() { - find ${S} -name "configure" | xargs touch - sed -i s:-Werror:: ${S}/configure -} - - - -PACKAGES = "" -PACKAGES_DYNAMIC = "" -PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc" -DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers" GLIBC_ADDONS = "nptl,ports" GLIBC_EXTRA_OECONF = "" diff --git a/packages/eglibc/eglibc-intermediate_svn.bb b/packages/eglibc/eglibc-intermediate_svn.bb new file mode 100644 index 0000000000..7150f56d26 --- /dev/null +++ b/packages/eglibc/eglibc-intermediate_svn.bb @@ -0,0 +1,8 @@ +require eglibc_${PV}.bb +require eglibc-intermediate.inc + +# gcc uses -Werror which break on a "you have no thumb interwork" _warning_ +do_configure_prepend() { + find ${S} -name "configure" | xargs touch + sed -i s:-Werror:: ${S}/configure +} diff --git a/packages/glibc/eglibc-package.bbclass b/packages/eglibc/eglibc-package.bbclass index 241d8d30a6..2de24db859 100644 --- a/packages/glibc/eglibc-package.bbclass +++ b/packages/eglibc/eglibc-package.bbclass @@ -27,7 +27,7 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "0" BINARY_LOCALE_ARCHES ?= "arm.*" PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-dev eglibc-doc eglibc-locale libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile" -PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* eglibc-gconv-* eglibc-charmap-* eglibc-localedata-*" +PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* glibc-binary-localedata-* eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* locale-base-*" RPROVIDES_eglibc = "glibc" RPROVIDES_eglibc-utils = "glibc-utils" @@ -36,7 +36,8 @@ RPROVIDES_eglibc-doc = "glibc-doc" RPROVIDES_eglibc-locale = "glibc-locale" RPROVIDES_eglibc-extra-nss = "glibc-extra-nss" RPROVIDES_eglibc-thread-db = "glibc-thread-db" -RPROVIDES_eglibc-pcprofiles = "glibc-pcprofiles" +RPROVIDES_eglibc-pcprofile = "glibc-pcprofile" +RPROVIDES_eglibc-dbg = "glibc-dbg" libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*" @@ -49,7 +50,7 @@ FILES_eglibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen" FILES_nscd = "${sbindir}/nscd*" FILES_eglibc-utils = "${bindir}/* ${sbindir}/*" FILES_eglibc-gconv = "${libdir}/gconv/*" -FILES_${PN}-dbg += "${libexecdir}/getconf/.debug ${libdir}/gconv/.debug" +FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/gconv/.debug" FILES_catchsegv = "${bindir}/catchsegv" RDEPENDS_catchsegv = "libsegfault" FILES_eglibc-pcprofile = "/lib/libpcprofile.so" diff --git a/packages/eglibc/eglibc-stage.inc b/packages/eglibc/eglibc-stage.inc new file mode 100644 index 0000000000..d4ddecfa4d --- /dev/null +++ b/packages/eglibc/eglibc-stage.inc @@ -0,0 +1,21 @@ +do_stage() { + rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6 + oe_runmake 'install_root=${STAGING_DIR_HOST}' \ + 'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \ + '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \ + install-headers install-lib install + + install -d ${STAGING_INCDIR}/gnu \ + ${STAGING_INCDIR}/bits \ + ${STAGING_INCDIR}/rpcsvc + install -m 0644 ${S}/include/gnu/stubs.h ${STAGING_INCDIR}/gnu/ + install -m 0644 ${B}/bits/stdio_lim.h ${STAGING_INCDIR}/bits/ + install -m 0644 misc/syscall-list.h ${STAGING_INCDIR}/bits/syscall.h + for r in ${rpcsvc}; do + h=`echo $r|sed -e's,\.x$,.h,'` + install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/ + done + for i in libc.a libc_pic.a libc_nonshared.a; do + install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_base_libdir}/ || die "failed to install $i" + done +} diff --git a/packages/eglibc/eglibc-svn/.mtn2git_empty b/packages/eglibc/eglibc-svn/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/eglibc/eglibc-svn/.mtn2git_empty diff --git a/packages/glibc/eglibc-svn/eglibc-svn-arm-lowlevellock-include-tls.patch b/packages/eglibc/eglibc-svn/eglibc-svn-arm-lowlevellock-include-tls.patch index 99c3fef802..99c3fef802 100644 --- a/packages/glibc/eglibc-svn/eglibc-svn-arm-lowlevellock-include-tls.patch +++ b/packages/eglibc/eglibc-svn/eglibc-svn-arm-lowlevellock-include-tls.patch diff --git a/packages/eglibc/eglibc.inc b/packages/eglibc/eglibc.inc new file mode 100644 index 0000000000..e1559e46e4 --- /dev/null +++ b/packages/eglibc/eglibc.inc @@ -0,0 +1,22 @@ +DESCRIPTION = "Embedded GNU C Library" +HOMEPAGE = "http://www.eglibc.org/home" +SECTION = "libs" +PRIORITY = "required" +LICENSE = "LGPL" +# nptl needs unwind support in gcc, which can't be built without glibc. +DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers" +#this leads to circular deps, so lets not add it yet +#RDEPENDS_ldd += " bash" +# nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this +RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" +PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" +PROVIDES += "virtual/libintl virtual/libiconv" + +inherit autotools + +LEAD_SONAME = "libc.so" + +GLIBC_EXTRA_OECONF ?= "" +INHIBIT_DEFAULT_DEPS = "1" + +PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" diff --git a/packages/glibc/eglibc_svn.bb b/packages/eglibc/eglibc_svn.bb index ee5b3cfd23..e7a4a1ba75 100644 --- a/packages/glibc/eglibc_svn.bb +++ b/packages/eglibc/eglibc_svn.bb @@ -1,12 +1,10 @@ -require glibc.inc +require eglibc.inc -DEFAULT_PREFERENCE = "-1" +# DEFAULT_PREFERENCE = "-1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" PV = "2.8+svnr${SRCREV}" PR = "r6" SRC_URI = "svn://svn.eglibc.org;module=trunk \ - file://eglibc-svn-arm-cargs6.patch;patch=1 \ - file://eglibc-svn-arm-check_pf.patch;patch=1 \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ file://etc/ld.so.conf \ file://generate-supported.mk" @@ -15,6 +13,7 @@ B = "${WORKDIR}/build-${TARGET_SYS}" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev" +PROVIDES_${PN}-dbg = "glibc-dbg" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" @@ -93,6 +92,6 @@ do_compile () { ) } -require glibc-stage.inc +require eglibc-stage.inc require eglibc-package.bbclass diff --git a/packages/eglibc/files/.mtn2git_empty b/packages/eglibc/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/eglibc/files/.mtn2git_empty diff --git a/packages/eglibc/files/etc/.mtn2git_empty b/packages/eglibc/files/etc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/eglibc/files/etc/.mtn2git_empty diff --git a/packages/eglibc/files/etc/ld.so.conf b/packages/eglibc/files/etc/ld.so.conf new file mode 100644 index 0000000000..dfa65edb85 --- /dev/null +++ b/packages/eglibc/files/etc/ld.so.conf @@ -0,0 +1,2 @@ +/usr/local/lib +/usr/X11R6/lib diff --git a/packages/eglibc/files/generate-supported.mk b/packages/eglibc/files/generate-supported.mk new file mode 100644 index 0000000000..d2a28c2dc6 --- /dev/null +++ b/packages/eglibc/files/generate-supported.mk @@ -0,0 +1,11 @@ +#!/usr/bin/make + +include $(IN) + +all: + rm -f $(OUT) + touch $(OUT) + for locale in $(SUPPORTED-LOCALES); do \ + [ $$locale = true ] && continue; \ + echo $$locale | sed 's,/, ,' >> $(OUT); \ + done diff --git a/packages/failme.bb b/packages/failme.bb new file mode 100644 index 0000000000..9c2ead2273 --- /dev/null +++ b/packages/failme.bb @@ -0,0 +1,5 @@ + +do_configure() { +idontexist +} + diff --git a/packages/glibc/eglibc-initial_svn.bb b/packages/glibc/eglibc-initial_svn.bb deleted file mode 100644 index cbe4878529..0000000000 --- a/packages/glibc/eglibc-initial_svn.bb +++ /dev/null @@ -1,48 +0,0 @@ -require eglibc_${PV}.bb - -DEPENDS = "linux-libc-headers" -PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - -PACKAGES = "" -PACKAGES_DYNAMIC = "" - -do_configure () { - sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure - chmod +x ${S}/configure - unset CFLAGS - find ${S} -name "configure" | xargs touch - CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \ - --without-cvs --disable-sanity-checks \ - --with-headers=${STAGING_INCDIR} \ - --enable-hacker-mode - if grep -q GLIBC_2.3 ${S}/ChangeLog; then - # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler. - # Fortunately, we don't need errlist-compat.c, since we just need .h files, - # so work around this by creating a fake errlist-compat.c and satisfying its dependencies. - # Another workaround might be to tell configure to not use any cross options to $(CC). - # The real fix would be to get install-headers to not generate errlist-compat.c. - make sysdeps/gnu/errlist.c - mkdir -p stdio-common - touch stdio-common/errlist-compat.c - fi -} - -do_compile () { - : -} - -do_stage () { - oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} includedir=${layout_includedir} prefix="" install-headers - - # Two headers -- stubs.h and features.h -- aren't installed by install-headers, - # so do them by hand. We can tolerate an empty stubs.h for the moment. - # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html - mkdir -p ${STAGING_INCDIR}/gnu - touch ${STAGING_INCDIR}/gnu/stubs.h - cp ${S}/include/features.h ${STAGING_INCDIR}/features.h -} - -do_install () { - : -} diff --git a/packages/glibc/eglibc-svn/eglibc-svn-arm-cargs6.patch b/packages/glibc/eglibc-svn/eglibc-svn-arm-cargs6.patch deleted file mode 100644 index ef9708faaa..0000000000 --- a/packages/glibc/eglibc-svn/eglibc-svn-arm-cargs6.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- libc/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h.org 2008-04-04 18:44:53.000000000 -0700 -+++ libc/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2008-04-04 18:45:27.000000000 -0700 -@@ -73,6 +73,9 @@ - # define DOCARGS_5 DOCARGS_4 - # define UNDOCARGS_5 UNDOCARGS_4 - -+# define DOCARGS_6 DOCARGS_5 -+# define UNDOCARGS_6 UNDOCARGS_5 -+ - # ifdef IS_IN_libpthread - # define CENABLE bl PLTJMP(__pthread_enable_asynccancel) - # define CDISABLE bl PLTJMP(__pthread_disable_asynccancel) diff --git a/packages/glibc/eglibc-svn/eglibc-svn-arm-check_pf.patch b/packages/glibc/eglibc-svn/eglibc-svn-arm-check_pf.patch deleted file mode 100644 index cf45035f99..0000000000 --- a/packages/glibc/eglibc-svn/eglibc-svn-arm-check_pf.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: eglibc/ports/sysdeps/unix/sysv/linux/arm/check_pf.c -=================================================================== ---- eglibc/ports/sysdeps/unix/sysv/linux/arm/check_pf.c (revision 5790) -+++ eglibc/ports/sysdeps/unix/sysv/linux/arm/check_pf.c (working copy) -@@ -200,16 +200,12 @@ - } - - if (ifam->ifa_flags & (IFA_F_DEPRECATED -- | IFA_F_TEMPORARY - | IFA_F_HOMEADDRESS)) - { - struct in6ailist *newp = alloca (sizeof (*newp)); - newp->info.flags = (((ifam->ifa_flags & IFA_F_DEPRECATED) - ? in6ai_deprecated : 0) - | ((ifam->ifa_flags -- & IFA_F_TEMPORARY) -- ? in6ai_temporary : 0) -- | ((ifam->ifa_flags - & IFA_F_HOMEADDRESS) - ? in6ai_homeaddress : 0)); - memcpy (newp->info.addr, address ?: local, diff --git a/packages/gpe-conf/gpe-conf_0.2.7.bb b/packages/gpe-conf/gpe-conf_0.2.7.bb new file mode 100644 index 0000000000..b908e6c50b --- /dev/null +++ b/packages/gpe-conf/gpe-conf_0.2.7.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Configuration applets for GPE" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" + +DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client libxrandr" +RDEPENDS_${PN} = "xst gpe-confd xset ntpdate gpe-icons tzdata xrandr" +RDEPENDS_gpe-conf-panel = "gpe-conf" + +RPROVIDES_${PN} += " bl" +RCONFLICTS_${PN} = "bl" + +PR = "r0" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit gpe autotools pkgconfig + +PACKAGES += "gpe-conf-panel" + +FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ + ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \ + ${datadir}/gpe-conf" +FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" + diff --git a/packages/gpe-login/gpe-login_0.92.bb b/packages/gpe-login/gpe-login_0.92.bb new file mode 100644 index 0000000000..ec168bfc93 --- /dev/null +++ b/packages/gpe-login/gpe-login_0.92.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "GPE user login screen" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" +RDEPENDS = "xkbd gpe-theme-clearlooks" +RPROVIDES_${PN} = "gpe-session-starter" +PR = "r0" + +SRC_URI_OVERRIDES_PACKAGE_ARCH = "1" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit gpe autotools pkgconfig + + +SRC_URI += "file://removeblue-fontsize8.patch;patch=1" +SRC_URI += " file://chvt-keylaunch.patch;patch=1 " +SRC_URI += " file://c-locale.patch;patch=1 " + +SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1" +SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1" +SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1" + diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.68.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.68.bb new file mode 100644 index 0000000000..5daf39c836 --- /dev/null +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.68.bb @@ -0,0 +1,56 @@ +inherit gpe + +DESCRIPTION = "GPE session startup scripts" +LICENSE = "GPL" +SECTION = "gpe" +PRIORITY = "optional" +RDEPENDS_${PN} = "matchbox-panel matchbox-desktop matchbox-common gpe-session-starter xtscal gpe-question matchbox-applet-inputmanager xmodmap xdpyinfo xserver-common ipaq-sleep" +# more rdepends: keylaunch apmd blueprobe +DEPENDS = "matchbox-wm matchbox-panel xtscal gpe-question matchbox-applet-inputmanager xmodmap xdpyinfo xserver-common ipaq-sleep" + +SRC_URI += "file://matchbox-session \ + file://disable-composite.xsettings" + +PR = "r0" + +#apply a patch to set the fontsize for bigdpi (200+) devices to 5 +SRC_URI_append_hx4700 = " file://highdpifontfix.patch;patch=1" +SRC_URI_append_spitz = " file://highdpifontfix.patch;patch=1" +SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1" +SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1" +SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1" + + +do_configure_append_angstrom() { + sed -i s:Default:Clearlooks:g X11/xsettings.default + sed -i s:Industrial:Clearlooks:g X11/xsettings.default +} + +export CURSOR_HIDE = '${@base_contains("MACHINE_FEATURES","touchscreen","-use_cursor no","-use_cursor yes",d)}' + +do_install_append() { + install -d ${D}${sysconfdir}/gpe/xsettings-default.d + if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then + echo "Gtk/ToolbarStyle:S:icons" > ${D}${sysconfdir}/gpe/xsettings-default.d/toolbar + fi + install -d ${D}${sysconfdir}/matchbox + install ${WORKDIR}/matchbox-session ${D}${sysconfdir}/matchbox/session + printf "exec matchbox-window-manager ${CURSOR_HIDE} \$@ \n" >> ${D}${sysconfdir}/matchbox/session + + + install -d ${D}${sysconfdir}/gpe/xsettings-default.d + install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}${sysconfdir}/gpe/xsettings-default.d/disable-composite + + mv ${D}/usr/bin/gpe-logout.sh ${D}/usr/bin/gpe-logout.sh.matchbox +} + +pkg_postinst_${PN}() { + update-alternatives --install /usr/bin/gpe-logout.sh gpe-logout.sh /usr/bin/gpe-logout.sh.matchbox 10 +} + +pkg_postrm_${PN}() { + update-alternatives --remove gpe-logout.sh /usr/bin/gpe-logout.sh.matchbox +} + +# This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/gpe-todo/gpe-todo_0.57.bb b/packages/gpe-todo/gpe-todo_0.57.bb new file mode 100644 index 0000000000..b76e173d16 --- /dev/null +++ b/packages/gpe-todo/gpe-todo_0.57.bb @@ -0,0 +1,3 @@ +require gpe-todo.inc + +DEPENDS += "gtk+ libgpepimc" diff --git a/packages/linux-libc-headers/linux-libc-headers-2.6.25/.mtn2git_empty b/packages/linux-libc-headers/linux-libc-headers-2.6.25/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux-libc-headers/linux-libc-headers-2.6.25/.mtn2git_empty diff --git a/packages/linux-libc-headers/linux-libc-headers-2.6.25/fix-kernel-conditionalize-a.out.h.patch b/packages/linux-libc-headers/linux-libc-headers-2.6.25/fix-kernel-conditionalize-a.out.h.patch new file mode 100644 index 0000000000..30dee5d520 --- /dev/null +++ b/packages/linux-libc-headers/linux-libc-headers-2.6.25/fix-kernel-conditionalize-a.out.h.patch @@ -0,0 +1,15 @@ +diff --git a/include/linux/a.out.h b/include/linux/a.out.h +index 208f4e8..d149699 100644 +--- a/include/linux/a.out.h ++++ b/include/linux/a.out.h +@@ -1,6 +1,10 @@ + #ifndef __A_OUT_GNU_H__ + #define __A_OUT_GNU_H__ + ++#ifndef __KERNEL__ ++#define CONFIG_ARCH_SUPPORTS_AOUT ++#endif ++ + #ifdef CONFIG_ARCH_SUPPORTS_AOUT + + #define __GNU_EXEC_MACROS__ diff --git a/packages/linux-libc-headers/linux-libc-headers-2.6.25/procinfo.h b/packages/linux-libc-headers/linux-libc-headers-2.6.25/procinfo.h new file mode 100644 index 0000000000..8cdf828af8 --- /dev/null +++ b/packages/linux-libc-headers/linux-libc-headers-2.6.25/procinfo.h @@ -0,0 +1,24 @@ +/* + * linux/include/asm-arm/procinfo.h + * + * Copyright (C) 1996-1999 Russell King + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#ifndef __ASM_PROCINFO_H +#define __ASM_PROCINFO_H + +#define HWCAP_SWP 1 +#define HWCAP_HALF 2 +#define HWCAP_THUMB 4 +#define HWCAP_26BIT 8 /* Play it safe */ +#define HWCAP_FAST_MULT 16 +#define HWCAP_FPA 32 +#define HWCAP_VFP 64 +#define HWCAP_EDSP 128 +#define HWCAP_JAVA 256 +#define HWCAP_IWMMXT 512 +#define HWCAP_CRUNCH 1024 +#endif diff --git a/packages/linux-libc-headers/linux-libc-headers-2.6.25/reinstate-a.out.h.patch b/packages/linux-libc-headers/linux-libc-headers-2.6.25/reinstate-a.out.h.patch new file mode 100644 index 0000000000..9032f4e716 --- /dev/null +++ b/packages/linux-libc-headers/linux-libc-headers-2.6.25/reinstate-a.out.h.patch @@ -0,0 +1,14 @@ +diff --git a/include/linux/Kbuild b/include/linux/Kbuild +index 93b9885..b6fbb25 100644 +--- a/include/linux/Kbuild ++++ b/include/linux/Kbuild +@@ -166,6 +166,9 @@ unifdef-y += acct.h + unifdef-y += adb.h + unifdef-y += adfs_fs.h + unifdef-y += agpgart.h ++ifeq ($(wildcard include/asm-$(SRCARCH)/a.out.h),include/asm-$(SRCARCH)/a.out.h) ++unifdef-y += a.out.h ++endif + unifdef-y += apm_bios.h + unifdef-y += atalk.h + unifdef-y += atmdev.h diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.25.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.25.bb new file mode 100644 index 0000000000..f47fd08091 --- /dev/null +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.25.bb @@ -0,0 +1,68 @@ +require linux-libc-headers.inc + +INHIBIT_DEFAULT_DEPS = "1" +DEPENDS += "unifdef-native" +PR = "r1" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ + file://reinstate-a.out.h.patch;patch=1 \ + file://fix-kernel-conditionalize-a.out.h.patch;patch=1 \ + file://procinfo.h" + +S = "${WORKDIR}/linux-${PV}" + +set_arch() { + case ${TARGET_ARCH} in + alpha*) ARCH=alpha ;; + arm*) ARCH=arm ;; + cris*) ARCH=cris ;; + hppa*) ARCH=parisc ;; + i*86*) ARCH=i386 ;; + ia64*) ARCH=ia64 ;; + mips*) ARCH=mips ;; + m68k*) ARCH=m68k ;; + powerpc*) ARCH=powerpc ;; + s390*) ARCH=s390 ;; + sh*) ARCH=sh ;; + sparc64*) ARCH=sparc64 ;; + sparc*) ARCH=sparc ;; + x86_64*) ARCH=x86_64 ;; + avr32*) ARCH=avr32 ;; + bfin*) ARCH=blackfin ;; + esac +} + +do_configure() { + set_arch + oe_runmake allnoconfig ARCH=$ARCH +} + +do_compile () { +} + +do_install() { + set_arch + oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH +} + +do_install_append_arm() { + cp ${WORKDIR}/procinfo.h ${D}${includedir}/asm/ +} + +STAGE_TEMP="${WORKDIR}/temp-staging" + +do_stage () { + set_arch + echo $ARCH + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}${exec_prefix} ARCH=$ARCH + if [ "$ARCH" = "arm" ]; then + cp ${WORKDIR}/procinfo.h ${STAGE_TEMP}${includedir}/asm/ + fi + install -d ${STAGING_INCDIR} + rm -rf ${STAGING_INCDIR}/linux ${STAGING_INCDIR}/asm ${STAGING_INCDIR}/asm-generic + cp -pfLR ${STAGE_TEMP}${includedir}/linux ${STAGING_INCDIR}/ + cp -pfLR ${STAGE_TEMP}${includedir}/asm ${STAGING_INCDIR}/ + cp -pfLR ${STAGE_TEMP}${includedir}/asm-generic ${STAGING_INCDIR}/ +} diff --git a/packages/uclibc/bfin-uclibc_svn.bb b/packages/uclibc/bfin-uclibc_svn.bb index fdb1329968..5e71ddb490 100644 --- a/packages/uclibc/bfin-uclibc_svn.bb +++ b/packages/uclibc/bfin-uclibc_svn.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -PR = "r0" +PR = "r1" PV = "${UCLIBC_BASE}+svnr${SRCREV}" require uclibc.inc diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc index 07e49ac5cb..861568c06e 100644 --- a/packages/uclibc/uclibc.inc +++ b/packages/uclibc/uclibc.inc @@ -23,6 +23,7 @@ PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES += "${@['virtual/libiconv', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']}" DEPENDS = "virtual/${TARGET_PREFIX}binutils \ virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers ncurses-native" +RDEPENDS_${PN}-dev = "linux-libc-headers-dev" # Blackfin needs a wrapper around ld DEPENDS_append_bfin = " elf2flt " diff --git a/packages/uclibc/uclibc_0.9.26.bb b/packages/uclibc/uclibc_0.9.26.bb index b9027c9939..865d373a43 100644 --- a/packages/uclibc/uclibc_0.9.26.bb +++ b/packages/uclibc/uclibc_0.9.26.bb @@ -1,4 +1,4 @@ -PR = "r8" +PR = "r9" require uclibc.inc diff --git a/packages/uclibc/uclibc_0.9.27.bb b/packages/uclibc/uclibc_0.9.27.bb index 856f70f2fc..d1686f5772 100644 --- a/packages/uclibc/uclibc_0.9.27.bb +++ b/packages/uclibc/uclibc_0.9.27.bb @@ -1,5 +1,5 @@ DEFAULT_PREFERENCE = "1" -PR = "r8" +PR = "r9" require uclibc.inc diff --git a/packages/uclibc/uclibc_0.9.28.bb b/packages/uclibc/uclibc_0.9.28.bb index 64dcaaab1f..eb3bb50083 100644 --- a/packages/uclibc/uclibc_0.9.28.bb +++ b/packages/uclibc/uclibc_0.9.28.bb @@ -1,5 +1,5 @@ DEFAULT_PREFERENCE = "1" -PR = "r12" +PR = "r13" require uclibc.inc diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb index 49280277db..c62b984c18 100644 --- a/packages/uclibc/uclibc_0.9.29.bb +++ b/packages/uclibc/uclibc_0.9.29.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -PR = "r18" +PR = "r19" require uclibc.inc diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb index 92181b2815..a357808745 100644 --- a/packages/uclibc/uclibc_svn.bb +++ b/packages/uclibc/uclibc_svn.bb @@ -8,8 +8,7 @@ # UCLIBC_BASE ?= "0.9.29" PV = "${UCLIBC_BASE}+svnr${SRCREV}" -PR = "r9" -DEFAULT_PREFERENCE = "2" +PR = "r10" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. diff --git a/packages/util-linux/files/swapargs.h b/packages/util-linux/files/swapargs.h index e960eef05f..52fd10411b 100644 --- a/packages/util-linux/files/swapargs.h +++ b/packages/util-linux/files/swapargs.h @@ -1,3 +1,2 @@ #define SWAPON_HAS_TWO_ARGS -#include <asm/page.h> #include <sys/swap.h> diff --git a/packages/util-linux/files/util-linux-2.12r-cramfs-1.patch b/packages/util-linux/files/util-linux-2.12r-cramfs-1.patch new file mode 100644 index 0000000000..1771bdc528 --- /dev/null +++ b/packages/util-linux/files/util-linux-2.12r-cramfs-1.patch @@ -0,0 +1,87 @@ +Submitted by: Jeremy Utley <jeremy@linuxfromscratch.org> +Date: 2004-12-25 +Initial Package Version: 2.12p (should apply to versions back to at least k) +Upstream Status: Not Submitted - Test Version +Origin: Alexander Patrakov, adapted from debian build of cramfs utilities +Description: Util-Linux fails in cramfs compilation due to changes in the +linux-libc-headers package 2.6.9 and after. This patch is a proper fix to the +problem, but may in fact not be accepted upstream. + + +Index: util-linux-2.12r/disk-utils/fsck.cramfs.c +=================================================================== +--- util-linux-2.12r.orig/disk-utils/fsck.cramfs.c 2008-05-16 00:34:36.000000000 -0700 ++++ util-linux-2.12r/disk-utils/fsck.cramfs.c 2008-05-16 09:39:50.000000000 -0700 +@@ -76,8 +76,7 @@ + + #define PAD_SIZE 512 + +-#include <asm/page.h> +-#define PAGE_CACHE_SIZE (4096) ++#define PAGE_CACHE_SIZE page_size + + /* Guarantee access to at least 8kB at a time */ + #define ROMBUFFER_BITS 13 +@@ -87,11 +86,13 @@ + static unsigned long read_buffer_block = ~0UL; + + /* Uncompressing data structures... */ +-static char outbuffer[PAGE_CACHE_SIZE*2]; ++static char *outbuffer; + z_stream stream; + + #endif /* INCLUDE_FS_TESTS */ + ++static size_t page_size; ++ + /* Input status of 0 to print help and exit without an error. */ + static void usage(int status) + { +@@ -456,9 +457,17 @@ + int c; /* for getopt */ + int start = 0; + ++ page_size = sysconf(_SC_PAGESIZE); ++ + if (argc) + progname = argv[0]; + ++ outbuffer = malloc(page_size * 2); ++ if (!outbuffer) { ++ fprintf(stderr, _("failed to allocate outbuffer\n")); ++ exit(8); ++ } ++ + /* command line options */ + while ((c = getopt(argc, argv, "hx:v")) != EOF) { + switch (c) { +Index: util-linux-2.12r/disk-utils/mkfs.cramfs.c +=================================================================== +--- util-linux-2.12r.orig/disk-utils/mkfs.cramfs.c 2004-12-11 06:56:01.000000000 -0800 ++++ util-linux-2.12r/disk-utils/mkfs.cramfs.c 2008-05-16 09:38:06.000000000 -0700 +@@ -46,16 +46,8 @@ + static const char *progname = "mkcramfs"; + static int verbose = 0; + +-#ifdef __ia64__ +-#define PAGE_CACHE_SIZE (16384) +-#elif defined __alpha__ +-#define PAGE_CACHE_SIZE (8192) +-#else +-#define PAGE_CACHE_SIZE (4096) +-#endif +- + /* The kernel assumes PAGE_CACHE_SIZE as block size. */ +-static unsigned int blksize = PAGE_CACHE_SIZE; /* settable via -b option */ ++static unsigned int blksize; /* settable via -b option */ + static long total_blocks = 0, total_nodes = 1; /* pre-count the root node */ + static int image_length = 0; + +@@ -730,6 +722,7 @@ + u32 crc = crc32(0L, Z_NULL, 0); + int c; + ++ blksize = sysconf(_SC_PAGESIZE); + total_blocks = 0; + + if (argc) { diff --git a/packages/util-linux/util-linux_2.12r.bb b/packages/util-linux/util-linux_2.12r.bb index 7f8c3dd9f8..ece7b8b729 100644 --- a/packages/util-linux/util-linux_2.12r.bb +++ b/packages/util-linux/util-linux_2.12r.bb @@ -4,5 +4,6 @@ SRC_URI += "file://util-linux_2.12r-12.diff.gz;patch=1" SRC_URI += "file://glibc-fix.patch;patch=1" SRC_URI += "file://glibc-umount2.patch;patch=1" SRC_URI += "file://fdiskbsdlabel-avr32.patch;patch=1" +SRC_URI += "file://util-linux-2.12r-cramfs-1.patch;patch=1" -PR = "r13" +PR = "r14" |