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

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

2005/06/19 16:10:07+02:00 handhelds.org!CoreDump
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/mhentges/OpenEmbedded/bitbake/openembedded

2005/06/19 16:09:44+02:00 handhelds.org!CoreDump
altboot: Disable fsck of loop-images since fsck isn't installed in a stock OZ image

2005/06/19 16:01:37+02:00 uni-frankfurt.de!mickeyl
fix stupid typo in lists_dir

2005/06/19 15:57:00+02:00 uni-frankfurt.de!mickeyl
enhance ipkg-collateral to specify lists_dir. default is using 'lists_dir ext /var/lib/ipkg'. We might want to override that for the 32MB memory models

BKrev: 42b583ca6PD_SFNttUm2Iox9-JNBvQ

diff --git a/packages/altboot/files/collie/altboot.cfg b/packages/altboot/files/collie/altboot.cfg
index 389e3e9..5b979e7 100644 (file)
--- a/packages/altboot/files/collie/altboot.cfg
+++ b/packages/altboot/files/collie/altboot.cfg
@@ -7,7 +7,7 @@ TIMEOUT="3"
 REAL_INIT="/sbin/init.sysvinit"
 SH_SHELL="/bin/sh"
 IMAGE_PATH="boot-images"
-FSCK_IMAGES="yes"
+FSCK_IMAGES="no"
 SD_DEVICE="/dev/mmcda1"
 SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o"
 INIT_RUNLEVEL="5"

diff --git a/packages/altboot/files/poodle/altboot.cfg b/packages/altboot/files/poodle/altboot.cfg
index 389e3e9..5b979e7 100644 (file)
--- a/packages/altboot/files/poodle/altboot.cfg
+++ b/packages/altboot/files/poodle/altboot.cfg
@@ -7,7 +7,7 @@ TIMEOUT="3"
 REAL_INIT="/sbin/init.sysvinit"
 SH_SHELL="/bin/sh"
 IMAGE_PATH="boot-images"
-FSCK_IMAGES="yes"
+FSCK_IMAGES="no"
 SD_DEVICE="/dev/mmcda1"
 SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o"
 INIT_RUNLEVEL="5"

diff --git a/packages/ipkg/ipkg-collateral.bb b/packages/ipkg/ipkg-collateral.bb
index c9dedbc..5b3be64 100644 (file)
--- a/packages/ipkg/ipkg-collateral.bb
+++ b/packages/ipkg/ipkg-collateral.bb
@@ -1,18 +1,20 @@
-SECTION = "base"
 DESCRIPTION = "ipkg configuration files"
+SECTION = "base"
 LICENSE = "MIT"
-PR = "r3"
+PR = "r1"
 
 SRC_URI = " \
 file://ipkg.conf.comments      \
+file://lists \
 file://dest \
 file://src \
 "
 
 do_compile () {
        cat ${WORKDIR}/ipkg.conf.comments >${WORKDIR}/ipkg.conf
-       cat ${WORKDIR}/src  >>${WORKDIR}/ipkg.conf
-       cat ${WORKDIR}/dest >>${WORKDIR}/ipkg.conf
+       cat ${WORKDIR}/src      >>${WORKDIR}/ipkg.conf
+       cat ${WORKDIR}/dest     >>${WORKDIR}/ipkg.conf
+       cat ${WORKDIR}/lists    >>${WORKDIR}/ipkg.conf
 }
 
 do_install () {

diff --git a/packages/ipkg/ipkg-collateral/lists b/packages/ipkg/ipkg-collateral/lists
new file mode 100644 (file)
index 0000000..e69de29