diff options
| -rw-r--r-- | patches/e2fsprogs-1.40.8/generic/series | 1 | ||||
| -rw-r--r-- | patches/e2fsprogs-1.41.1/generic/coldfire-v4e-compilefix.patch (renamed from patches/e2fsprogs-1.40.8/generic/coldfire-v4e-compilefix.patch) | 0 | ||||
| -rw-r--r-- | patches/e2fsprogs-1.41.1/generic/e2fsprogs-1.41.1-libe2fsprogs-libs.diff | 36 | ||||
| -rw-r--r-- | patches/e2fsprogs-1.41.1/generic/series | 2 | ||||
| -rw-r--r-- | rules/e2fsprogs.in | 208 | ||||
| -rw-r--r-- | rules/e2fsprogs.make | 166 |
6 files changed, 362 insertions, 51 deletions
diff --git a/patches/e2fsprogs-1.40.8/generic/series b/patches/e2fsprogs-1.40.8/generic/series deleted file mode 100644 index 5618dab76..000000000 --- a/patches/e2fsprogs-1.40.8/generic/series +++ /dev/null @@ -1 +0,0 @@ -coldfire-v4e-compilefix.patch diff --git a/patches/e2fsprogs-1.40.8/generic/coldfire-v4e-compilefix.patch b/patches/e2fsprogs-1.41.1/generic/coldfire-v4e-compilefix.patch index a8ad45703..a8ad45703 100644 --- a/patches/e2fsprogs-1.40.8/generic/coldfire-v4e-compilefix.patch +++ b/patches/e2fsprogs-1.41.1/generic/coldfire-v4e-compilefix.patch diff --git a/patches/e2fsprogs-1.41.1/generic/e2fsprogs-1.41.1-libe2fsprogs-libs.diff b/patches/e2fsprogs-1.41.1/generic/e2fsprogs-1.41.1-libe2fsprogs-libs.diff new file mode 100644 index 000000000..51ca07e8b --- /dev/null +++ b/patches/e2fsprogs-1.41.1/generic/e2fsprogs-1.41.1-libe2fsprogs-libs.diff @@ -0,0 +1,36 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: e2fsprogs: link libcom_err with libext2fs + +When compiling e2fsprogs, I get this error: + +make[2]: Entering directory `/home/rsc/svn/oselas/bsp/pengutronix/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-phyCORE-PXA270/build-target/e2fsprogs-1.41.1/misc' + LD blkid +arm-iwmmx-linux-gnueabi-gcc -L/home/rsc/svn/oselas/bsp/pengutronix/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-phyCORE-PXA270/sysroot-target/lib -L/home/rsc/svn/oselas/bsp/pengutronix/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-phyCORE-PXA270/sysroot-target/usr/lib -Wl,-rpath-link -Wl,/home/rsc/svn/oselas/bsp/pengutronix/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-phyCORE-PXA270/sysroot-target/usr/lib -o blkid blkid.o ../lib/libblkid.so ../lib/libuuid.so ../lib/libext2fs.so +/opt/OSELAS.Toolchain-1.1.1/arm-iwmmx-linux-gnueabi/gcc-4.1.2-glibc-2.5-kernel-2.6.18/bin/../lib/gcc/arm-iwmmx-linux-gnueabi/4.1.2/../../../../arm-iwmmx-linux-gnueabi/bin/ld: warning: libcom_err.so.2, needed by ../lib/libext2fs.so, not found (try using -rpath or -rpath-link) +../lib/libext2fs.so: undefined reference to `_et_list' +../lib/libext2fs.so: undefined reference to `com_err' + +Looking at misc/Makefile.in suggests that, whenever LIBEXT2FS is used, +we also need to link in it's dependencies. Patch below. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> + +--- + misc/Makefile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: e2fsprogs-1.41.1/misc/Makefile.in +=================================================================== +--- e2fsprogs-1.41.1.orig/misc/Makefile.in ++++ e2fsprogs-1.41.1/misc/Makefile.in +@@ -61,8 +61,8 @@ DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) + STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) + STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) + +-LIBS_BLKID= $(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) +-DEPLIBS_BLKID= $(DEPLIBBLKID) $(DEPLIBUUID) $(LIBEXT2FS) ++LIBS_BLKID= $(LIBBLKID) $(LIBUUID) $(LIBS) ++DEPLIBS_BLKID= $(DEPLIBBLKID) $(DEPLIBUUID) $(LIBS) + + LIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) + DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) diff --git a/patches/e2fsprogs-1.41.1/generic/series b/patches/e2fsprogs-1.41.1/generic/series new file mode 100644 index 000000000..796d1a939 --- /dev/null +++ b/patches/e2fsprogs-1.41.1/generic/series @@ -0,0 +1,2 @@ +coldfire-v4e-compilefix.patch +e2fsprogs-1.41.1-libe2fsprogs-libs.diff diff --git a/rules/e2fsprogs.in b/rules/e2fsprogs.in index 14456c5bb..4eb9314f2 100644 --- a/rules/e2fsprogs.in +++ b/rules/e2fsprogs.in @@ -8,59 +8,197 @@ menuconfig E2FSPROGS if E2FSPROGS -config E2FSPROGS_MKFS +# --------------------- +comment "Build Options" +# --------------------- + +config E2FSPROGS_COMPRESSION + bool + prompt "compression" + help + Enable experimental compression support. + +config E2FSPROGS_HTREE + bool + prompt "htree" + help + Enable experimental htree support. + +config E2FSPROGS_IMAGER + bool + # no prompt + default y if E2FSPROGS_INSTALL_IMAGER + help + Enable support for e2image program. + +config E2FSPROGS_RESIZER + bool + # no prompt + default y if E2FSPROGS_INSTALL_RESIZER + help + Enable support for e2resize program. + +# ----------------------- +comment "Install Options" +# ----------------------- + +config E2FSPROGS_INSTALL_LSATTR + bool + prompt "install lsattr" + help + Enable support for lsattr program. + +config E2FSPROGS_INSTALL_UUIDGEN + bool + prompt "install uuidgen" + help + Enable support for uuidgen program. + +config E2FSPROGS_INSTALL_MK_CMDS + bool + prompt "install mk_cmds" + help + Enable support for mk_cmds program. + +config E2FSPROGS_INSTALL_CHATTR + bool + prompt "install chattr" + help + Enable support for chattr program. + +config E2FSPROGS_INSTALL_COMPILE_ET + bool + prompt "install compile_et" + help + Enable support for compile_et program. + +# ----- + +config E2FSPROGS_INSTALL_BLKID + bool + prompt "install blkid" + help + Enable support for blkid program. + +config E2FSPROGS_INSTALL_MKFS_EXT4DEV + bool + prompt "install mkfs.ext4dev" + help + Enable support for mkfs.ext4dev program. + +config E2FSPROGS_INSTALL_LOGSAVE + bool + prompt "install logsave" + help + Enable support for logsave program. + +config E2FSPROGS_INSTALL_MKFS_EXT3 bool - prompt "mke2fs" - default y - depends on !BB_CONFIG_MKE2FS + prompt "install mkfs.ext3" help - This installs /sbin/mke2fs, the filesystem builder for - ext2 and ext3 + Enable support for mkfs.ext3 program. -config E2FSPROGS_MKFS_EXT2 +config E2FSPROGS_INSTALL_FSCK_EXT4 bool - prompt "create mkfs.ext2 link" - depends on E2FSPROGS_MKFS + prompt "install fsck.ext4" + help + Enable support for fsck.ext4 program. -comment "Busybox' mke2fs is selected" - depends on BB_CONFIG_MKE2FS +config E2FSPROGS_INSTALL_DUMPE2FS + bool + prompt "install dumpe2fs" + help + Enable support for dumpe2fs program. -config E2FSPROGS_E2FSCK +config E2FSPROGS_INSTALL_FINDFS bool - prompt "e2fsck" - default y - depends on !BB_CONFIG_E2FSCK + prompt "install findfs" help - This will install /sbin/e2fsck, the filesystem - checking and recovery tool for ext2 and ext3. + Enable support for findfs program. -config E2FSPROGS_E2FSCK_EXT2 +config E2FSPROGS_INSTALL_FILEFRAG bool - prompt "create fsck.ext2 link" - depends on E2FSPROGS_E2FSCK + prompt "install filefrag" + help + Enable support for filefrag program. -comment "Busybox' e2fsck is selected" - depends on BB_CONFIG_E2FSCK +config E2FSPROGS_INSTALL_MKE2FS + bool + prompt "install mke2fs" + help + Enable support for mke2fs program. -config E2FSPROGS_TUNE2FS +config E2FSPROGS_INSTALL_MKLOSTANDFOUND bool - prompt "tune2fs, findfs, e2label" - depends on !BB_CONFIG_TUNE2FS + prompt "install mklost+found" help - This will install /sbin/tune2fs, /sbin/findfs, /sbin/e2label - to your target. Please note, that all thre share the same - binary (tune2fs). + Enable support for mklost+found program. - tune2fs lets you modify various aspects of your ext2 oder ext3 - filesystem. See tune2fs --help for details. +config E2FSPROGS_INSTALL_FSCK_EXT4DEV + bool + prompt "install fsck.ext4dev" + help + Enable support for fsck.ext4dev program. - findfs will find any filesystem identified by a filesystem-label - or UUID and return the name of the corresponding device node. +config E2FSPROGS_INSTALL_E2FSCK + bool + prompt "install e2fsck" + help + Enable support for e2fsck program. - e2label can display and edit ext2 and ext3 filesystem labels. +config E2FSPROGS_INSTALL_MKFS_EXT2 + bool + prompt "install mkfs.ext2" + help + Enable support for mkfs.ext2 program. -comment "Busybox' tune2fs is selected" - depends on BB_CONFIG_TUNE2FS +config E2FSPROGS_INSTALL_MKFS_EXT4 + bool + prompt "install mkfs.ext4" + help + Enable support for mkfs.ext4 program. + +config E2FSPROGS_INSTALL_RESIZE2FS + bool + prompt "install resize2fs" + help + Enable support for resize2fs program. + +config E2FSPROGS_INSTALL_E2IMAGE + bool + prompt "install e2image" + help + Enable support for e2image program. + +config E2FSPROGS_INSTALL_TUNE2FS + bool + prompt "install tune2fs" + help + Enable support for tune2fs program. + +config E2FSPROGS_INSTALL_E2UNDO + bool + prompt "install e2undo" + help + Enable support for e2undo program. + +config E2FSPROGS_INSTALL_FSCK_EXT3 + bool + prompt "install fsck.ext3" + help + Enable support for fsck.ext3 program. + +config E2FSPROGS_INSTALL_BADBLOCKS + bool + prompt "install badblocks" + help + Enable support for badblocks program. + +config E2FSPROGS_INSTALL_UUID + bool + prompt "install uuid" + help + Enable support for uuid program. endif diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index 3851e9a60..b27c94d1e 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_E2FSPROGS) += e2fsprogs # # Paths and names # -E2FSPROGS_VERSION := 1.40.8 +E2FSPROGS_VERSION := 1.41.1 E2FSPROGS := e2fsprogs-$(E2FSPROGS_VERSION) E2FSPROGS_SUFFIX := tar.gz E2FSPROGS_URL := $(PTXCONF_SETUP_SFMIRROR)/e2fsprogs/$(E2FSPROGS).$(E2FSPROGS_SUFFIX) @@ -47,8 +47,45 @@ E2FSPROGS_ENV := $(CROSS_ENV) # E2FSPROGS_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ - --with-root-prefix="" \ - --disable-nls + --enable-elf-shlibs \ + --disable-bsd-shlibs \ + --disable-profile \ + --disable-checker \ + --disable-jbd-debug \ + --disable-blkid-debug \ + --disable-testio-debug \ + --disable-tls \ + --disable-uuid \ + --disable-nls \ + --disable-rpath \ + --disable-debugfs \ + --disable-e2initrd-helper + +ifdef PTXCONF_E2FSPROGS_COMPRESSION +E2FSPROGS_AUTOCONF += --enable-compression +else +E2FSPROGS_AUTOCONF += --disable-compression +endif +ifdef PTXCONF_E2FSPROGS_HTREE +E2FSPROGS_AUTOCONF += --enable-htree +else +E2FSPROGS_AUTOCONF += --disable-htree +endif +ifdef PTXCONF_E2FSPROGS_IMAGER +E2FSPROGS_AUTOCONF += --enable-imager +else +E2FSPROGS_AUTOCONF += --disable-imager +endif +ifdef PTXCONF_E2FSPROGS_RESIZER +E2FSPROGS_AUTOCONF += --enable-resizer +else +E2FSPROGS_AUTOCONF += --disable-resizer +endif +ifdef PTXCONF_E2FSPROGS_FSCK +E2FSPROGS_AUTOCONF += --enable-fsck +else +E2FSPROGS_AUTOCONF += --disable-fsck +endif # ---------------------------------------------------------------------------- # Install @@ -75,23 +112,122 @@ $(STATEDIR)/e2fsprogs.targetinstall: @$(call install_fixup,e2fsprogs,DEPENDS,) @$(call install_fixup,e2fsprogs,DESCRIPTION,missing) -ifdef PTXCONF_E2FSPROGS_MKFS - @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/mke2fs, /sbin/mke2fs) -ifdef PTXCONF_E2FSPROGS_MKFS_EXT2 - @$(call install_link, e2fsprogs, /sbin/mke2fs, /sbin/mkfs.ext2) + # + # libraries + # + + @$(call install_copy, e2fsprogs, 0, 0, 0644, $(E2FSPROGS_DIR)/lib/libblkid.so.1.0, /usr/lib/libblkid.so.1.0) + @$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so.1) + @$(call install_link, e2fsprogs, libblkid.so.1.0, /usr/lib/libblkid.so) + + @$(call install_copy, e2fsprogs, 0, 0, 0644, $(E2FSPROGS_DIR)/lib/libcom_err.so.2.1, /usr/lib/libcom_err.so.2.1) + @$(call install_link, e2fsprogs, libcom_err.so.2.1, /usr/lib/libcom_err.so.2) + @$(call install_link, e2fsprogs, libcom_err.so.2.1, /usr/lib/libcom_err.so) + + @$(call install_copy, e2fsprogs, 0, 0, 0644, $(E2FSPROGS_DIR)/lib/libe2p.so.2.3, /usr/lib/libe2p.so.2.3) + @$(call install_link, e2fsprogs, libe2p.so.2.3, /usr/lib/libe2p.so.2) + @$(call install_link, e2fsprogs, libe2p.so.2.3, /usr/lib/libe2p.so) + + @$(call install_copy, e2fsprogs, 0, 0, 0644, $(E2FSPROGS_DIR)/lib/libext2fs.so.2.4, /usr/lib/libext2fs.so.2.4) + @$(call install_link, e2fsprogs, libext2fs.so.2.4, /usr/lib/libext2fs.so.2) + @$(call install_link, e2fsprogs, libext2fs.so.2.4, /usr/lib/libext2fs.so) + + @$(call install_copy, e2fsprogs, 0, 0, 0644, $(E2FSPROGS_DIR)/lib/libss.so.2.0, /usr/lib/libss.so.2.0) + @$(call install_link, e2fsprogs, libss.so.2.0, /usr/lib/libss.so.2) + @$(call install_link, e2fsprogs, libss.so.2.0, /usr/lib/libss.so) + + @$(call install_copy, e2fsprogs, 0, 0, 0644, $(E2FSPROGS_DIR)/lib/libuuid.so.1.2, /usr/lib/libuuid.so.1.2) + @$(call install_link, e2fsprogs, libuuid.so.1.2, /usr/lib/libuuid.so.1) + + # + # binaries in /usr/bin + # + +ifdef PTXCONF_E2FSPROGS_INSTALL_LSATTR + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/lsattr, /usr/bin/lsattr) +endif +ifdef PTXCONF_E2FSPROGS_INSTALL_UUIDGEN + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/uuidgen, /usr/bin/uuidgen) +endif +ifdef PTXCONF_E2FSPROGS_INSTALL_MK_CMDS + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/lib/ss/mk_cmds, /usr/bin/mk_cmds) endif +ifdef PTXCONF_E2FSPROGS_INSTALL_CHATTR + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/chattr, /usr/bin/chattr) +endif +ifdef PTXCONF_E2FSPROGS_INSTALL_COMPILE_ET + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/lib/et/compile_et, /usr/bin/compile_et) +endif + + # + # binaries in /usr/sbin + # + +ifdef PTXCONF_E2FSPROGS_INSTALL_BLKID + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/blkid, /usr/sbin/blkid) endif -ifdef PTXCONF_E2FSPROGS_E2FSCK - @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/e2fsck/e2fsck, /sbin/e2fsck) -ifdef PTXCONF_E2FSPROGS_E2FSCK_EXT2 - @$(call install_link, e2fsprogs, /sbin/e2fsck, /sbin/fsck.ext2) +ifdef PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT4DEV + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/mke2fs, /usr/sbin/mkfs.ext4dev) endif +ifdef PTXCONF_E2FSPROGS_INSTALL_LOGSAVE + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/logsave, /usr/sbin/logsave) endif -ifdef PTXCONF_E2FSPROGS_TUNE2FS - @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/tune2fs, /sbin/tune2fs) - @$(call install_link, e2fsprogs, /sbin/tune2fs, /sbin/findfs) - @$(call install_link, e2fsprogs, /sbin/tune2fs, /sbin/e2label) +ifdef PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT3 + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/mke2fs, /usr/sbin/mkfs.ext3) endif +ifdef PTXCONF_E2FSPROGS_INSTALL_FSCK_EXT4 + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/e2fsck/e2fsck, /usr/sbin/fsck.ext4) +endif +ifdef PTXCONF_E2FSPROGS_INSTALL_DUMPE2FS + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/dumpe2fs, /usr/sbin/dumpe2fs) +endif +ifdef PTXCONF_E2FSPROGS_INSTALL_FINDFS + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/tune2fs, /usr/sbin/findfs) +endif +ifdef PTXCONF_E2FSPROGS_INSTALL_FILEFRAG + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/filefrag, /usr/sbin/filefrag) +endif +ifdef PTXCONF_E2FSPROGS_INSTALL_MKE2FS + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/mke2fs, /usr/sbin/mke2fs) +endif +ifdef PTXCONF_E2FSPROGS_INSTALL_MKLOSTANDFOUND + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/mklost+found, /usr/sbin/mklost+found) +endif +ifdef PTXCONF_E2FSPROGS_INSTALL_FSCK_EXT4DEV + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/e2fsck/e2fsck, /usr/sbin/fsck.ext4dev) +endif +ifdef PTXCONF_E2FSPROGS_INSTALL_E2FSCK + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/e2fsck/e2fsck, /usr/sbin/e2fsck) +endif +ifdef PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT2 + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/mke2fs, /usr/sbin/mkfs.ext2) +endif +ifdef PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT4 + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/mke2fs, /usr/sbin/mkfs.ext4) +endif +ifdef PTXCONF_E2FSPROGS_INSTALL_RESIZE2FS + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/resize/resize2fs, /usr/sbin/resize2fs) +endif +ifdef PTXCONF_E2FSPROGS_INSTALL_E2IMAGE + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/e2image, /usr/sbin/e2image) +endif +ifdef PTXCONF_E2FSPROGS_INSTALL_TUNE2FS + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/tune2fs, /usr/sbin/tune2fs) +endif +ifdef PTXCONF_E2FSPROGS_INSTALL_E2UNDO + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/e2undo, /usr/sbin/e2undo) +endif +ifdef PTXCONF_E2FSPROGS_INSTALL_FSCK_EXT3 + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/e2fsck/e2fsck, /usr/sbin/fsck.ext3) +endif +ifdef PTXCONF_E2FSPROGS_INSTALL_BADBLOCKS + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/badblocks, /usr/sbin/badblocks) +endif +ifdef PTXCONF_E2FSPROGS_INSTALL_UUID + @$(call install_copy, e2fsprogs, 0, 0, 0755, $(E2FSPROGS_DIR)/misc/uuidgen, /usr/sbin/uuidgen) +endif + +#./etc/mke2fs.conf @$(call install_finish,e2fsprogs) |