Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/13 13:35:26+02:00 (none)!br1
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into null.(none):/data/mtx/src/build/unstable.wrt/openembedded

2005/06/13 13:35:01+02:00 (none)!br1
sstrip breaks automatic shared library dependencies, comment it out

2005/06/13 13:23:42+02:00 handhelds.org!CoreDump
altboot: Update to latest version (support booting off of NFS)

2005/06/13 12:02:05+01:00 reciva.com!pb
Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded
into mill.internal.reciva.com:/nexus/home/pb/oe/oe

2005/06/13 11:57:19+01:00 reciva.com!pb
add h1940 support to tslib, courtesy Arjan Schrijver

BKrev: 42ad709ac_OrcDdSpoSA6RZLB35rZw

diff --git a/conf/machine/wrt54.conf b/conf/machine/wrt54.conf
index 2f59780..54e769a 100644 (file)
--- a/conf/machine/wrt54.conf
+++ b/conf/machine/wrt54.conf
@@ -28,6 +28,7 @@ EXTRA_IMAGECMD_squashfs-lzma = "-root-owned -le"
 # build trx images
 INHERIT += "wrt-image"
 
-# strip even more:
-DEPENDS_prepend = "${@["elfkickers-native ", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}"
-export STRIP = "sstrip"
\ No newline at end of file
+# strip even more: 
+# would be nice but breaks automatic shared library dependencies
+#DEPENDS_prepend = "${@["elfkickers-native ", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}"
+#export STRIP = "sstrip"
\ No newline at end of file

diff --git a/packages/altboot/altboot_20050609.bb b/packages/altboot/altboot_20050614.bb
similarity index 100%
rename from packages/altboot/altboot_20050609.bb
rename to packages/altboot/altboot_20050614.bb

diff --git a/packages/tslib/tslib/h1940/tslib.sh b/packages/tslib/tslib/h1940/tslib.sh
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb
index 79dca31..2193cad 100644 (file)
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_cvs.bb
@@ -40,7 +40,7 @@ do_install_append() {
        install -d ${D}${sysconfdir}/profile.d/
        install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
        case ${MACHINE} in
-       h3600 | h3900)
+       h3600 | h3900 | h1940)
                install -d ${D}${datadir}/tslib
                for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h2200; do
                        install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/