From c7747266beb91d1ed16ac85bf6d0ea539f4bc556 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 18 May 2009 10:50:13 +0200 Subject: e2fsprogs(-native): update to 1.41.5 * add staging tweak from poky to get stuff into /bin instead of /sbin --- .../e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch | 289 --------------------- recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb | 8 +- recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb | 19 ++ recipes/e2fsprogs/e2fsprogs.inc | 5 + recipes/e2fsprogs/e2fsprogs/mkinstalldirs.patch | 289 +++++++++++++++++++++ recipes/e2fsprogs/e2fsprogs_1.41.5.bb | 96 +++++++ 6 files changed, 415 insertions(+), 291 deletions(-) delete mode 100644 recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch create mode 100644 recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb create mode 100644 recipes/e2fsprogs/e2fsprogs/mkinstalldirs.patch create mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.5.bb (limited to 'recipes') diff --git a/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch b/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch deleted file mode 100644 index 759e84edb0..0000000000 --- a/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch +++ /dev/null @@ -1,289 +0,0 @@ -This patch is based on the following: - -http://cvs.fedora.redhat.com/viewvc/rpms/e2fsprogs/F-7/e2fsprogs-1.39-mkinstalldirs.patch - -Index: e2fsprogs-1.41.4/configure.in -=================================================================== ---- e2fsprogs-1.41.4.orig/configure.in 2008-10-07 15:22:39.000000000 +0100 -+++ e2fsprogs-1.41.4/configure.in 2009-04-09 21:19:28.000000000 +0100 -@@ -577,6 +577,7 @@ - fi - AC_SUBST(MAKEINFO) - AC_PROG_INSTALL -+AC_PROG_MKDIR_P - # See if we need a separate native compiler. - if test $cross_compiling = no; then - BUILD_CC="$CC" -Index: e2fsprogs-1.41.4/debugfs/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/debugfs/Makefile.in 2008-06-18 04:53:42.000000000 +0100 -+++ e2fsprogs-1.41.4/debugfs/Makefile.in 2009-04-09 21:19:28.000000000 +0100 -@@ -47,8 +47,8 @@ - @$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8 - - installdirs: -- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ -+ @echo " MKDIR_P $(root_sbindir) $(man8dir)" -+ @$(MKDIR_P) $(DESTDIR)$(root_sbindir) \ - $(DESTDIR)$(man8dir) - - install: $(PROGS) $(MANPAGES) installdirs -Index: e2fsprogs-1.41.4/doc/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/doc/Makefile.in 2008-05-26 00:52:27.000000000 +0100 -+++ e2fsprogs-1.41.4/doc/Makefile.in 2009-04-09 21:20:09.000000000 +0100 -@@ -20,8 +20,8 @@ - - install-doc-libs: libext2fs.info libext2fs.dvi - @$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info* -- @echo " MKINSTALLDIRS $(infodir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(infodir) -+ @echo " MKDIR_P $(infodir)" -+ @$(MKDIR_P) $(DESTDIR)$(infodir) - -@for i in libext2fs.info* ; do \ - echo " INSTALL_DATA $(infodir)/$$i" ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \ -Index: e2fsprogs-1.41.4/e2fsck/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/e2fsck/Makefile.in 2008-11-15 04:19:57.000000000 +0000 -+++ e2fsprogs-1.41.4/e2fsck/Makefile.in 2009-04-09 21:20:44.000000000 +0100 -@@ -185,8 +185,8 @@ - @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5 - - installdirs: -- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ -+ @echo " MKDIR_P $(root_sbindir) $(man8dir)" -+ @$(MKDIR_P) $(DESTDIR)$(root_sbindir) \ - $(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir) - - install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs -Index: e2fsprogs-1.41.4/intl/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/intl/Makefile.in 2007-06-30 13:58:34.000000000 +0100 -+++ e2fsprogs-1.41.4/intl/Makefile.in 2009-04-09 21:19:28.000000000 +0100 -@@ -40,8 +40,8 @@ - - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ --MKINSTALLDIRS = @MKINSTALLDIRS@ --mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) -+MKDIR_P = @MKDIR_P@ -+mkdir_p = @MKDIR_P@ - - l = @INTL_LIBTOOL_SUFFIX_PREFIX@ - -Index: e2fsprogs-1.41.4/lib/blkid/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/lib/blkid/Makefile.in 2008-10-07 15:22:39.000000000 +0100 -+++ e2fsprogs-1.41.4/lib/blkid/Makefile.in 2009-04-09 21:19:28.000000000 +0100 -@@ -142,8 +142,8 @@ - @cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status - - installdirs:: -- @echo " MKINSTALLDIRS $(libdir) $(includedir)/blkid" -- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ -+ @echo " MKDIR_P $(libdir) $(includedir)/blkid" -+ @$(MKDIR_P) $(DESTDIR)$(libdir) \ - $(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig - - install:: all installdirs -Index: e2fsprogs-1.41.4/lib/e2p/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/lib/e2p/Makefile.in 2008-10-07 15:22:39.000000000 +0100 -+++ e2fsprogs-1.41.4/lib/e2p/Makefile.in 2009-04-09 21:19:28.000000000 +0100 -@@ -79,8 +79,8 @@ - ./tst_feature - - installdirs:: -- @echo " MKINSTALLDIRS $(libdir) $(includedir)/e2p" -- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ -+ @echo " MKDIR_P $(libdir) $(includedir)/e2p" -+ @$(MKDIR_P) $(DESTDIR)$(libdir) \ - $(DESTDIR)$(includedir)/e2p $(DESTDIR)$(libdir)/pkgconfig - - install:: all installdirs -Index: e2fsprogs-1.41.4/lib/et/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/lib/et/Makefile.in 2008-10-07 15:22:39.000000000 +0100 -+++ e2fsprogs-1.41.4/lib/et/Makefile.in 2009-04-09 21:19:28.000000000 +0100 -@@ -74,8 +74,8 @@ - $(TAGS) $(SRCS) - - installdirs:: -- @echo " MKINSTALLDIRS $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ -+ @echo " MKDIR_P $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)" -+ @$(MKDIR_P) $(DESTDIR)$(libdir) \ - $(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et \ - $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \ - $(DESTDIR)$(man3dir) $(DESTDIR)$(libdir)/pkgconfig -Index: e2fsprogs-1.41.4/lib/ext2fs/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/lib/ext2fs/Makefile.in 2008-10-07 15:22:39.000000000 +0100 -+++ e2fsprogs-1.41.4/lib/ext2fs/Makefile.in 2009-04-09 21:19:28.000000000 +0100 -@@ -330,8 +330,8 @@ - LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_csum - - installdirs:: -- @echo " MKINSTALLDIRS $(libdir) $(includedir)/ext2fs" -- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ -+ @echo " MKDIR_P $(libdir) $(includedir)/ext2fs" -+ @$(MKDIR_P) $(DESTDIR)$(libdir) \ - $(DESTDIR)$(includedir)/ext2fs $(DESTDIR)$(libdir)/pkgconfig - - install:: all $(HFILES) $(HFILES_IN) installdirs ext2fs.pc -Index: e2fsprogs-1.41.4/lib/Makefile.elf-lib -=================================================================== ---- e2fsprogs-1.41.4.orig/lib/Makefile.elf-lib 2008-10-07 15:22:39.000000000 +0100 -+++ e2fsprogs-1.41.4/lib/Makefile.elf-lib 2009-04-09 21:19:28.000000000 +0100 -@@ -33,8 +33,8 @@ - @$(LN) ../$(ELF_LIB) ../$(ELF_SONAME) - - installdirs-elf-lib:: -- @echo " MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \ -+ @echo " MKDIR_P $(ELF_INSTALL_DIR) $(libdir)" -+ @$(MKDIR_P) $(DESTDIR)$(ELF_INSTALL_DIR) \ - $(DESTDIR)$(libdir) - - installdirs:: installdirs-elf-lib -Index: e2fsprogs-1.41.4/lib/ss/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/lib/ss/Makefile.in 2008-10-07 15:22:39.000000000 +0100 -+++ e2fsprogs-1.41.4/lib/ss/Makefile.in 2009-04-09 21:19:28.000000000 +0100 -@@ -129,8 +129,8 @@ - @cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status - - installdirs:: -- @echo " MKINSTALLDIRS $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ -+ @echo " MKDIR_P $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)" -+ @$(MKDIR_P) $(DESTDIR)$(libdir) \ - $(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss \ - $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/pkgconfig - -Index: e2fsprogs-1.41.4/lib/uuid/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/lib/uuid/Makefile.in 2008-02-19 04:33:10.000000000 +0000 -+++ e2fsprogs-1.41.4/lib/uuid/Makefile.in 2009-04-09 21:19:28.000000000 +0100 -@@ -126,8 +126,8 @@ - @cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status - - installdirs:: -- @echo " MKINSTALLDIRS $(libdir) $(includedir)/uuid $(man3dir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ -+ @echo " MKDIR_P $(libdir) $(includedir)/uuid $(man3dir)" -+ @$(MKDIR_P) $(DESTDIR)$(libdir) \ - $(DESTDIR)$(includedir)/uuid $(DESTDIR)$(man3dir) \ - $(DESTDIR)$(libdir)/pkgconfig - -Index: e2fsprogs-1.41.4/MCONFIG.in -=================================================================== ---- e2fsprogs-1.41.4.orig/MCONFIG.in 2008-11-15 17:17:22.000000000 +0000 -+++ e2fsprogs-1.41.4/MCONFIG.in 2009-04-09 21:19:28.000000000 +0100 -@@ -64,7 +64,7 @@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ --MKINSTALLDIRS = @MKINSTALLDIRS@ -+MKDIR_P = @MKDIR_P@ - - # - # Library definitions -Index: e2fsprogs-1.41.4/misc/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/misc/Makefile.in 2008-11-15 17:33:33.000000000 +0000 -+++ e2fsprogs-1.41.4/misc/Makefile.in 2009-04-09 21:21:22.000000000 +0100 -@@ -366,8 +366,8 @@ - @$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8 - - installdirs: -- @echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \ -+ @echo " MKDIR_P $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)" -+ @$(MKDIR_P) $(DESTDIR)$(sbindir) \ - $(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \ - $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \ - $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \ -Index: e2fsprogs-1.41.4/po/Makefile.in.in -=================================================================== ---- e2fsprogs-1.41.4.orig/po/Makefile.in.in 2007-06-30 13:58:34.000000000 +0100 -+++ e2fsprogs-1.41.4/po/Makefile.in.in 2009-04-09 21:19:28.000000000 +0100 -@@ -26,11 +26,10 @@ - datadir = @datadir@ - localedir = $(datadir)/locale - gettextsrcdir = $(datadir)/gettext/po -+mkdir_p = @MKDIR_P@ - - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ --MKINSTALLDIRS = @MKINSTALLDIRS@ --mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) - - GMSGFMT = @GMSGFMT@ - MSGFMT = @MSGFMT@ -@@ -148,7 +147,7 @@ - install-exec: - install-data: install-data-@USE_NLS@ - if test "$(PACKAGE)" = "gettext-tools"; then \ -- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ -+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ - for file in $(DISTFILES.common) Makevars.template; do \ - $(INSTALL_DATA) $(srcdir)/$$file \ - $(DESTDIR)$(gettextsrcdir)/$$file; \ -@@ -161,13 +160,13 @@ - fi - install-data-no: all - install-data-yes: all -- $(mkinstalldirs) $(DESTDIR)$(datadir) -+ $(mkdir_p) $(DESTDIR)$(datadir) - @catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ - dir=$(localedir)/$$lang/LC_MESSAGES; \ -- $(mkinstalldirs) $(DESTDIR)$$dir; \ -+ $(mkdir_p) $(DESTDIR)$$dir; \ - if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ - $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ - echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ -@@ -207,19 +206,19 @@ - installdirs-exec: - installdirs-data: installdirs-data-@USE_NLS@ - if test "$(PACKAGE)" = "gettext-tools"; then \ -- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ -+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ - else \ - : ; \ - fi - installdirs-data-no: - installdirs-data-yes: -- $(mkinstalldirs) $(DESTDIR)$(datadir) -+ $(mkdir_p) $(DESTDIR)$(datadir) - @catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ - dir=$(localedir)/$$lang/LC_MESSAGES; \ -- $(mkinstalldirs) $(DESTDIR)$$dir; \ -+ $(mkdir_p) $(DESTDIR)$$dir; \ - for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ - if test -n "$$lc"; then \ - if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ -Index: e2fsprogs-1.41.4/resize/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/resize/Makefile.in 2007-06-30 13:58:35.000000000 +0100 -+++ e2fsprogs-1.41.4/resize/Makefile.in 2009-04-09 21:19:28.000000000 +0100 -@@ -57,8 +57,8 @@ - @$(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS) - - installdirs: -- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ -+ @echo " MKDIR_P $(root_sbindir) $(man8dir)" -+ @$(MKDIR_P) $(DESTDIR)$(root_sbindir) \ - $(DESTDIR)$(man8dir) - - install: $(PROGS) $(MANPAGES) installdirs diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb b/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb index f2c3898dbe..e79958cb2f 100644 --- a/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb +++ b/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb @@ -2,7 +2,7 @@ SECTION = "base" require e2fsprogs.inc inherit native -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" EXTRA_OECONF = "" @@ -12,5 +12,9 @@ PACKAGES = "" DEPENDS = "" do_stage () { - oe_runmake install + oe_runmake install + install -d ${STAGING_BINDIR_NATIVE}/ + for b in ${e2miscbins}; do + install -m 0755 misc/$b ${STAGING_BINDIR_NATIVE}/ || die "failed to install $b" + done } diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb b/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb new file mode 100644 index 0000000000..b29064f5c8 --- /dev/null +++ b/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb @@ -0,0 +1,19 @@ +SECTION = "base" +require e2fsprogs.inc +inherit native + +SRC_URI += "file://mkinstalldirs.patch;patch=1" + +EXTRA_OECONF = "" + +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +PACKAGES = "" +DEPENDS = "" + +do_stage () { + autotools_stage_all + install -d ${STAGING_BINDIR_NATIVE}/ + for b in ${e2miscbins}; do + install -m 0755 misc/$b ${STAGING_BINDIR_NATIVE}/ || die "failed to install $b" + done +} diff --git a/recipes/e2fsprogs/e2fsprogs.inc b/recipes/e2fsprogs/e2fsprogs.inc index b7a1223cc9..6821d71004 100644 --- a/recipes/e2fsprogs/e2fsprogs.inc +++ b/recipes/e2fsprogs/e2fsprogs.inc @@ -15,3 +15,8 @@ EXTRA_OECONF = "${@['','--disable-tls'][bb.data.getVar('ARM_ABI', d, 1) == 'oabi --enable-dynamic-e2fsck --disable-nls --sbindir=${base_sbindir}" PARALLEL_MAKE = "" + +e2miscbins = "mke2fs badblocks tune2fs dumpe2fs blkid logsave e2image fsck \ + e2undo chattr lsattr uuidgen mklost+found filefrag uuidd e2initrd_helper" + + diff --git a/recipes/e2fsprogs/e2fsprogs/mkinstalldirs.patch b/recipes/e2fsprogs/e2fsprogs/mkinstalldirs.patch new file mode 100644 index 0000000000..759e84edb0 --- /dev/null +++ b/recipes/e2fsprogs/e2fsprogs/mkinstalldirs.patch @@ -0,0 +1,289 @@ +This patch is based on the following: + +http://cvs.fedora.redhat.com/viewvc/rpms/e2fsprogs/F-7/e2fsprogs-1.39-mkinstalldirs.patch + +Index: e2fsprogs-1.41.4/configure.in +=================================================================== +--- e2fsprogs-1.41.4.orig/configure.in 2008-10-07 15:22:39.000000000 +0100 ++++ e2fsprogs-1.41.4/configure.in 2009-04-09 21:19:28.000000000 +0100 +@@ -577,6 +577,7 @@ + fi + AC_SUBST(MAKEINFO) + AC_PROG_INSTALL ++AC_PROG_MKDIR_P + # See if we need a separate native compiler. + if test $cross_compiling = no; then + BUILD_CC="$CC" +Index: e2fsprogs-1.41.4/debugfs/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/debugfs/Makefile.in 2008-06-18 04:53:42.000000000 +0100 ++++ e2fsprogs-1.41.4/debugfs/Makefile.in 2009-04-09 21:19:28.000000000 +0100 +@@ -47,8 +47,8 @@ + @$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8 + + installdirs: +- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ ++ @echo " MKDIR_P $(root_sbindir) $(man8dir)" ++ @$(MKDIR_P) $(DESTDIR)$(root_sbindir) \ + $(DESTDIR)$(man8dir) + + install: $(PROGS) $(MANPAGES) installdirs +Index: e2fsprogs-1.41.4/doc/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/doc/Makefile.in 2008-05-26 00:52:27.000000000 +0100 ++++ e2fsprogs-1.41.4/doc/Makefile.in 2009-04-09 21:20:09.000000000 +0100 +@@ -20,8 +20,8 @@ + + install-doc-libs: libext2fs.info libext2fs.dvi + @$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info* +- @echo " MKINSTALLDIRS $(infodir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(infodir) ++ @echo " MKDIR_P $(infodir)" ++ @$(MKDIR_P) $(DESTDIR)$(infodir) + -@for i in libext2fs.info* ; do \ + echo " INSTALL_DATA $(infodir)/$$i" ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \ +Index: e2fsprogs-1.41.4/e2fsck/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/e2fsck/Makefile.in 2008-11-15 04:19:57.000000000 +0000 ++++ e2fsprogs-1.41.4/e2fsck/Makefile.in 2009-04-09 21:20:44.000000000 +0100 +@@ -185,8 +185,8 @@ + @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5 + + installdirs: +- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ ++ @echo " MKDIR_P $(root_sbindir) $(man8dir)" ++ @$(MKDIR_P) $(DESTDIR)$(root_sbindir) \ + $(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir) + + install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs +Index: e2fsprogs-1.41.4/intl/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/intl/Makefile.in 2007-06-30 13:58:34.000000000 +0100 ++++ e2fsprogs-1.41.4/intl/Makefile.in 2009-04-09 21:19:28.000000000 +0100 +@@ -40,8 +40,8 @@ + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +-MKINSTALLDIRS = @MKINSTALLDIRS@ +-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) ++MKDIR_P = @MKDIR_P@ ++mkdir_p = @MKDIR_P@ + + l = @INTL_LIBTOOL_SUFFIX_PREFIX@ + +Index: e2fsprogs-1.41.4/lib/blkid/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/lib/blkid/Makefile.in 2008-10-07 15:22:39.000000000 +0100 ++++ e2fsprogs-1.41.4/lib/blkid/Makefile.in 2009-04-09 21:19:28.000000000 +0100 +@@ -142,8 +142,8 @@ + @cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status + + installdirs:: +- @echo " MKINSTALLDIRS $(libdir) $(includedir)/blkid" +- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ ++ @echo " MKDIR_P $(libdir) $(includedir)/blkid" ++ @$(MKDIR_P) $(DESTDIR)$(libdir) \ + $(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig + + install:: all installdirs +Index: e2fsprogs-1.41.4/lib/e2p/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/lib/e2p/Makefile.in 2008-10-07 15:22:39.000000000 +0100 ++++ e2fsprogs-1.41.4/lib/e2p/Makefile.in 2009-04-09 21:19:28.000000000 +0100 +@@ -79,8 +79,8 @@ + ./tst_feature + + installdirs:: +- @echo " MKINSTALLDIRS $(libdir) $(includedir)/e2p" +- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ ++ @echo " MKDIR_P $(libdir) $(includedir)/e2p" ++ @$(MKDIR_P) $(DESTDIR)$(libdir) \ + $(DESTDIR)$(includedir)/e2p $(DESTDIR)$(libdir)/pkgconfig + + install:: all installdirs +Index: e2fsprogs-1.41.4/lib/et/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/lib/et/Makefile.in 2008-10-07 15:22:39.000000000 +0100 ++++ e2fsprogs-1.41.4/lib/et/Makefile.in 2009-04-09 21:19:28.000000000 +0100 +@@ -74,8 +74,8 @@ + $(TAGS) $(SRCS) + + installdirs:: +- @echo " MKINSTALLDIRS $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ ++ @echo " MKDIR_P $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)" ++ @$(MKDIR_P) $(DESTDIR)$(libdir) \ + $(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et \ + $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \ + $(DESTDIR)$(man3dir) $(DESTDIR)$(libdir)/pkgconfig +Index: e2fsprogs-1.41.4/lib/ext2fs/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/lib/ext2fs/Makefile.in 2008-10-07 15:22:39.000000000 +0100 ++++ e2fsprogs-1.41.4/lib/ext2fs/Makefile.in 2009-04-09 21:19:28.000000000 +0100 +@@ -330,8 +330,8 @@ + LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_csum + + installdirs:: +- @echo " MKINSTALLDIRS $(libdir) $(includedir)/ext2fs" +- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ ++ @echo " MKDIR_P $(libdir) $(includedir)/ext2fs" ++ @$(MKDIR_P) $(DESTDIR)$(libdir) \ + $(DESTDIR)$(includedir)/ext2fs $(DESTDIR)$(libdir)/pkgconfig + + install:: all $(HFILES) $(HFILES_IN) installdirs ext2fs.pc +Index: e2fsprogs-1.41.4/lib/Makefile.elf-lib +=================================================================== +--- e2fsprogs-1.41.4.orig/lib/Makefile.elf-lib 2008-10-07 15:22:39.000000000 +0100 ++++ e2fsprogs-1.41.4/lib/Makefile.elf-lib 2009-04-09 21:19:28.000000000 +0100 +@@ -33,8 +33,8 @@ + @$(LN) ../$(ELF_LIB) ../$(ELF_SONAME) + + installdirs-elf-lib:: +- @echo " MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \ ++ @echo " MKDIR_P $(ELF_INSTALL_DIR) $(libdir)" ++ @$(MKDIR_P) $(DESTDIR)$(ELF_INSTALL_DIR) \ + $(DESTDIR)$(libdir) + + installdirs:: installdirs-elf-lib +Index: e2fsprogs-1.41.4/lib/ss/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/lib/ss/Makefile.in 2008-10-07 15:22:39.000000000 +0100 ++++ e2fsprogs-1.41.4/lib/ss/Makefile.in 2009-04-09 21:19:28.000000000 +0100 +@@ -129,8 +129,8 @@ + @cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status + + installdirs:: +- @echo " MKINSTALLDIRS $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ ++ @echo " MKDIR_P $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)" ++ @$(MKDIR_P) $(DESTDIR)$(libdir) \ + $(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss \ + $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/pkgconfig + +Index: e2fsprogs-1.41.4/lib/uuid/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/lib/uuid/Makefile.in 2008-02-19 04:33:10.000000000 +0000 ++++ e2fsprogs-1.41.4/lib/uuid/Makefile.in 2009-04-09 21:19:28.000000000 +0100 +@@ -126,8 +126,8 @@ + @cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status + + installdirs:: +- @echo " MKINSTALLDIRS $(libdir) $(includedir)/uuid $(man3dir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ ++ @echo " MKDIR_P $(libdir) $(includedir)/uuid $(man3dir)" ++ @$(MKDIR_P) $(DESTDIR)$(libdir) \ + $(DESTDIR)$(includedir)/uuid $(DESTDIR)$(man3dir) \ + $(DESTDIR)$(libdir)/pkgconfig + +Index: e2fsprogs-1.41.4/MCONFIG.in +=================================================================== +--- e2fsprogs-1.41.4.orig/MCONFIG.in 2008-11-15 17:17:22.000000000 +0000 ++++ e2fsprogs-1.41.4/MCONFIG.in 2009-04-09 21:19:28.000000000 +0100 +@@ -64,7 +64,7 @@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +-MKINSTALLDIRS = @MKINSTALLDIRS@ ++MKDIR_P = @MKDIR_P@ + + # + # Library definitions +Index: e2fsprogs-1.41.4/misc/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/misc/Makefile.in 2008-11-15 17:33:33.000000000 +0000 ++++ e2fsprogs-1.41.4/misc/Makefile.in 2009-04-09 21:21:22.000000000 +0100 +@@ -366,8 +366,8 @@ + @$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8 + + installdirs: +- @echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \ ++ @echo " MKDIR_P $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)" ++ @$(MKDIR_P) $(DESTDIR)$(sbindir) \ + $(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \ + $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \ + $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \ +Index: e2fsprogs-1.41.4/po/Makefile.in.in +=================================================================== +--- e2fsprogs-1.41.4.orig/po/Makefile.in.in 2007-06-30 13:58:34.000000000 +0100 ++++ e2fsprogs-1.41.4/po/Makefile.in.in 2009-04-09 21:19:28.000000000 +0100 +@@ -26,11 +26,10 @@ + datadir = @datadir@ + localedir = $(datadir)/locale + gettextsrcdir = $(datadir)/gettext/po ++mkdir_p = @MKDIR_P@ + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +-MKINSTALLDIRS = @MKINSTALLDIRS@ +-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) + + GMSGFMT = @GMSGFMT@ + MSGFMT = @MSGFMT@ +@@ -148,7 +147,7 @@ + install-exec: + install-data: install-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext-tools"; then \ +- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ ++ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ + for file in $(DISTFILES.common) Makevars.template; do \ + $(INSTALL_DATA) $(srcdir)/$$file \ + $(DESTDIR)$(gettextsrcdir)/$$file; \ +@@ -161,13 +160,13 @@ + fi + install-data-no: all + install-data-yes: all +- $(mkinstalldirs) $(DESTDIR)$(datadir) ++ $(mkdir_p) $(DESTDIR)$(datadir) + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ +- $(mkinstalldirs) $(DESTDIR)$$dir; \ ++ $(mkdir_p) $(DESTDIR)$$dir; \ + if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ + $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ + echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ +@@ -207,19 +206,19 @@ + installdirs-exec: + installdirs-data: installdirs-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext-tools"; then \ +- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ ++ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ + else \ + : ; \ + fi + installdirs-data-no: + installdirs-data-yes: +- $(mkinstalldirs) $(DESTDIR)$(datadir) ++ $(mkdir_p) $(DESTDIR)$(datadir) + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ +- $(mkinstalldirs) $(DESTDIR)$$dir; \ ++ $(mkdir_p) $(DESTDIR)$$dir; \ + for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ + if test -n "$$lc"; then \ + if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ +Index: e2fsprogs-1.41.4/resize/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/resize/Makefile.in 2007-06-30 13:58:35.000000000 +0100 ++++ e2fsprogs-1.41.4/resize/Makefile.in 2009-04-09 21:19:28.000000000 +0100 +@@ -57,8 +57,8 @@ + @$(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS) + + installdirs: +- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ ++ @echo " MKDIR_P $(root_sbindir) $(man8dir)" ++ @$(MKDIR_P) $(DESTDIR)$(root_sbindir) \ + $(DESTDIR)$(man8dir) + + install: $(PROGS) $(MANPAGES) installdirs diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.5.bb b/recipes/e2fsprogs/e2fsprogs_1.41.5.bb new file mode 100644 index 0000000000..4fc357f364 --- /dev/null +++ b/recipes/e2fsprogs/e2fsprogs_1.41.5.bb @@ -0,0 +1,96 @@ +require e2fsprogs.inc + +SRC_URI += "file://mkinstalldirs.patch;patch=1" + +DEPENDS += "gettext-native" + +do_compile_prepend () { + find ./ -print|xargs chmod u=rwX + ( cd util; ${BUILD_CC} subst.c -o subst ) +} + +ext2fsheaders = "ext2_ext_attr.h bitops.h ext2_err.h \ + ext2_types.h ext2_fs.h ext2_io.h \ + ext2fs.h" +e2pheaders = "e2p.h" + +do_stage () { + oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/ + oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/ + install -d ${STAGING_INCDIR}/e2p + for h in ${e2pheaders}; do + install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h" + done + install -d ${STAGING_INCDIR}/ext2fs + for h in ${ext2fsheaders}; do + install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h" + done + autotools_stage_all +} + +# blkid used to be part of e2fsprogs but is useful outside, add it +# as an RDEPENDS so that anything relying on it being in e2fsprogs +# still works +RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-badblocks" + +FILES_${PN} += "${libdir}/e2initrd_helper" + +PACKAGES =+ "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks" +FILES_e2fsprogs-blkid = "${base_sbindir}/blkid.${PN}" +FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen" +FILES_e2fsprogs-fsck = "${base_sbindir}/fsck.${PN}" +FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck.${PN} ${base_sbindir}/fsck.ext*.${PN}" +FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs.${PN} ${base_sbindir}/mkfs.ext*.${PN}" +FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs" +FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" + +do_install_append () { + mv ${D}${base_sbindir}/fsck ${D}${base_sbindir}/fsck.${PN} + mv ${D}${base_sbindir}/blkid ${D}${base_sbindir}/blkid.${PN} + mv ${D}${base_sbindir}/e2fsck ${D}${base_sbindir}/e2fsck.${PN} + mv ${D}${base_sbindir}/fsck.ext2 ${D}${base_sbindir}/fsck.ext2.${PN} + mv ${D}${base_sbindir}/fsck.ext3 ${D}${base_sbindir}/fsck.ext3.${PN} + mv ${D}${base_sbindir}/mke2fs ${D}${base_sbindir}/mke2fs.${PN} + mv ${D}${base_sbindir}/mkfs.ext2 ${D}${base_sbindir}/mkfs.ext2.${PN} + mv ${D}${base_sbindir}/mkfs.ext3 ${D}${base_sbindir}/mkfs.ext3.${PN} +} + +pkg_postinst_e2fsprogs-fsck () { + update-alternatives --install ${base_sbindir}/fsck fsck fsck.${PN} 100 +} + +pkg_prerm_e2fsprogs-fsck () { + update-alternatives --remove fsck fsck.${PN} +} + +pkg_postinst_e2fsprogs-blkid () { + update-alternatives --install ${base_sbindir}/blkid blkid blkid.${PN} 100 +} + +pkg_prerm_e2fsprogs-blkid () { + update-alternatives --remove blkid blkid.${PN} +} + +pkg_postinst_e2fsprogs-e2fsck () { + update-alternatives --install ${base_sbindir}/e2fsck e2fsck e2fsck.${PN} 100 + update-alternatives --install ${base_sbindir}/fsck.ext2 fsck.ext2 fsck.ext2.${PN} 100 + update-alternatives --install ${base_sbindir}/fsck.ext3 fsck.ext3 fsck.ext3.${PN} 100 +} + +pkg_prerm_e2fsprogs-e2fsck () { + update-alternatives --remove e2fsck e2fsck.${PN} + update-alternatives --remove fsck.ext2 fsck.ext2.${PN} + update-alternatives --remove fsck.ext3 fsck.ext3.${PN} +} + +pkg_postinst_e2fsprogs-mke2fs () { + update-alternatives --install ${base_sbindir}/mke2fs mke2fs mke2fs.${PN} 100 + update-alternatives --install ${base_sbindir}/mkfs.ext2 mkfs.ext2 mkfs.ext2.${PN} 100 + update-alternatives --install ${base_sbindir}/mkfs.ext3 mkfs.ext3 mkfs.ext3.${PN} 100 +} + +pkg_prerm_e2fsprogs-mke2fs () { + update-alternatives --remove mke2fs mke2fs.${PN} + update-alternatives --remove mkfs.ext2 mkfs.ext2.${PN} + update-alternatives --remove mkfs.ext3 mkfs.ext3.${PN} +} -- cgit 1.2.3-korg