Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/08/25 21:28:18+02:00 uni-frankfurt.de!mickey
package e2fsprogs-mke2fs individually and use dynamic linking for e2fschk. to keep the ramdisk script working after switching the fstype back to ext2, collie depends on e2fsprogs-mke2fs now

BKrev: 412cea99-AI4H2d17WJhwnWTmhtRlw

diff --git a/conf/collie.conf b/conf/collie.conf
index 86e30d8..6c95ece 100644 (file)
--- a/conf/collie.conf
+++ b/conf/collie.conf
@@ -11,6 +11,10 @@ BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils hostap-modules-cs orinoco-modules sh
 kernel-module-devinfo kernel-module-gpio kernel-module-net-fd kernel-module-registers kernel-module-sa1100-bi \
 kernel-module-usbdcore kernel-module-usbdmonitor " 
 
+# This is needed for the ramdisk script to work
+BOOTSTRAP_EXTRA_DEPENDS  += "e2fsprogs"
+BOOTSTRAP_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
+
 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
 
 include conf/handheld-common.conf

diff --git a/e2fsprogs/e2fsprogs_1.36-WIP-0408.oe b/e2fsprogs/e2fsprogs_1.36-WIP-0408.oe
index e69de29..965175e 100644 (file)
--- a/e2fsprogs/e2fsprogs_1.36-WIP-0408.oe
+++ b/e2fsprogs/e2fsprogs_1.36-WIP-0408.oe
@@ -0,0 +1,26 @@
+DESCRIPTION = "EXT2 Filesystem Utilities"
+SECTION = "base"
+PRIORITY = "optional"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
+          file://ln.patch;patch=1 \
+          file://configure.patch;patch=1 \
+          file://m4.patch;patch=1 \
+          file://ldflags.patch;patch=1"
+S = "${WORKDIR}/e2fsprogs-1.35"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-dynamic-e2fsck"
+
+sbindir = "/sbin"
+
+do_compile_prepend () {
+       find ./ -print|xargs chmod u=rwX
+       ( cd util; ${BUILD_CC} subst.c -o subst )
+}
+
+PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs "
+FILES_e2fsprogs-e2fsck = "${sbindir}/e2fsck ${sbindir}/fsck.ext2 ${sbindir}/fsck.ext3"
+FILES_e2fsprogs-mke2fs = "${sbindir}/mke2fs ${sbindir}/mkfs.ext2 ${sbindir}/mkfs.ext3"