From bb9af542bc69f417d414d92ebf46a9412944c1e1 Mon Sep 17 00:00:00 2001 From: Scott Garman Date: Thu, 15 Mar 2012 14:12:15 -0700 Subject: e2fsprogs: upgrade to 1.42.1 Includes minor tweaks to the formatting of some patch headers and the addition of a SOB line where needed. Signed-off-by: Scott Garman --- .../e2fsprogs/e2fsprogs-1.42.1/acinclude.m4 | 86 ++++++++++++++++++++++ .../e2fsprogs/e2fsprogs-1.42.1/fallocate.patch | 22 ++++++ .../e2fsprogs/e2fsprogs-1.42.1/mkdir.patch | 30 ++++++++ .../e2fsprogs-1.42.1/remove.ldconfig.call.patch | 33 +++++++++ .../e2fsprogs/e2fsprogs-1.42/acinclude.m4 | 86 ---------------------- .../e2fsprogs/e2fsprogs-1.42/fallocate.patch | 22 ------ .../e2fsprogs/e2fsprogs-1.42/mkdir.patch | 29 -------- .../e2fsprogs-1.42/remove.ldconfig.call.patch | 28 ------- .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb | 64 ++++++++++++++++ meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb | 64 ---------------- 10 files changed, 235 insertions(+), 229 deletions(-) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/acinclude.m4 create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/fallocate.patch create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/mkdir.patch create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/remove.ldconfig.call.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/acinclude.m4 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/fallocate.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/mkdir.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/remove.ldconfig.call.patch create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/acinclude.m4 b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/acinclude.m4 new file mode 100644 index 000000000..4b0066847 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/acinclude.m4 @@ -0,0 +1,86 @@ +# Extracted from the package's shipped aclocal.m4. Custom macros should be in +# acinclude.m4 so running aclocal doesn't blow them away. +# +# RP 1/6/2010 + +# =========================================================================== +# http://www.nongnu.org/autoconf-archive/check_gnu_make.html +# =========================================================================== +# +# SYNOPSIS +# +# CHECK_GNU_MAKE() +# +# DESCRIPTION +# +# This macro searches for a GNU version of make. If a match is found, the +# makefile variable `ifGNUmake' is set to the empty string, otherwise it +# is set to "#". This is useful for including a special features in a +# Makefile, which cannot be handled by other versions of make. The +# variable _cv_gnu_make_command is set to the command to invoke GNU make +# if it exists, the empty string otherwise. +# +# Here is an example of its use: +# +# Makefile.in might contain: +# +# # A failsafe way of putting a dependency rule into a makefile +# $(DEPEND): +# $(CC) -MM $(srcdir)/*.c > $(DEPEND) +# +# @ifGNUmake@ ifeq ($(DEPEND),$(wildcard $(DEPEND))) +# @ifGNUmake@ include $(DEPEND) +# @ifGNUmake@ endif +# +# Then configure.in would normally contain: +# +# CHECK_GNU_MAKE() +# AC_OUTPUT(Makefile) +# +# Then perhaps to cause gnu make to override any other make, we could do +# something like this (note that GNU make always looks for GNUmakefile +# first): +# +# if ! test x$_cv_gnu_make_command = x ; then +# mv Makefile GNUmakefile +# echo .DEFAULT: > Makefile ; +# echo \ $_cv_gnu_make_command \$@ >> Makefile; +# fi +# +# Then, if any (well almost any) other make is called, and GNU make also +# exists, then the other make wraps the GNU make. +# +# LICENSE +# +# Copyright (c) 2008 John Darrington +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. +# +# Note: Modified by Ted Ts'o to add @ifNotGNUMake@ + +AC_DEFUN( + [CHECK_GNU_MAKE], [ AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command, + _cv_gnu_make_command='' ; +dnl Search all the common names for GNU make + for a in "$MAKE" make gmake gnumake ; do + if test -z "$a" ; then continue ; fi ; + if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then + _cv_gnu_make_command=$a ; + break; + fi + done ; + ) ; +dnl If there was a GNU version, then set @ifGNUmake@ to the empty string, '#' otherwise + if test "x$_cv_gnu_make_command" != "x" ; then + ifGNUmake='' ; + ifNotGNUmake='#' ; + else + ifGNUmake='#' ; + ifNotGNUmake='' ; + AC_MSG_RESULT("Not found"); + fi + AC_SUBST(ifGNUmake) + AC_SUBST(ifNotGNUmake) +] ) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/fallocate.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/fallocate.patch new file mode 100644 index 000000000..d074c15cf --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/fallocate.patch @@ -0,0 +1,22 @@ +We assume that fallocate is supported somehow +but we need to check if we have fallocate() +this problem shows up on uclibc systems since +uclibc does not have fallocate() implemented + +Upstream-Status: Pending + +Signed-off-by: Khem Raj + +Index: e2fsprogs-1.42/lib/ext2fs/unix_io.c +=================================================================== +--- e2fsprogs-1.42.orig/lib/ext2fs/unix_io.c 2012-01-17 17:24:34.290780625 -0800 ++++ e2fsprogs-1.42/lib/ext2fs/unix_io.c 2012-01-17 17:25:37.338783680 -0800 +@@ -895,7 +895,7 @@ + goto unimplemented; + #endif + } else { +-#ifdef FALLOC_FL_PUNCH_HOLE ++#if defined FALLOC_FL_PUNCH_HOLE && defined HAVE_FALLOCATE + /* + * If we are not on block device, try to use punch hole + * to reclaim free space. diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/mkdir.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/mkdir.patch new file mode 100644 index 000000000..aa7a2981b --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/mkdir.patch @@ -0,0 +1,30 @@ +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Mei Lei + +Index: e2fsprogs-1.41.5/po/Makefile.in.in +=================================================================== +--- e2fsprogs-1.41.5.orig/po/Makefile.in.in 2009-02-14 13:49:08.000000000 +0000 ++++ e2fsprogs-1.41.5/po/Makefile.in.in 2009-08-19 17:52:31.000000000 +0100 +@@ -30,7 +30,7 @@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + MKINSTALLDIRS = @MKINSTALLDIRS@ +-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) ++mkinstalldirs = $(MKINSTALLDIRS) + + GMSGFMT = @GMSGFMT@ + MSGFMT = @MSGFMT@ +Index: e2fsprogs-1.41.5/configure.in +=================================================================== +--- e2fsprogs-1.41.5.orig/configure.in 2009-08-19 17:53:50.000000000 +0100 ++++ e2fsprogs-1.41.5/configure.in 2009-08-19 17:48:38.000000000 +0100 +@@ -970,6 +970,8 @@ + fi + AC_SUBST(BUILD_CFLAGS) + AC_SUBST(BUILD_LDFLAGS) ++MKINSTALLDIRS="mkdir -p" ++AC_SUBST(MKINSTALLDIRS) + dnl + dnl Make our output files, being sure that we create the some miscellaneous + dnl directories diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/remove.ldconfig.call.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/remove.ldconfig.call.patch new file mode 100644 index 000000000..7be4c3e54 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/remove.ldconfig.call.patch @@ -0,0 +1,33 @@ +When /etc/ld.so.cache is writeable by user running bitbake then it +creates invalid cache (in my case libstdc++.so cannot be found after +building zlib(-native) and I have to call touch */libstdc++.so && +/sbin/ldconfig to fix it. + +So remove ldconfig call from make install-libs + +Patch authored by Martin Jansa. + +Upstream-Status: Inappropriate [disable feature] + +Signed-off-by: Scott Garman + +diff -uNr e2fsprogs-1.42.orig/lib/Makefile.elf-lib e2fsprogs-1.42/lib/Makefile.elf-lib +--- e2fsprogs-1.42.orig/lib/Makefile.elf-lib 2010-06-14 05:07:36.000000000 +0200 ++++ e2fsprogs-1.42/lib/Makefile.elf-lib 2012-02-23 14:26:07.021272275 +0100 +@@ -52,8 +52,6 @@ + $(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \ + $(DESTDIR)$(libdir)/$(ELF_IMAGE).so; \ + fi +- $(E) " LDCONFIG" +- $(Q) -$(LDCONFIG) + + install-strip: install + $(E) " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)" +@@ -69,7 +67,6 @@ + $(RM) -f $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) \ + $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME) \ + $(DESTDIR)$(libdir)/$(ELF_IMAGE).so +- -$(LDCONFIG) + + clean:: + $(RM) -rf elfshared diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/acinclude.m4 b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/acinclude.m4 deleted file mode 100644 index 4b0066847..000000000 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/acinclude.m4 +++ /dev/null @@ -1,86 +0,0 @@ -# Extracted from the package's shipped aclocal.m4. Custom macros should be in -# acinclude.m4 so running aclocal doesn't blow them away. -# -# RP 1/6/2010 - -# =========================================================================== -# http://www.nongnu.org/autoconf-archive/check_gnu_make.html -# =========================================================================== -# -# SYNOPSIS -# -# CHECK_GNU_MAKE() -# -# DESCRIPTION -# -# This macro searches for a GNU version of make. If a match is found, the -# makefile variable `ifGNUmake' is set to the empty string, otherwise it -# is set to "#". This is useful for including a special features in a -# Makefile, which cannot be handled by other versions of make. The -# variable _cv_gnu_make_command is set to the command to invoke GNU make -# if it exists, the empty string otherwise. -# -# Here is an example of its use: -# -# Makefile.in might contain: -# -# # A failsafe way of putting a dependency rule into a makefile -# $(DEPEND): -# $(CC) -MM $(srcdir)/*.c > $(DEPEND) -# -# @ifGNUmake@ ifeq ($(DEPEND),$(wildcard $(DEPEND))) -# @ifGNUmake@ include $(DEPEND) -# @ifGNUmake@ endif -# -# Then configure.in would normally contain: -# -# CHECK_GNU_MAKE() -# AC_OUTPUT(Makefile) -# -# Then perhaps to cause gnu make to override any other make, we could do -# something like this (note that GNU make always looks for GNUmakefile -# first): -# -# if ! test x$_cv_gnu_make_command = x ; then -# mv Makefile GNUmakefile -# echo .DEFAULT: > Makefile ; -# echo \ $_cv_gnu_make_command \$@ >> Makefile; -# fi -# -# Then, if any (well almost any) other make is called, and GNU make also -# exists, then the other make wraps the GNU make. -# -# LICENSE -# -# Copyright (c) 2008 John Darrington -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. -# -# Note: Modified by Ted Ts'o to add @ifNotGNUMake@ - -AC_DEFUN( - [CHECK_GNU_MAKE], [ AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command, - _cv_gnu_make_command='' ; -dnl Search all the common names for GNU make - for a in "$MAKE" make gmake gnumake ; do - if test -z "$a" ; then continue ; fi ; - if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then - _cv_gnu_make_command=$a ; - break; - fi - done ; - ) ; -dnl If there was a GNU version, then set @ifGNUmake@ to the empty string, '#' otherwise - if test "x$_cv_gnu_make_command" != "x" ; then - ifGNUmake='' ; - ifNotGNUmake='#' ; - else - ifGNUmake='#' ; - ifNotGNUmake='' ; - AC_MSG_RESULT("Not found"); - fi - AC_SUBST(ifGNUmake) - AC_SUBST(ifNotGNUmake) -] ) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/fallocate.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/fallocate.patch deleted file mode 100644 index 4d952a5df..000000000 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/fallocate.patch +++ /dev/null @@ -1,22 +0,0 @@ -We assume that fallocate is supported somehow -but we need to check if we have fallocate() -this problem shows up on uclibc systems since -uclibc does not have fallocate() implemented - -Signed-off-by: Khem Raj - -Upstream-Status: Pending - -Index: e2fsprogs-1.42/lib/ext2fs/unix_io.c -=================================================================== ---- e2fsprogs-1.42.orig/lib/ext2fs/unix_io.c 2012-01-17 17:24:34.290780625 -0800 -+++ e2fsprogs-1.42/lib/ext2fs/unix_io.c 2012-01-17 17:25:37.338783680 -0800 -@@ -895,7 +895,7 @@ - goto unimplemented; - #endif - } else { --#ifdef FALLOC_FL_PUNCH_HOLE -+#if defined FALLOC_FL_PUNCH_HOLE && defined HAVE_FALLOCATE - /* - * If we are not on block device, try to use punch hole - * to reclaim free space. diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/mkdir.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/mkdir.patch deleted file mode 100644 index e91ffa96c..000000000 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/mkdir.patch +++ /dev/null @@ -1,29 +0,0 @@ -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Mei Lei - -Index: e2fsprogs-1.41.5/po/Makefile.in.in -=================================================================== ---- e2fsprogs-1.41.5.orig/po/Makefile.in.in 2009-02-14 13:49:08.000000000 +0000 -+++ e2fsprogs-1.41.5/po/Makefile.in.in 2009-08-19 17:52:31.000000000 +0100 -@@ -30,7 +30,7 @@ - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - MKINSTALLDIRS = @MKINSTALLDIRS@ --mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) -+mkinstalldirs = $(MKINSTALLDIRS) - - GMSGFMT = @GMSGFMT@ - MSGFMT = @MSGFMT@ -Index: e2fsprogs-1.41.5/configure.in -=================================================================== ---- e2fsprogs-1.41.5.orig/configure.in 2009-08-19 17:53:50.000000000 +0100 -+++ e2fsprogs-1.41.5/configure.in 2009-08-19 17:48:38.000000000 +0100 -@@ -970,6 +970,8 @@ - fi - AC_SUBST(BUILD_CFLAGS) - AC_SUBST(BUILD_LDFLAGS) -+MKINSTALLDIRS="mkdir -p" -+AC_SUBST(MKINSTALLDIRS) - dnl - dnl Make our output files, being sure that we create the some miscellaneous - dnl directories diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/remove.ldconfig.call.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/remove.ldconfig.call.patch deleted file mode 100644 index 0e5fd7d3f..000000000 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/remove.ldconfig.call.patch +++ /dev/null @@ -1,28 +0,0 @@ -When /etc/ld.so.cache is writeable by user running bitbake then it creates invalid cache -(in my case libstdc++.so cannot be found after building zlib(-native) and I have to call -touch */libstdc++.so && /sbin/ldconfig to fix it. - -So remove ldconfig call from make install-libs - -Upstream-Status: Inappropriate [disable feature] - -diff -uNr e2fsprogs-1.42.orig/lib/Makefile.elf-lib e2fsprogs-1.42/lib/Makefile.elf-lib ---- e2fsprogs-1.42.orig/lib/Makefile.elf-lib 2010-06-14 05:07:36.000000000 +0200 -+++ e2fsprogs-1.42/lib/Makefile.elf-lib 2012-02-23 14:26:07.021272275 +0100 -@@ -52,8 +52,6 @@ - $(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \ - $(DESTDIR)$(libdir)/$(ELF_IMAGE).so; \ - fi -- $(E) " LDCONFIG" -- $(Q) -$(LDCONFIG) - - install-strip: install - $(E) " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)" -@@ -69,7 +67,6 @@ - $(RM) -f $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) \ - $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME) \ - $(DESTDIR)$(libdir)/$(ELF_IMAGE).so -- -$(LDCONFIG) - - clean:: - $(RM) -rf elfshared diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb new file mode 100644 index 000000000..6df7cea32 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb @@ -0,0 +1,64 @@ +require e2fsprogs.inc + +PR = "r0" + +SRC_URI += "file://fallocate.patch \ + file://acinclude.m4 \ + file://remove.ldconfig.call.patch \ +" + +SRC_URI[md5sum] = "8ed1501ae6746e2e735bdd1407211dc9" +SRC_URI[sha256sum] = "0f1fdc10c6289b6750714490837df9aab691f352d33f5ecb64507704df6ff991" + +EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid --disable-uuidd" +EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs" +EXTRA_OECONF_darwin8 = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs" + +do_configure_prepend () { + cp ${WORKDIR}/acinclude.m4 ${S}/ +} + +do_compile_prepend () { + find ./ -print | grep -v ./patches | xargs chmod u=rwX + ( cd util; ${BUILD_CC} subst.c -o subst ) +} + +do_install () { + oe_runmake 'DESTDIR=${D}' install + oe_runmake 'DESTDIR=${D}' install-libs + # We use blkid from util-linux now so remove from here + rm -f ${D}${base_libdir}/libblkid* + rm -rf ${D}${includedir}/blkid + rm -f ${D}${base_libdir}/pkgconfig/blkid.pc +} + +do_install_append () { + # e2initrd_helper and the pkgconfig files belong in libdir + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then + install -d ${D}${libdir} + mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir} + mv ${D}${base_libdir}/pkgconfig ${D}${libdir} + fi +} + +# blkid used to be part of e2fsprogs but is useful outside, add it +# as an RDEPENDS_${PN} so that anything relying on it being in e2fsprogs +# still works +RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-badblocks" + +PACKAGES =+ "e2fsprogs-blkid e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks" +PACKAGES =+ "libcomerr libss libe2p libext2fs" + +FILES_e2fsprogs-blkid = "${base_sbindir}/blkid" +FILES_e2fsprogs-fsck = "${base_sbindir}/fsck" +FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" +FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf" +FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs" +FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" +FILES_libcomerr = "${base_libdir}/libcom_err.so.*" +FILES_libss = "${base_libdir}/libss.so.*" +FILES_libe2p = "${base_libdir}/libe2p.so.*" +FILES_libext2fs = "${libdir}/e2initrd_helper ${libdir}/libext2fs.so.*" +FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so" + +BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb deleted file mode 100644 index 6e3f7b837..000000000 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb +++ /dev/null @@ -1,64 +0,0 @@ -require e2fsprogs.inc - -PR = "r4" - -SRC_URI += "file://fallocate.patch \ - file://acinclude.m4 \ - file://remove.ldconfig.call.patch \ -" - -SRC_URI[md5sum] = "a3c4ffd7352310ab5e9412965d575610" -SRC_URI[sha256sum] = "55b46db0cec3e2eb0e5de14494a88b01ff6c0500edf8ca8927cad6da7b5e4a46" - -EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid --disable-uuidd" -EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs" -EXTRA_OECONF_darwin8 = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs" - -do_configure_prepend () { - cp ${WORKDIR}/acinclude.m4 ${S}/ -} - -do_compile_prepend () { - find ./ -print | grep -v ./patches | xargs chmod u=rwX - ( cd util; ${BUILD_CC} subst.c -o subst ) -} - -do_install () { - oe_runmake 'DESTDIR=${D}' install - oe_runmake 'DESTDIR=${D}' install-libs - # We use blkid from util-linux now so remove from here - rm -f ${D}${base_libdir}/libblkid* - rm -rf ${D}${includedir}/blkid - rm -f ${D}${base_libdir}/pkgconfig/blkid.pc -} - -do_install_append () { - # e2initrd_helper and the pkgconfig files belong in libdir - if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then - install -d ${D}${libdir} - mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir} - mv ${D}${base_libdir}/pkgconfig ${D}${libdir} - fi -} - -# blkid used to be part of e2fsprogs but is useful outside, add it -# as an RDEPENDS_${PN} so that anything relying on it being in e2fsprogs -# still works -RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-badblocks" - -PACKAGES =+ "e2fsprogs-blkid e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks" -PACKAGES =+ "libcomerr libss libe2p libext2fs" - -FILES_e2fsprogs-blkid = "${base_sbindir}/blkid" -FILES_e2fsprogs-fsck = "${base_sbindir}/fsck" -FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" -FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf" -FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs" -FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" -FILES_libcomerr = "${base_libdir}/libcom_err.so.*" -FILES_libss = "${base_libdir}/libss.so.*" -FILES_libe2p = "${base_libdir}/libe2p.so.*" -FILES_libext2fs = "${libdir}/e2initrd_helper ${libdir}/libext2fs.so.*" -FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so" - -BBCLASSEXTEND = "native" -- cgit v1.2.3