[oe-commits] org.oe.dev merge of '3889e1126647417898dfc189538f194f3cf760fb'
oe commit
oe at amethyst.openembedded.net
Sat May 24 13:26:05 UTC 2008
merge of '3889e1126647417898dfc189538f194f3cf760fb'
and '6ba3477131d507125b7da775792be1ddb5bdf90c'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 1dcfa68138eae89cc2f1eb1cd49a11c026143db6
ViewMTN: http://monotone.openembedded.org/revision/info/1dcfa68138eae89cc2f1eb1cd49a11c026143db6
Files:
1
packages/dsplink/dsplink_1.50.bb
packages/dsplink/files/davinci_mvlpro5.0.mk
packages/glibc/eglibc-svn/eglibc-svn-arm-cargs6.patch
packages/glibc/eglibc-svn/eglibc-svn-arm-check_pf.patch
packages/glibc/eglibc-initial_svn.bb
packages/eglibc/eglibc-initial_svn.bb
packages/glibc/eglibc-intermediate_svn.bb
packages/eglibc/eglibc-intermediate_svn.bb
packages/glibc/eglibc-package.bbclass
packages/eglibc/eglibc-package.bbclass
packages/glibc/eglibc-svn
packages/eglibc/eglibc-svn
packages/glibc/eglibc_svn.bb
packages/eglibc/eglibc_svn.bb
packages/eglibc
packages/eglibc/files
packages/eglibc/files/etc
packages/linux-libc-headers/linux-libc-headers-2.6.25
packages/eglibc/eglibc-initial.inc
packages/eglibc/eglibc-intermediate.inc
packages/eglibc/eglibc-stage.inc
packages/eglibc/eglibc.inc
packages/eglibc/files/etc/ld.so.conf
packages/eglibc/files/generate-supported.mk
packages/failme.bb
packages/gpe-conf/gpe-conf_0.2.7.bb
packages/gpe-login/gpe-login_0.92.bb
packages/gpe-session-scripts/gpe-session-scripts_0.68.bb
packages/gpe-todo/gpe-todo_0.57.bb
packages/linux-libc-headers/linux-libc-headers-2.6.25/fix-kernel-conditionalize-a.out.h.patch
packages/linux-libc-headers/linux-libc-headers-2.6.25/procinfo.h
packages/linux-libc-headers/linux-libc-headers-2.6.25/reinstate-a.out.h.patch
packages/linux-libc-headers/linux-libc-headers_2.6.25.bb
packages/util-linux/files/util-linux-2.12r-cramfs-1.patch
conf/distro/include/sane-srcrevs.inc
packages/uclibc/bfin-uclibc_svn.bb
packages/uclibc/uclibc.inc
packages/uclibc/uclibc_0.9.26.bb
packages/uclibc/uclibc_0.9.27.bb
packages/uclibc/uclibc_0.9.28.bb
packages/uclibc/uclibc_0.9.29.bb
packages/uclibc/uclibc_svn.bb
packages/util-linux/files/swapargs.h
packages/util-linux/util-linux_2.12r.bb
Diffs:
#
# mt diff -r3889e1126647417898dfc189538f194f3cf760fb -r1dcfa68138eae89cc2f1eb1cd49a11c026143db6
#
#
#
# patch "packages/dsplink/dsplink_1.50.bb"
# from [cea3f0783310d4a2a32b0c7f38aa90c15cbb2ff4]
# to [63f8d027daa425cc748f2af036ebdd244b7a3b12]
#
# patch "packages/dsplink/files/davinci_mvlpro5.0.mk"
# from [397df537b6a95afd39c7f2b31fa848ac95608411]
# to [bf3b65c67ceca007c139c44b2f51a183c75104b5]
#
============================================================
--- packages/dsplink/dsplink_1.50.bb cea3f0783310d4a2a32b0c7f38aa90c15cbb2ff4
+++ packages/dsplink/dsplink_1.50.bb 63f8d027daa425cc748f2af036ebdd244b7a3b12
@@ -47,7 +47,11 @@ do_compile () {
do_compile () {
ln -sf ${S}/gpp/src/api/*h ${S}/gpp/inc/
ln -sf ${S}/gpp/src/pmgr/Linux/2.6.18 ${S}/gpp/src/pmgr/Linux/2.6.26-rc2-omap1
+ ln -sf ${S}/gpp/src/pmgr/Linux/drv_pmgr.h ${S}/gpp/inc/drv_pmgr.h
+ ln -sf ${S}/gpp/src/pmgr/pmgr_proc.h ${S}/gpp/inc/pmgr_proc.h
+
unset DISPLAY
+
oe_runmake -C ${S}/gpp/src
}
============================================================
--- packages/dsplink/files/davinci_mvlpro5.0.mk 397df537b6a95afd39c7f2b31fa848ac95608411
+++ packages/dsplink/files/davinci_mvlpro5.0.mk bf3b65c67ceca007c139c44b2f51a183c75104b5
@@ -78,7 +78,7 @@ COMPILER := SED_ME_TARGET_PREFIXg
# Name of the compiler
# ----------------------------------------------------------------------------
COMPILER := SED_ME_TARGET_PREFIXgcc
-LD := SED_ME_TARGET_PREFIXDIR-ld
+LD := SED_ME_TARGET_PREFIXld
CROSS_COMPILE := SED_ME_TARGET_PREFIX
export CROSS_COMPILE
@@ -135,7 +135,7 @@ STD_CC_DEFNS := -D_REENTRANT
# ============================================================================
# ARCHIVER1 - This denotes the linker.
# ============================================================================
-ARCHIVER1 := SED_ME_TARGET_PREFIX-ld
+ARCHIVER1 := SED_ME_TARGET_PREFIXld
# ----------------------------------------------------------------------------
# Standard flags for the archiver
@@ -146,7 +146,7 @@ STD_AR_FLAGS1 := -EL -r
# ============================================================================
# ARCHIVER2 - This denotes the archiver.
# ============================================================================
-ARCHIVER2 := SED_ME_TARGET_PREFIX-ar
+ARCHIVER2 := SED_ME_TARGET_PREFIXar
# ----------------------------------------------------------------------------
# Standard flags for the archiver
#
# mt diff -r6ba3477131d507125b7da775792be1ddb5bdf90c -r1dcfa68138eae89cc2f1eb1cd49a11c026143db6
#
#
#
# delete "packages/glibc/eglibc-svn/eglibc-svn-arm-cargs6.patch"
#
# delete "packages/glibc/eglibc-svn/eglibc-svn-arm-check_pf.patch"
#
# rename "packages/glibc/eglibc-initial_svn.bb"
# to "packages/eglibc/eglibc-initial_svn.bb"
#
# rename "packages/glibc/eglibc-intermediate_svn.bb"
# to "packages/eglibc/eglibc-intermediate_svn.bb"
#
# rename "packages/glibc/eglibc-package.bbclass"
# to "packages/eglibc/eglibc-package.bbclass"
#
# rename "packages/glibc/eglibc-svn"
# to "packages/eglibc/eglibc-svn"
#
# rename "packages/glibc/eglibc_svn.bb"
# to "packages/eglibc/eglibc_svn.bb"
#
# add_dir "packages/eglibc"
#
# add_dir "packages/eglibc/files"
#
# add_dir "packages/eglibc/files/etc"
#
# add_dir "packages/linux-libc-headers/linux-libc-headers-2.6.25"
#
# add_file "packages/eglibc/eglibc-initial.inc"
# content [9cc9a816e903fd588bfe9b6529f690d24297a54b]
#
# add_file "packages/eglibc/eglibc-intermediate.inc"
# content [44c319922c41be728547bbcc0e10b47e1ac00e02]
#
# add_file "packages/eglibc/eglibc-stage.inc"
# content [4cabc49eb0552ed4b7a83649bacd02dec1d6307c]
#
# add_file "packages/eglibc/eglibc.inc"
# content [20ecb0b8894a6fa79214db154c8cd4e8458d7237]
#
# add_file "packages/eglibc/files/etc/ld.so.conf"
# content [f121cfac68db7d77f815ba3ae19f4d0e9d71e9a9]
#
# add_file "packages/eglibc/files/generate-supported.mk"
# content [f3b671988f6b2f0dea05190d24dbadfa147f6b6d]
#
# add_file "packages/failme.bb"
# content [0bd9c7a7c436d385836892a97f194dd00a2f30e5]
#
# add_file "packages/gpe-conf/gpe-conf_0.2.7.bb"
# content [68996b4d73e9f850d50609f764d56d76224be052]
#
# add_file "packages/gpe-login/gpe-login_0.92.bb"
# content [37a976053be7e397317ee38072b254e3fac7a435]
#
# add_file "packages/gpe-session-scripts/gpe-session-scripts_0.68.bb"
# content [a329b3ac9f1300b73646e914b5088a9d3adccee3]
#
# add_file "packages/gpe-todo/gpe-todo_0.57.bb"
# content [5f2d37e2f8cd59774274b320ecaf606505208231]
#
# add_file "packages/linux-libc-headers/linux-libc-headers-2.6.25/fix-kernel-conditionalize-a.out.h.patch"
# content [9177b8d9959077dbfcf2a4224d4b51a61426154b]
#
# add_file "packages/linux-libc-headers/linux-libc-headers-2.6.25/procinfo.h"
# content [d25df5c46fa7bcbf7d5e7d097e80d032aee11716]
#
# add_file "packages/linux-libc-headers/linux-libc-headers-2.6.25/reinstate-a.out.h.patch"
# content [bee4717876c7c58b3a42c66bd283a1b5aff53ba1]
#
# add_file "packages/linux-libc-headers/linux-libc-headers_2.6.25.bb"
# content [db5fbde3ea8fba339863fac327c7734070be0da6]
#
# add_file "packages/util-linux/files/util-linux-2.12r-cramfs-1.patch"
# content [1b14282f712ba4737e4c751b841b7888d0f7bf57]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [8ab516eb346939396ae72444623b5b352271c190]
# to [b0a33904ae23792bf435c0a8ce06e18a74b0838a]
#
# patch "packages/eglibc/eglibc-initial_svn.bb"
# from [d2d1ddf74dfda515dc592de07fd2510121c8f2af]
# to [a4c9652d0de37ac0abfcd55c52adce25ff66084c]
#
# patch "packages/eglibc/eglibc-intermediate_svn.bb"
# from [21404b0d7ead89e15d711d84009c0873dddf6ade]
# to [f9887693f966ca7f4608681ee51e4c19f3c063e0]
#
# patch "packages/eglibc/eglibc-package.bbclass"
# from [aee684fa0a585cebef668deddd667baf05049150]
# to [4c8a14b11d10890e3bf7171190c5e5734ae40101]
#
# patch "packages/eglibc/eglibc_svn.bb"
# from [693cfbc95cb7166e12ced9da2affddab022ac474]
# to [cfab52709e02a2130813453bf1ecea896dc28a6b]
#
# patch "packages/uclibc/bfin-uclibc_svn.bb"
# from [1eb6937a681df9e862a1770a754b337f98f02833]
# to [86a2bee8ee0876e27f37bc0916e3c14d7533e938]
#
# patch "packages/uclibc/uclibc.inc"
# from [ff5576d600e647d1e2a82dc297dd8e94bcb2d62f]
# to [48b0ba2e4cff05071b3b812ef0be0861870cd00c]
#
# patch "packages/uclibc/uclibc_0.9.26.bb"
# from [14ae6ea00fe187cd81d23633ac44901f717ace67]
# to [e430cad1e92b83cf16b3626e3eac015eba758f96]
#
# patch "packages/uclibc/uclibc_0.9.27.bb"
# from [df3857063088fb9ff44a2bf1a8f312fceae94d5c]
# to [0581521f9d69ecfe05e41718987afc842363f113]
#
# patch "packages/uclibc/uclibc_0.9.28.bb"
# from [4d0c15df27b5d67ed55617cbc3a9a7b4cbd72f8e]
# to [0192ea3da2f460a433b9294dceec5bd61b6a456e]
#
# patch "packages/uclibc/uclibc_0.9.29.bb"
# from [3283df3bb2a36857cc4cb9bd5bd8e5e3c3ea5b35]
# to [c26cfef7d9b7d31f3ad66d2ce4988fb98f45672a]
#
# patch "packages/uclibc/uclibc_svn.bb"
# from [ad24bcc3c7bdb569484f30d9b7580bb5d6de7dc6]
# to [5aa8b9c029f13e2c51c3e4c36fe99712d2fb1919]
#
# patch "packages/util-linux/files/swapargs.h"
# from [fedacc816af93cd206419f6c74d61c8764c58158]
# to [3c0638e25d2a2829b64c790d3664b4abc0c95ede]
#
# patch "packages/util-linux/util-linux_2.12r.bb"
# from [cd1ffadd74407478ab993df8ff54255f5470ed57]
# to [259661e7a09fabd7f8c3990c1a78f0c87129cf93]
#
============================================================
--- packages/eglibc/eglibc-initial.inc 9cc9a816e903fd588bfe9b6529f690d24297a54b
+++ packages/eglibc/eglibc-initial.inc 9cc9a816e903fd588bfe9b6529f690d24297a54b
@@ -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 () {
+ :
+}
============================================================
--- packages/eglibc/eglibc-intermediate.inc 44c319922c41be728547bbcc0e10b47e1ac00e02
+++ packages/eglibc/eglibc-intermediate.inc 44c319922c41be728547bbcc0e10b47e1ac00e02
@@ -0,0 +1,12 @@
+SECTION = "libs"
+PACKAGES = ""
+PACKAGES_DYNAMIC = ""
+PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc"
+DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
+
+do_install () {
+ :
+}
+
+GLIBC_ADDONS = "nptl,ports"
+GLIBC_EXTRA_OECONF = ""
============================================================
--- packages/eglibc/eglibc-stage.inc 4cabc49eb0552ed4b7a83649bacd02dec1d6307c
+++ packages/eglibc/eglibc-stage.inc 4cabc49eb0552ed4b7a83649bacd02dec1d6307c
@@ -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
+}
============================================================
--- packages/eglibc/eglibc.inc 20ecb0b8894a6fa79214db154c8cd4e8458d7237
+++ packages/eglibc/eglibc.inc 20ecb0b8894a6fa79214db154c8cd4e8458d7237
@@ -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"
============================================================
--- packages/eglibc/files/etc/ld.so.conf f121cfac68db7d77f815ba3ae19f4d0e9d71e9a9
+++ packages/eglibc/files/etc/ld.so.conf f121cfac68db7d77f815ba3ae19f4d0e9d71e9a9
@@ -0,0 +1,2 @@
+/usr/local/lib
+/usr/X11R6/lib
============================================================
--- packages/eglibc/files/generate-supported.mk f3b671988f6b2f0dea05190d24dbadfa147f6b6d
+++ packages/eglibc/files/generate-supported.mk f3b671988f6b2f0dea05190d24dbadfa147f6b6d
@@ -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
============================================================
--- packages/failme.bb 0bd9c7a7c436d385836892a97f194dd00a2f30e5
+++ packages/failme.bb 0bd9c7a7c436d385836892a97f194dd00a2f30e5
@@ -0,0 +1,5 @@
+
+do_configure() {
+idontexist
+}
+
============================================================
--- packages/gpe-conf/gpe-conf_0.2.7.bb 68996b4d73e9f850d50609f764d56d76224be052
+++ packages/gpe-conf/gpe-conf_0.2.7.bb 68996b4d73e9f850d50609f764d56d76224be052
@@ -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"
+
============================================================
--- packages/gpe-login/gpe-login_0.92.bb 37a976053be7e397317ee38072b254e3fac7a435
+++ packages/gpe-login/gpe-login_0.92.bb 37a976053be7e397317ee38072b254e3fac7a435
@@ -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"
+
============================================================
--- packages/gpe-session-scripts/gpe-session-scripts_0.68.bb a329b3ac9f1300b73646e914b5088a9d3adccee3
+++ packages/gpe-session-scripts/gpe-session-scripts_0.68.bb a329b3ac9f1300b73646e914b5088a9d3adccee3
@@ -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}"
============================================================
--- packages/gpe-todo/gpe-todo_0.57.bb 5f2d37e2f8cd59774274b320ecaf606505208231
+++ packages/gpe-todo/gpe-todo_0.57.bb 5f2d37e2f8cd59774274b320ecaf606505208231
@@ -0,0 +1,3 @@
+require gpe-todo.inc
+
+DEPENDS += "gtk+ libgpepimc"
============================================================
--- packages/linux-libc-headers/linux-libc-headers-2.6.25/fix-kernel-conditionalize-a.out.h.patch 9177b8d9959077dbfcf2a4224d4b51a61426154b
+++ packages/linux-libc-headers/linux-libc-headers-2.6.25/fix-kernel-conditionalize-a.out.h.patch 9177b8d9959077dbfcf2a4224d4b51a61426154b
@@ -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__
============================================================
--- packages/linux-libc-headers/linux-libc-headers-2.6.25/procinfo.h d25df5c46fa7bcbf7d5e7d097e80d032aee11716
+++ packages/linux-libc-headers/linux-libc-headers-2.6.25/procinfo.h d25df5c46fa7bcbf7d5e7d097e80d032aee11716
@@ -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
============================================================
--- packages/linux-libc-headers/linux-libc-headers-2.6.25/reinstate-a.out.h.patch bee4717876c7c58b3a42c66bd283a1b5aff53ba1
+++ packages/linux-libc-headers/linux-libc-headers-2.6.25/reinstate-a.out.h.patch bee4717876c7c%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list