* [PATCH 1/4] bitbake.conf: add ext4 image support
@ 2010-08-06 9:40 Bernhard Reutner-Fischer
2010-08-06 9:40 ` [PATCH 2/4] e2fsprogs: add 1.41.12, remove old versions Bernhard Reutner-Fischer
` (3 more replies)
0 siblings, 4 replies; 31+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-08-06 9:40 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
conf/bitbake.conf | 6 ++++++
conf/local.conf.sample | 2 +-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index abe500a..9b0afce 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -366,6 +366,8 @@ IMAGE_CMD_ext2 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IM
IMAGE_CMD_ext2.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz"
IMAGE_CMD_ext3 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
IMAGE_CMD_ext3.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz"
+IMAGE_CMD_ext4 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4"
+IMAGE_CMD_ext4.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.gz"
IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
IMAGE_CMD_squashfs-lzma = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend -comp lzma"
IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ."
@@ -397,6 +399,8 @@ IMAGE_DEPENDS_ext2 = "genext2fs-native"
IMAGE_DEPENDS_ext2.gz = "genext2fs-native"
IMAGE_DEPENDS_ext3 = "genext2fs-native e2fsprogs-native"
IMAGE_DEPENDS_ext3.gz = "genext2fs-native e2fsprogs-native"
+IMAGE_DEPENDS_ext4 = "genext2fs-native e2fsprogs-native"
+IMAGE_DEPENDS_ext4.gz = "genext2fs-native e2fsprogs-native"
IMAGE_DEPENDS_cpio.gz.u-boot = "u-boot-mkimage-native"
IMAGE_DEPENDS_cpio.lzma = "lzma-native"
IMAGE_DEPENDS_squashfs = "squashfs-tools-native"
@@ -713,6 +717,8 @@ IMAGE_ROOTFS_SIZE_ext2 ?= "65536"
IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536"
IMAGE_ROOTFS_SIZE_ext3 ?= "65536"
IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536"
+IMAGE_ROOTFS_SIZE_ext4 ?= "65536"
+IMAGE_ROOTFS_SIZE_ext4.gz ?= "65536"
DISTRO_PR ?= ""
# Forcefully set CACHE now so future changes to things like
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 60c10e4..c2d5c54 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -114,7 +114,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
# INHERIT = "package_tar"
# Add the required image file system types below. Valid are
-# jffs2, tar(.gz|bz2), cpio(.gz), cramfs, ext2(.gz), ext3(.gz)
+# jffs2, tar(.gz|bz2), cpio(.gz), cramfs, ext2(.gz), ext3(.gz), ext4(.gz),
# squashfs, squashfs-lzma
IMAGE_FSTYPES = "jffs2 tar"
--
1.7.1
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 2/4] e2fsprogs: add 1.41.12, remove old versions
2010-08-06 9:40 [PATCH 1/4] bitbake.conf: add ext4 image support Bernhard Reutner-Fischer
@ 2010-08-06 9:40 ` Bernhard Reutner-Fischer
2010-08-06 9:40 ` [PATCH 3/4] git: add 1.7.2.1 Bernhard Reutner-Fischer
` (2 subsequent siblings)
3 siblings, 0 replies; 31+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-08-06 9:40 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
.../e2fsprogs/e2fsprogs-1.38/file-open-mode.patch | 11 -
.../e2fsprogs/e2fsprogs-1.38/mkinstalldirs.patch | 273 --------------------
.../e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch | 82 ------
recipes/e2fsprogs/e2fsprogs_1.38.bb | 13 -
recipes/e2fsprogs/e2fsprogs_1.41.12.bb | 10 +
recipes/e2fsprogs/e2fsprogs_1.41.4.bb | 8 -
recipes/e2fsprogs/e2fsprogs_1.41.5.bb | 8 -
recipes/e2fsprogs/e2fsprogs_1.41.9.bb | 10 -
8 files changed, 10 insertions(+), 405 deletions(-)
delete mode 100644 recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch
delete mode 100644 recipes/e2fsprogs/e2fsprogs-1.38/mkinstalldirs.patch
delete mode 100644 recipes/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch
delete mode 100644 recipes/e2fsprogs/e2fsprogs_1.38.bb
create mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.12.bb
delete mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.4.bb
delete mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.5.bb
delete mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.9.bb
diff --git a/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch b/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch
deleted file mode 100644
index 97679d6..0000000
--- a/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- e2fsprogs-1.38/lib/ext2fs/ismounted.c~ 2005-06-06 06:05:22.000000000 +1000
-+++ e2fsprogs-1.38/lib/ext2fs/ismounted.c 2009-04-03 15:07:35.000000000 +1100
-@@ -147,7 +147,7 @@
- is_root:
- #define TEST_FILE "/.ismount-test-file"
- *mount_flags |= EXT2_MF_ISROOT;
-- fd = open(TEST_FILE, O_RDWR|O_CREAT);
-+ fd = open(TEST_FILE, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
- if (fd < 0) {
- if (errno == EROFS)
- *mount_flags |= EXT2_MF_READONLY;
diff --git a/recipes/e2fsprogs/e2fsprogs-1.38/mkinstalldirs.patch b/recipes/e2fsprogs/e2fsprogs-1.38/mkinstalldirs.patch
deleted file mode 100644
index d1dbd07..0000000
--- a/recipes/e2fsprogs/e2fsprogs-1.38/mkinstalldirs.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-This patch is based on the following:
-
-http://cvs.fedora.redhat.com/viewvc/rpms/e2fsprogs/F-7/e2fsprogs-1.39-mkinstalldirs.patch
-
-diff -urN e2fsprogs-1.38.orig/configure.in e2fsprogs-1.38/configure.in
---- e2fsprogs-1.38.orig/configure.in 2005-04-06 20:44:15.000000000 +0200
-+++ e2fsprogs-1.38/configure.in 2008-10-16 23:44:10.000000000 +0200
-@@ -518,6 +518,7 @@
- AC_CHECK_TOOL(RANLIB, ranlib, :)
- AC_CHECK_TOOL(STRIP, strip, :)
- AC_PROG_INSTALL
-+AC_PROG_MKDIR_P
- # See if we need a separate native compiler.
- if test $cross_compiling = no; then
- BUILD_CC="$CC"
-diff -urN e2fsprogs-1.38.orig/debugfs/Makefile.in e2fsprogs-1.38/debugfs/Makefile.in
---- e2fsprogs-1.38.orig/debugfs/Makefile.in 2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/debugfs/Makefile.in 2008-10-16 23:44:10.000000000 +0200
-@@ -48,8 +48,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
-diff -urN e2fsprogs-1.38.orig/doc/Makefile.in e2fsprogs-1.38/doc/Makefile.in
---- e2fsprogs-1.38.orig/doc/Makefile.in 2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/doc/Makefile.in 2008-10-16 23:44:10.000000000 +0200
-@@ -20,8 +20,8 @@
-
- install-doc-libs:
- @$(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 ; \
-diff -urN e2fsprogs-1.38.orig/e2fsck/Makefile.in e2fsprogs-1.38/e2fsck/Makefile.in
---- e2fsprogs-1.38.orig/e2fsck/Makefile.in 2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/e2fsck/Makefile.in 2008-10-16 23:44:55.000000000 +0200
-@@ -151,8 +151,8 @@
- @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.8.in e2fsck.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
-diff -urN e2fsprogs-1.38.orig/intl/Makefile.in e2fsprogs-1.38/intl/Makefile.in
---- e2fsprogs-1.38.orig/intl/Makefile.in 2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/intl/Makefile.in 2008-10-16 23:44:10.000000000 +0200
-@@ -39,8 +39,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@
-
-diff -urN e2fsprogs-1.38.orig/lib/blkid/Makefile.in e2fsprogs-1.38/lib/blkid/Makefile.in
---- e2fsprogs-1.38.orig/lib/blkid/Makefile.in 2005-06-29 19:39:54.000000000 +0200
-+++ e2fsprogs-1.38/lib/blkid/Makefile.in 2008-10-16 23:45:16.000000000 +0200
-@@ -129,8 +129,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
-diff -urN e2fsprogs-1.38.orig/lib/e2p/Makefile.in e2fsprogs-1.38/lib/e2p/Makefile.in
---- e2fsprogs-1.38.orig/lib/e2p/Makefile.in 2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/lib/e2p/Makefile.in 2008-10-16 23:44:10.000000000 +0200
-@@ -73,8 +73,8 @@
- ./tst_ostype
-
- 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
-diff -urN e2fsprogs-1.38.orig/lib/et/Makefile.in e2fsprogs-1.38/lib/et/Makefile.in
---- e2fsprogs-1.38.orig/lib/et/Makefile.in 2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/lib/et/Makefile.in 2008-10-16 23:44:10.000000000 +0200
-@@ -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
-diff -urN e2fsprogs-1.38.orig/lib/ext2fs/Makefile.in e2fsprogs-1.38/lib/ext2fs/Makefile.in
---- e2fsprogs-1.38.orig/lib/ext2fs/Makefile.in 2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/lib/ext2fs/Makefile.in 2008-10-16 23:44:10.000000000 +0200
-@@ -230,8 +230,8 @@
- @SWAPFS_CMT@ LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_byteswap
-
- 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
-diff -urN e2fsprogs-1.38.orig/lib/Makefile.elf-lib e2fsprogs-1.38/lib/Makefile.elf-lib
---- e2fsprogs-1.38.orig/lib/Makefile.elf-lib 2004-12-15 17:30:39.000000000 +0100
-+++ e2fsprogs-1.38/lib/Makefile.elf-lib 2008-10-16 23:44:10.000000000 +0200
-@@ -35,8 +35,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
-diff -urN e2fsprogs-1.38.orig/lib/ss/Makefile.in e2fsprogs-1.38/lib/ss/Makefile.in
---- e2fsprogs-1.38.orig/lib/ss/Makefile.in 2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/lib/ss/Makefile.in 2008-10-16 23:44:10.000000000 +0200
-@@ -125,8 +125,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
-
-diff -urN e2fsprogs-1.38.orig/lib/uuid/Makefile.in e2fsprogs-1.38/lib/uuid/Makefile.in
---- e2fsprogs-1.38.orig/lib/uuid/Makefile.in 2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/lib/uuid/Makefile.in 2008-10-16 23:44:10.000000000 +0200
-@@ -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
-
-diff -urN e2fsprogs-1.38.orig/MCONFIG.in e2fsprogs-1.38/MCONFIG.in
---- e2fsprogs-1.38.orig/MCONFIG.in 2005-02-04 16:43:57.000000000 +0100
-+++ e2fsprogs-1.38/MCONFIG.in 2008-10-16 23:44:10.000000000 +0200
-@@ -59,7 +59,7 @@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
--MKINSTALLDIRS = @MKINSTALLDIRS@
-+MKDIR_P = @MKDIR_P@
-
- #
- # Library definitions
-diff -urN e2fsprogs-1.38.orig/misc/Makefile.in e2fsprogs-1.38/misc/Makefile.in
---- e2fsprogs-1.38.orig/misc/Makefile.in 2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/misc/Makefile.in 2008-10-16 23:44:10.000000000 +0200
-@@ -215,8 +215,8 @@
- @$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
-
- installdirs:
-- @echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir)"
-- @$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
-+ @echo " MKDIR_P $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir)"
-+ @$(MKDIR_P) $(DESTDIR)$(sbindir) \
- $(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
- $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) $(DESTDIR)$(libdir)
-
-diff -urN e2fsprogs-1.38.orig/po/Makefile.in.in e2fsprogs-1.38/po/Makefile.in.in
---- e2fsprogs-1.38.orig/po/Makefile.in.in 2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/po/Makefile.in.in 2008-10-16 23:44:10.000000000 +0200
-@@ -25,11 +25,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@
-@@ -147,7 +146,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; \
-@@ -160,13 +159,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"; \
-@@ -206,19 +205,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 \
-diff -urN e2fsprogs-1.38.orig/resize/Makefile.in e2fsprogs-1.38/resize/Makefile.in
---- e2fsprogs-1.38.orig/resize/Makefile.in 2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/resize/Makefile.in 2008-10-16 23:44:10.000000000 +0200
-@@ -56,8 +56,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.38/no-hardlinks.patch b/recipes/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch
deleted file mode 100644
index 979f0d1..0000000
--- a/recipes/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- e2fsprogs-1.38/misc/Makefile.in.orig 2005-11-08 23:56:06.000000000 +0100
-+++ e2fsprogs-1.38/misc/Makefile.in 2005-11-08 23:59:15.000000000 +0100
-@@ -230,17 +230,13 @@
- $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
- done
- @echo " LINK $(root_sbindir)/mkfs.ext2"
-- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
-- $(DESTDIR)$(root_sbindir)/mkfs.ext2
-+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext2)
- @echo " LINK $(root_sbindir)/mkfs.ext3"
-- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
-- $(DESTDIR)$(root_sbindir)/mkfs.ext3
-+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext3)
- @echo " LINK $(root_sbindir)/e2label"
-- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
-- $(DESTDIR)$(root_sbindir)/e2label
-+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f tune2fs e2label)
- @echo " LINK $(root_sbindir)/findfs"
-- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
-- $(DESTDIR)$(root_sbindir)/findfs
-+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f tune2fs findfs)
- @for i in $(UPROGS); do \
- echo " INSTALL $(bindir)/$$i"; \
- $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \
-@@ -259,11 +255,9 @@
- @$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
- $(DESTDIR)$(man8dir)/mkfs.ext3.8.gz
- @echo " LINK mkfs.ext2.8"
-- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
-- $(DESTDIR)$(man8dir)/mkfs.ext2.8
-+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext2.8)
- @echo " LINK mkfs.ext3.8"
-- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
-- $(DESTDIR)$(man8dir)/mkfs.ext3.8
-+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext3.8)
- @for i in $(UMANPAGES); do \
- $(RM) -f $(DESTDIR)$(man1dir)/$$i.gz; \
- echo " INSTALL_DATA $(man1dir)/$$i"; \
---- e2fsprogs-1.38/lib/uuid/Makefile.in.orig 2005-11-08 23:54:17.000000000 +0100
-+++ e2fsprogs-1.38/lib/uuid/Makefile.in 2005-11-08 23:55:51.000000000 +0100
-@@ -146,9 +146,9 @@
- @$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \
- $(DESTDIR)$(man3dir)/uuid_generate_time.3.gz
- @echo " LINK $(man3dir)/uuid_generate_random.3"
-- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
-+ @(cd $(DESTDIR)$(man3dir) && $(LN_S) -f uuid_generate.3 uuid_generate_random.3)
- @echo " LINK $(man3dir)/uuid_generate_time.3"
-- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
-+ @(cd $(DESTDIR)$(man3dir) && $(LN_S) -f uuid_generate.3 uuid_generate_time.3)
- @echo " INSTALL_DATA $(libdir)/pkgconfig/uuid.pc"
- @$(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
-
---- e2fsprogs-1.38/e2fsck/Makefile.in.orig 2005-11-08 23:53:07.000000000 +0100
-+++ e2fsprogs-1.38/e2fsck/Makefile.in 2005-11-08 23:53:43.000000000 +0100
-@@ -161,11 +161,9 @@
- $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
- done
- @echo " LINK $(root_sbindir)/fsck.ext2"
-- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
-- $(DESTDIR)$(root_sbindir)/fsck.ext2
-+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext2)
- @echo " LINK $(root_sbindir)/fsck.ext3"
-- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
-- $(DESTDIR)$(root_sbindir)/fsck.ext3
-+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext3)
- @for i in $(MANPAGES); do \
- for j in $(COMPRESS_EXT); do \
- $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
-@@ -174,11 +172,9 @@
- $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
- done
- @echo " LINK $(man8dir)/fsck.ext2.8"
-- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
-- $(DESTDIR)$(man8dir)/fsck.ext2.8
-+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext2.8)
- @echo " LINK $(man8dir)/fsck.ext3.8"
-- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
-- $(DESTDIR)$(man8dir)/fsck.ext3.8
-+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext3.8)
-
- install-strip: install
- @for i in $(PROGS); do \
diff --git a/recipes/e2fsprogs/e2fsprogs_1.38.bb b/recipes/e2fsprogs/e2fsprogs_1.38.bb
deleted file mode 100644
index 3401ed0..0000000
--- a/recipes/e2fsprogs/e2fsprogs_1.38.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require e2fsprogs.inc
-
-PR = "${INC_PR}"
-
-SRC_URI += "file://no-hardlinks.patch \
- file://mkinstalldirs.patch \
- file://file-open-mode.patch \
- "
-
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-SRC_URI[md5sum] = "d774d4412bfb80d12cf3a4fdfd59de5a"
-SRC_URI[sha256sum] = "c4e482687d0cff240d02a70fcf423cc14296b6a7869cd8dd42d5404d098e0bb7"
diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.12.bb b/recipes/e2fsprogs/e2fsprogs_1.41.12.bb
new file mode 100644
index 0000000..5798501
--- /dev/null
+++ b/recipes/e2fsprogs/e2fsprogs_1.41.12.bb
@@ -0,0 +1,10 @@
+require e2fsprogs.inc
+
+PR = "${INC_PR}"
+
+do_configure() {
+ oe_runconf
+}
+
+SRC_URI[md5sum] = "1b24a21fc0c2381ef420961cbfec733f"
+SRC_URI[sha256sum] = "9c26d0dc20bfdafd0f27f3564791d6121d1c1876549d4f2ff1e41955c9bb9f20"
diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.4.bb b/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
deleted file mode 100644
index d51cdcc..0000000
--- a/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require e2fsprogs.inc
-
-PR = "${INC_PR}"
-
-SRC_URI += "file://mkinstalldirs.patch"
-
-SRC_URI[md5sum] = "59033388df36987d2b9c9bbf7e19bd57"
-SRC_URI[sha256sum] = "2cc10fee2b29add737e454eb634513135b34a638f7ca2b18364864fe089020dc"
diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.5.bb b/recipes/e2fsprogs/e2fsprogs_1.41.5.bb
deleted file mode 100644
index 9e9d7c0..0000000
--- a/recipes/e2fsprogs/e2fsprogs_1.41.5.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require e2fsprogs.inc
-
-PR = "${INC_PR}"
-
-SRC_URI += "file://mkinstalldirs.patch"
-
-SRC_URI[md5sum] = "e218df6c84fc17c1126d31de9472a76c"
-SRC_URI[sha256sum] = "b3d7d0e1058a3740ddae83d47285bd9dce161eec9e299dde7996ed721da32198"
diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.9.bb b/recipes/e2fsprogs/e2fsprogs_1.41.9.bb
deleted file mode 100644
index 6a8c113..0000000
--- a/recipes/e2fsprogs/e2fsprogs_1.41.9.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require e2fsprogs.inc
-
-PR = "${INC_PR}"
-
-do_configure() {
- oe_runconf
-}
-
-SRC_URI[md5sum] = "52f60a9e19a02f142f5546f1b5681927"
-SRC_URI[sha256sum] = "cbf1e34261a16b3d7911b60b91290b19f2010036d6ba628d45b5f0b2af2b66e8"
--
1.7.1
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 3/4] git: add 1.7.2.1
2010-08-06 9:40 [PATCH 1/4] bitbake.conf: add ext4 image support Bernhard Reutner-Fischer
2010-08-06 9:40 ` [PATCH 2/4] e2fsprogs: add 1.41.12, remove old versions Bernhard Reutner-Fischer
@ 2010-08-06 9:40 ` Bernhard Reutner-Fischer
2010-08-06 10:07 ` Paul Menzel
2010-08-06 9:40 ` [PATCH 4/4] bison: preparation for adding 2.4.2 Bernhard Reutner-Fischer
2010-08-06 12:46 ` [PATCH 1/4] bitbake.conf: add ext4 image support Bjørn Forsman
3 siblings, 1 reply; 31+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-08-06 9:40 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
.../files/git-gui-install-mode-arg-spaces.patch | 32 --------------------
recipes/git/files/git-less-hardlinks.diff | 11 ++++---
recipes/git/git-native_1.7.0.2.bb | 8 -----
recipes/git/git.inc | 2 -
recipes/git/git_1.7.0.2.bb | 28 -----------------
recipes/git/git_1.7.2.1.bb | 29 ++++++++++++++++++
6 files changed, 35 insertions(+), 75 deletions(-)
delete mode 100644 recipes/git/files/git-gui-install-mode-arg-spaces.patch
delete mode 100644 recipes/git/git-native_1.7.0.2.bb
delete mode 100644 recipes/git/git_1.7.0.2.bb
create mode 100644 recipes/git/git_1.7.2.1.bb
diff --git a/recipes/git/files/git-gui-install-mode-arg-spaces.patch b/recipes/git/files/git-gui-install-mode-arg-spaces.patch
deleted file mode 100644
index 10e4eb2..0000000
--- a/recipes/git/files/git-gui-install-mode-arg-spaces.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- git/git-gui/Makefile.orig 2007-12-26 17:16:42.000000000 +1030
-+++ git/git-gui/Makefile 2007-12-26 17:17:16.000000000 +1030
-@@ -31,11 +31,11 @@
- INSTALL = install
- endif
-
--INSTALL_D0 = $(INSTALL) -d -m755 # space is required here
-+INSTALL_D0 = $(INSTALL) -d -m 755 # space is required here
- INSTALL_D1 =
--INSTALL_R0 = $(INSTALL) -m644 # space is required here
-+INSTALL_R0 = $(INSTALL) -m 644 # space is required here
- INSTALL_R1 =
--INSTALL_X0 = $(INSTALL) -m755 # space is required here
-+INSTALL_X0 = $(INSTALL) -m 755 # space is required here
- INSTALL_X1 =
- INSTALL_L0 = rm -f # space is required here
- INSTALL_L1 = && ln # space is required here
-@@ -50,11 +50,11 @@
- QUIET_2DEVNULL = 2>/dev/null
-
- INSTALL_D0 = dir=
-- INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m755 "$$dir"
-+ INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m 755 "$$dir"
- INSTALL_R0 = src=
-- INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m644 $$src
-+ INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m 644 $$src
- INSTALL_X0 = src=
-- INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m755 $$src
-+ INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m 755 $$src
-
- INSTALL_L0 = dst=
- INSTALL_L1 = && src=
diff --git a/recipes/git/files/git-less-hardlinks.diff b/recipes/git/files/git-less-hardlinks.diff
index 183fe8f..be4924c 100644
--- a/recipes/git/files/git-less-hardlinks.diff
+++ b/recipes/git/files/git-less-hardlinks.diff
@@ -33,17 +33,18 @@ This patch isn't complete though:
ln -s $< $@ 2>/dev/null || \
cp $< $@
-@@ -1830,13 +1828,11 @@
+@@ -2081,14 +2081,12 @@
cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \
- { for p in $(BUILT_INS); do \
+ for p in $(BUILT_INS); do \
$(RM) "$$execdir/$$p" && \
- ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
- done; } && \
- { for p in $(REMOTE_CURL_ALIASES); do \
+ done && \
+ remote_curl_aliases="$(REMOTE_CURL_ALIASES)" && \
+ for p in $$remote_curl_aliases; do \
$(RM) "$$execdir/$$p" && \
- ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
- done; } && \
+ done && \
diff --git a/recipes/git/git-native_1.7.0.2.bb b/recipes/git/git-native_1.7.0.2.bb
deleted file mode 100644
index b55070a..0000000
--- a/recipes/git/git-native_1.7.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require git.inc
-inherit native
-DEPENDS = "openssl-native curl-native zlib-native expat-native"
-PR = "r4"
-SRC_URI[src.md5sum] = "76518fa774b36de81d160b85fa4f19c1"
-SRC_URI[src.sha256sum] = "5601df7fc282fdd66de196b282694eb77dcfc50438f01587de144b3ead1a6b2f"
-
-EXTRA_OECONF_append = " --without-python"
diff --git a/recipes/git/git.inc b/recipes/git/git.inc
index 8275adb..1e69682 100644
--- a/recipes/git/git.inc
+++ b/recipes/git/git.inc
@@ -4,8 +4,6 @@ LICENSE = "GPL"
SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2;name=src"
-S = "${WORKDIR}/git-${PV}"
-
inherit autotools
EXTRA_OEMAKE = "NO_TCLTK=1"
diff --git a/recipes/git/git_1.7.0.2.bb b/recipes/git/git_1.7.0.2.bb
deleted file mode 100644
index a3a73f0..0000000
--- a/recipes/git/git_1.7.0.2.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-require git.inc
-
-SRC_URI[src.md5sum] = "76518fa774b36de81d160b85fa4f19c1"
-SRC_URI[src.sha256sum] = "5601df7fc282fdd66de196b282694eb77dcfc50438f01587de144b3ead1a6b2f"
-
-SRC_URI += "file://git-less-hardlinks.diff"
-
-EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes"
-
-
-DEPENDS = "openssl curl zlib expat"
-RDEPENDS_${PN} = "perl perl-module-file-path cpio findutils sed"
-
-# Dropbear ssh needs a wrapper script, so install openssh-ssh to make it work out of the box
-RRECOMMENDS_${PN} = "openssh-ssh"
-
-PR = "r6"
-
-do_install_append() {
- # Fix broken hardlinks
- for gitprog in git-receive-pack git-upload-archive ; do
- rm ${D}${bindir}/$gitprog
- ln -sf ${bindir}/git ${D}${bindir}/$gitprog
- done
- rm ${D}${libexecdir}/git-core/git && ln -sf ${bindir}/git ${D}${libexecdir}/git-core/git
-}
-
-FILES_${PN}-dbg += "${libexecdir}/git-core/.debug"
diff --git a/recipes/git/git_1.7.2.1.bb b/recipes/git/git_1.7.2.1.bb
new file mode 100644
index 0000000..4e07d86
--- /dev/null
+++ b/recipes/git/git_1.7.2.1.bb
@@ -0,0 +1,29 @@
+require git.inc
+
+SRC_URI[src.md5sum] = "24a443a120a0ab372185cb6bc0dbd934"
+SRC_URI[src.sha256sum] = "5446b4ece3b8d81b1fcbcd6c4b91f1961b6f4047a3f6173e3200bee368724921"
+
+SRC_URI += "file://git-less-hardlinks.diff"
+BBCLASSEXTEND = "native"
+
+EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes"
+EXTRA_OECONF_append-native = " --without-python"
+
+DEPENDS = "openssl curl zlib expat"
+RDEPENDS_${PN} = "perl perl-module-file-path cpio findutils sed"
+
+# Dropbear ssh needs a wrapper script, so install openssh-ssh to make it work out of the box
+RRECOMMENDS_${PN} = "openssh-ssh"
+
+PR = "r0"
+
+do_install_append() {
+ # Fix broken hardlinks
+ #for gitprog in git-receive-pack git-upload-archive ; do
+ # rm ${D}${bindir}/$gitprog
+ # ln -sf ${bindir}/git ${D}${bindir}/$gitprog
+ #done
+ #rm ${D}${libexecdir}/git-core/git && ln -sf ${bindir}/git ${D}${libexecdir}/git-core/git
+}
+
+FILES_${PN}-dbg += "${libexecdir}/git-core/.debug"
--
1.7.1
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 4/4] bison: preparation for adding 2.4.2
2010-08-06 9:40 [PATCH 1/4] bitbake.conf: add ext4 image support Bernhard Reutner-Fischer
2010-08-06 9:40 ` [PATCH 2/4] e2fsprogs: add 1.41.12, remove old versions Bernhard Reutner-Fischer
2010-08-06 9:40 ` [PATCH 3/4] git: add 1.7.2.1 Bernhard Reutner-Fischer
@ 2010-08-06 9:40 ` Bernhard Reutner-Fischer
2010-08-06 12:46 ` [PATCH 1/4] bitbake.conf: add ext4 image support Bjørn Forsman
3 siblings, 0 replies; 31+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-08-06 9:40 UTC (permalink / raw)
To: openembedded-devel
untested
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
recipes/bison/bison.inc | 2 +-
recipes/bison/bison_2.0.bb | 4 ++
recipes/bison/bison_2.3.bb | 6 ++-
recipes/bison/bison_2.4.2.bb | 7 +++
recipes/bison/files/m4-inttypes.patch | 70 +++++++++++++++++++++++++++++++++
recipes/bison/files/m4.patch | 65 ------------------------------
6 files changed, 86 insertions(+), 68 deletions(-)
create mode 100644 recipes/bison/bison_2.4.2.bb
create mode 100644 recipes/bison/files/m4-inttypes.patch
diff --git a/recipes/bison/bison.inc b/recipes/bison/bison.inc
index 22672e2..0068151 100644
--- a/recipes/bison/bison.inc
+++ b/recipes/bison/bison.inc
@@ -5,7 +5,7 @@ SECTION = "devel"
PRIORITY = "optional"
DEPENDS = "virtual/libintl"
-SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
+SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.bz2 \
file://m4.patch"
INC_PR = "r7"
diff --git a/recipes/bison/bison_2.0.bb b/recipes/bison/bison_2.0.bb
index d027f37..db6d601 100644
--- a/recipes/bison/bison_2.0.bb
+++ b/recipes/bison/bison_2.0.bb
@@ -1,5 +1,9 @@
require bison.inc
+SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
+ file://m4.patch \
+ file://m4-inttypes.patch"
+
PR = "${INC_PR}.0"
SRC_URI[md5sum] = "c17f964fd5504b88b07a183420de25e3"
diff --git a/recipes/bison/bison_2.3.bb b/recipes/bison/bison_2.3.bb
index 2664865..e15e680 100644
--- a/recipes/bison/bison_2.3.bb
+++ b/recipes/bison/bison_2.3.bb
@@ -1,5 +1,7 @@
require bison.inc
+SRC_URI += "file://m4-inttypes.patch"
+
PR = "${INC_PR}.0"
# >> bison-2.3-r0: /usr/lib/liby.a
@@ -9,5 +11,5 @@ PR = "${INC_PR}.0"
FILES_${PN} += "${libdir}/liby.a"
-SRC_URI[md5sum] = "22327efdd5080e2b1acb6e560a04b43a"
-SRC_URI[sha256sum] = "52f78aa4761a74ceb7fdf770f3554dd84308c3b93c4255e3a5c17558ecda293e"
+SRC_URI[md5sum] = "c18640c6ec31a169d351e3117ecce3ec"
+SRC_URI[sha256sum] = "b10d7e9e354be72aee4e4911cf19dd27b5c527d4e7200857365b5fcdeea0dffb"
diff --git a/recipes/bison/bison_2.4.2.bb b/recipes/bison/bison_2.4.2.bb
new file mode 100644
index 0000000..dff3bf0
--- /dev/null
+++ b/recipes/bison/bison_2.4.2.bb
@@ -0,0 +1,7 @@
+require bison.inc
+DEFAULT_PREFERENCE = "-1"
+
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "63584004613aaef2d3dca19088eb1654"
+SRC_URI[sha256sum] = "57fb243aa9af04a6a57c4f4d9167f4440059fe923817f1fdf5592ab892af4fb8"
diff --git a/recipes/bison/files/m4-inttypes.patch b/recipes/bison/files/m4-inttypes.patch
new file mode 100644
index 0000000..e583241
--- /dev/null
+++ b/recipes/bison/files/m4-inttypes.patch
@@ -0,0 +1,70 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- /dev/null
++++ bison-1.875/m4/inttypes-pri.m4
+@@ -0,0 +1,32 @@
++# inttypes-pri.m4 serial 1 (gettext-0.11.4)
++dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
++dnl This file is free software, distributed under the terms of the GNU
++dnl General Public License. As a special exception to the GNU General
++dnl Public License, this file may be distributed as part of a program
++dnl that contains a configuration script generated by Autoconf, under
++dnl the same distribution terms as the rest of that program.
++
++dnl From Bruno Haible.
++
++# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
++# macros to non-string values. This is the case on AIX 4.3.3.
++
++AC_DEFUN([gt_INTTYPES_PRI],
++[
++ AC_REQUIRE([gt_HEADER_INTTYPES_H])
++ if test $gt_cv_header_inttypes_h = yes; then
++ AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
++ gt_cv_inttypes_pri_broken,
++ [
++ AC_TRY_COMPILE([#include <inttypes.h>
++#ifdef PRId32
++char *p = PRId32;
++#endif
++], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
++ ])
++ fi
++ if test "$gt_cv_inttypes_pri_broken" = yes; then
++ AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
++ [Define if <inttypes.h> exists and defines unusable PRI* macros.])
++ fi
++])
+--- /dev/null
++++ bison-1.875/m4/inttypes.m4
+@@ -0,0 +1,27 @@
++# inttypes.m4 serial 1 (gettext-0.11.4)
++dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
++dnl This file is free software, distributed under the terms of the GNU
++dnl General Public License. As a special exception to the GNU General
++dnl Public License, this file may be distributed as part of a program
++dnl that contains a configuration script generated by Autoconf, under
++dnl the same distribution terms as the rest of that program.
++
++dnl From Paul Eggert.
++
++# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
++# <sys/types.h>.
++
++AC_DEFUN([gt_HEADER_INTTYPES_H],
++[
++ AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
++ [
++ AC_TRY_COMPILE(
++ [#include <sys/types.h>
++#include <inttypes.h>],
++ [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
++ ])
++ if test $gt_cv_header_inttypes_h = yes; then
++ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
++ [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
++ fi
++])
diff --git a/recipes/bison/files/m4.patch b/recipes/bison/files/m4.patch
index b62fe89..b060532 100644
--- a/recipes/bison/files/m4.patch
+++ b/recipes/bison/files/m4.patch
@@ -4,41 +4,6 @@
#
--- /dev/null
-+++ bison-1.875/m4/inttypes-pri.m4
-@@ -0,0 +1,32 @@
-+# inttypes-pri.m4 serial 1 (gettext-0.11.4)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
-+# macros to non-string values. This is the case on AIX 4.3.3.
-+
-+AC_DEFUN([gt_INTTYPES_PRI],
-+[
-+ AC_REQUIRE([gt_HEADER_INTTYPES_H])
-+ if test $gt_cv_header_inttypes_h = yes; then
-+ AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
-+ gt_cv_inttypes_pri_broken,
-+ [
-+ AC_TRY_COMPILE([#include <inttypes.h>
-+#ifdef PRId32
-+char *p = PRId32;
-+#endif
-+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
-+ ])
-+ fi
-+ if test "$gt_cv_inttypes_pri_broken" = yes; then
-+ AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
-+ [Define if <inttypes.h> exists and defines unusable PRI* macros.])
-+ fi
-+])
---- /dev/null
+++ bison-1.875/m4/lcmessage.m4
@@ -0,0 +1,32 @@
+# lcmessage.m4 serial 3 (gettext-0.11.3)
@@ -529,36 +494,6 @@
+ rm -f conf.glibtest
+])
--- /dev/null
-+++ bison-1.875/m4/inttypes.m4
-@@ -0,0 +1,27 @@
-+# inttypes.m4 serial 1 (gettext-0.11.4)
-+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-+dnl This file is free software, distributed under the terms of the GNU
-+dnl General Public License. As a special exception to the GNU General
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert.
-+
-+# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
-+# <sys/types.h>.
-+
-+AC_DEFUN([gt_HEADER_INTTYPES_H],
-+[
-+ AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
-+ [
-+ AC_TRY_COMPILE(
-+ [#include <sys/types.h>
-+#include <inttypes.h>],
-+ [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
-+ ])
-+ if test $gt_cv_header_inttypes_h = yes; then
-+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
-+ [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
-+ fi
-+])
---- /dev/null
+++ bison-1.875/m4/isc-posix.m4
@@ -0,0 +1,26 @@
+# isc-posix.m4 serial 2 (gettext-0.11.2)
--
1.7.1
^ permalink raw reply related [flat|nested] 31+ messages in thread
* Re: [PATCH 3/4] git: add 1.7.2.1
2010-08-06 9:40 ` [PATCH 3/4] git: add 1.7.2.1 Bernhard Reutner-Fischer
@ 2010-08-06 10:07 ` Paul Menzel
2010-08-06 10:29 ` Bernhard Reutner-Fischer
0 siblings, 1 reply; 31+ messages in thread
From: Paul Menzel @ 2010-08-06 10:07 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 4938 bytes --]
Dear Bernhard,
Am Freitag, den 06.08.2010, 11:40 +0200 schrieb Bernhard Reutner-Fischer:
> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
[…]
> diff --git a/recipes/git/files/git-less-hardlinks.diff b/recipes/git/files/git-less-hardlinks.diff
> index 183fe8f..be4924c 100644
> --- a/recipes/git/files/git-less-hardlinks.diff
> +++ b/recipes/git/files/git-less-hardlinks.diff
> @@ -33,17 +33,18 @@ This patch isn't complete though:
> ln -s $< $@ 2>/dev/null || \
> cp $< $@
>
> -@@ -1830,13 +1828,11 @@
> +@@ -2081,14 +2081,12 @@
> cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \
> - { for p in $(BUILT_INS); do \
> + for p in $(BUILT_INS); do \
> $(RM) "$$execdir/$$p" && \
> - ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
> ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
> cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
> - done; } && \
> - { for p in $(REMOTE_CURL_ALIASES); do \
> + done && \
> + remote_curl_aliases="$(REMOTE_CURL_ALIASES)" && \
> + for p in $$remote_curl_aliases; do \
> $(RM) "$$execdir/$$p" && \
> - ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
> ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
> cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
> - done; } && \
> + done && \
did you take Yann’s patches into consideration [1].
> diff --git a/recipes/git/git-native_1.7.0.2.bb b/recipes/git/git-native_1.7.0.2.bb
> deleted file mode 100644
> index b55070a..0000000
> --- a/recipes/git/git-native_1.7.0.2.bb
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -require git.inc
> -inherit native
> -DEPENDS = "openssl-native curl-native zlib-native expat-native"
> -PR = "r4"
> -SRC_URI[src.md5sum] = "76518fa774b36de81d160b85fa4f19c1"
> -SRC_URI[src.sha256sum] = "5601df7fc282fdd66de196b282694eb77dcfc50438f01587de144b3ead1a6b2f"
> -
> -EXTRA_OECONF_append = " --without-python"
> diff --git a/recipes/git/git.inc b/recipes/git/git.inc
> index 8275adb..1e69682 100644
> --- a/recipes/git/git.inc
> +++ b/recipes/git/git.inc
> @@ -4,8 +4,6 @@ LICENSE = "GPL"
>
> SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2;name=src"
>
> -S = "${WORKDIR}/git-${PV}"
> -
> inherit autotools
>
> EXTRA_OEMAKE = "NO_TCLTK=1"
> diff --git a/recipes/git/git_1.7.0.2.bb b/recipes/git/git_1.7.0.2.bb
> deleted file mode 100644
> index a3a73f0..0000000
> --- a/recipes/git/git_1.7.0.2.bb
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -require git.inc
> -
> -SRC_URI[src.md5sum] = "76518fa774b36de81d160b85fa4f19c1"
> -SRC_URI[src.sha256sum] = "5601df7fc282fdd66de196b282694eb77dcfc50438f01587de144b3ead1a6b2f"
> -
> -SRC_URI += "file://git-less-hardlinks.diff"
> -
> -EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes"
> -
> -
> -DEPENDS = "openssl curl zlib expat"
> -RDEPENDS_${PN} = "perl perl-module-file-path cpio findutils sed"
> -
> -# Dropbear ssh needs a wrapper script, so install openssh-ssh to make it work out of the box
> -RRECOMMENDS_${PN} = "openssh-ssh"
> -
> -PR = "r6"
> -
> -do_install_append() {
> - # Fix broken hardlinks
> - for gitprog in git-receive-pack git-upload-archive ; do
> - rm ${D}${bindir}/$gitprog
> - ln -sf ${bindir}/git ${D}${bindir}/$gitprog
> - done
> - rm ${D}${libexecdir}/git-core/git && ln -sf ${bindir}/git ${D}${libexecdir}/git-core/git
> -}
> -
> -FILES_${PN}-dbg += "${libexecdir}/git-core/.debug"
> diff --git a/recipes/git/git_1.7.2.1.bb b/recipes/git/git_1.7.2.1.bb
> new file mode 100644
> index 0000000..4e07d86
> --- /dev/null
> +++ b/recipes/git/git_1.7.2.1.bb
> @@ -0,0 +1,29 @@
> +require git.inc
> +
> +SRC_URI[src.md5sum] = "24a443a120a0ab372185cb6bc0dbd934"
> +SRC_URI[src.sha256sum] = "5446b4ece3b8d81b1fcbcd6c4b91f1961b6f4047a3f6173e3200bee368724921"
> +
> +SRC_URI += "file://git-less-hardlinks.diff"
> +BBCLASSEXTEND = "native"
> +
> +EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes"
> +EXTRA_OECONF_append-native = " --without-python"
> +
> +DEPENDS = "openssl curl zlib expat"
> +RDEPENDS_${PN} = "perl perl-module-file-path cpio findutils sed"
> +
> +# Dropbear ssh needs a wrapper script, so install openssh-ssh to make it work out of the box
> +RRECOMMENDS_${PN} = "openssh-ssh"
> +
> +PR = "r0"
> +
> +do_install_append() {
> + # Fix broken hardlinks
> + #for gitprog in git-receive-pack git-upload-archive ; do
> + # rm ${D}${bindir}/$gitprog
> + # ln -sf ${bindir}/git ${D}${bindir}/$gitprog
> + #done
> + #rm ${D}${libexecdir}/git-core/git && ln -sf ${bindir}/git ${D}${libexecdir}/git-core/git
> +}
Can this be removed?
> +FILES_${PN}-dbg += "${libexecdir}/git-core/.debug"
It would be great if you could comment the changes in the commit
message.
Thanks,
Paul
[1] http://patchwork.openembedded.org/patch/2543/
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 3/4] git: add 1.7.2.1
2010-08-06 10:07 ` Paul Menzel
@ 2010-08-06 10:29 ` Bernhard Reutner-Fischer
0 siblings, 0 replies; 31+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-08-06 10:29 UTC (permalink / raw)
To: openembedded-devel
On Fri, Aug 06, 2010 at 12:07:29PM +0200, Paul Menzel wrote:
>did you take Yann’s patches into consideration [1].
>[1] http://patchwork.openembedded.org/patch/2543/
Didn't see that, no. Let me verify this.
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 1/4] bitbake.conf: add ext4 image support
2010-08-06 9:40 [PATCH 1/4] bitbake.conf: add ext4 image support Bernhard Reutner-Fischer
` (2 preceding siblings ...)
2010-08-06 9:40 ` [PATCH 4/4] bison: preparation for adding 2.4.2 Bernhard Reutner-Fischer
@ 2010-08-06 12:46 ` Bjørn Forsman
2010-08-06 12:52 ` Bjørn Forsman
3 siblings, 1 reply; 31+ messages in thread
From: Bjørn Forsman @ 2010-08-06 12:46 UTC (permalink / raw)
To: openembedded-devel
Hi,
On 6 August 2010 11:40, Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> wrote:
> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
> ---
> conf/bitbake.conf | 6 ++++++
> conf/local.conf.sample | 2 +-
> 2 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/conf/bitbake.conf b/conf/bitbake.conf
> index abe500a..9b0afce 100644
> --- a/conf/bitbake.conf
> +++ b/conf/bitbake.conf
> @@ -366,6 +366,8 @@ IMAGE_CMD_ext2 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IM
> IMAGE_CMD_ext2.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz"
> IMAGE_CMD_ext3 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
> IMAGE_CMD_ext3.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz"
> +IMAGE_CMD_ext4 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4"
> +IMAGE_CMD_ext4.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.gz"
It seems the IMAGE_CMDs for ext3 and ext4 exactly alike (except for the
filename)? Or am I missing something? According to [1], converting ext2 fs
to ext4 is performed like this:
tune2fs -j /dev/DEV
tune2fs -O extents,uninit_bg,dir_index /dev/DEV
followed by a fsck to fix up some structures
e2fsck -fDC0 /dev/DEV
Best regards,
Bjørn Forsman
[1]: https://ext4.wiki.kernel.org/index.php/Ext4_Howto
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 1/4] bitbake.conf: add ext4 image support
2010-08-06 12:46 ` [PATCH 1/4] bitbake.conf: add ext4 image support Bjørn Forsman
@ 2010-08-06 12:52 ` Bjørn Forsman
2010-11-17 15:05 ` Author: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> Bernhard Reutner-Fischer
0 siblings, 1 reply; 31+ messages in thread
From: Bjørn Forsman @ 2010-08-06 12:52 UTC (permalink / raw)
To: openembedded-devel
2010/8/6 Bjørn Forsman <bjorn.forsman@gmail.com>:
> Hi,
>
> On 6 August 2010 11:40, Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> wrote:
>> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
>> ---
>> conf/bitbake.conf | 6 ++++++
>> conf/local.conf.sample | 2 +-
>> 2 files changed, 7 insertions(+), 1 deletions(-)
>>
>> diff --git a/conf/bitbake.conf b/conf/bitbake.conf
>> index abe500a..9b0afce 100644
>> --- a/conf/bitbake.conf
>> +++ b/conf/bitbake.conf
>> @@ -366,6 +366,8 @@ IMAGE_CMD_ext2 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IM
>> IMAGE_CMD_ext2.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz"
>> IMAGE_CMD_ext3 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
>> IMAGE_CMD_ext3.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz"
>> +IMAGE_CMD_ext4 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4"
>> +IMAGE_CMD_ext4.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.gz"
>
> It seems the IMAGE_CMDs for ext3 and ext4 exactly alike (except for the
> filename)? Or am I missing something? According to [1], converting ext2 fs
> to ext4 is performed like this:
>
> tune2fs -j /dev/DEV
> tune2fs -O extents,uninit_bg,dir_index /dev/DEV
>
> followed by a fsck to fix up some structures
>
> e2fsck -fDC0 /dev/DEV
Or directly from ext2 to ext4:
tune2fs -O extents,uninit_bg,dir_index,has_journal /dev/DEV
e2fsck -fDC0 /dev/DEV
Regards,
Bjørn Forsman
^ permalink raw reply [flat|nested] 31+ messages in thread
* Author: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
2010-08-06 12:52 ` Bjørn Forsman
@ 2010-11-17 15:05 ` Bernhard Reutner-Fischer
2010-11-17 15:11 ` Frans Meulenbroeks
2010-11-17 15:18 ` Tom Rini
0 siblings, 2 replies; 31+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-11-17 15:05 UTC (permalink / raw)
To: openembedded-devel
bitbake.conf: add ext4 image support
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index f1dc0ff..b7ec8ad 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -369,6 +369,9 @@ IMAGE_CMD_ext2.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -b ${RO
IMAGE_CMD_ext3 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
IMAGE_CMD_ext3.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz"
IMAGE_CMD_ext3.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.bz2"
+IMAGE_CMD_ext4 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4; e2fsck.e2fsprogs-native -y -fDC0 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4"
+IMAGE_CMD_ext4.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; e2fsck.e2fsprogs-native -y -fDC0 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.gz"
+IMAGE_CMD_ext4.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; e2fsck.e2fsprogs-native -y -fDC0 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.bz2"
IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
IMAGE_CMD_squashfs-lzma = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend -comp lzma"
IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ."
@@ -402,6 +405,9 @@ IMAGE_DEPENDS_ext2.bz2 = "genext2fs-native"
IMAGE_DEPENDS_ext3 = "genext2fs-native e2fsprogs-native"
IMAGE_DEPENDS_ext3.gz = "genext2fs-native e2fsprogs-native"
IMAGE_DEPENDS_ext3.bz2 = "genext2fs-native e2fsprogs-native"
+IMAGE_DEPENDS_ext4 = "genext2fs-native e2fsprogs-native"
+IMAGE_DEPENDS_ext4.gz = "genext2fs-native e2fsprogs-native"
+IMAGE_DEPENDS_ext4.bz2 = "genext2fs-native e2fsprogs-native"
IMAGE_DEPENDS_cpio.gz.u-boot = "u-boot-mkimage-native"
IMAGE_DEPENDS_cpio.lzma = "lzma-native"
IMAGE_DEPENDS_squashfs = "squashfs-tools-native"
@@ -718,6 +724,8 @@ IMAGE_ROOTFS_SIZE_ext2 ?= "65536"
IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536"
IMAGE_ROOTFS_SIZE_ext3 ?= "65536"
IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536"
+IMAGE_ROOTFS_SIZE_ext4 ?= "65536"
+IMAGE_ROOTFS_SIZE_ext4.gz ?= "65536"
DISTRO_PR ?= ""
# Forcefully set CACHE now so future changes to things like
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 60c10e4..c2d5c54 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -114,7 +114,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
# INHERIT = "package_tar"
# Add the required image file system types below. Valid are
-# jffs2, tar(.gz|bz2), cpio(.gz), cramfs, ext2(.gz), ext3(.gz)
+# jffs2, tar(.gz|bz2), cpio(.gz), cramfs, ext2(.gz), ext3(.gz), ext4(.gz),
# squashfs, squashfs-lzma
IMAGE_FSTYPES = "jffs2 tar"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* Re: Author: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
2010-11-17 15:05 ` Author: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> Bernhard Reutner-Fischer
@ 2010-11-17 15:11 ` Frans Meulenbroeks
2010-11-17 16:47 ` Bernhard Reutner-Fischer
2010-11-17 15:18 ` Tom Rini
1 sibling, 1 reply; 31+ messages in thread
From: Frans Meulenbroeks @ 2010-11-17 15:11 UTC (permalink / raw)
To: openembedded-devel
2010/11/17 Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>:
> bitbake.conf: add ext4 image support
>
> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
did you use git send-email?
The subject line is not ok.
>
> diff --git a/conf/bitbake.conf b/conf/bitbake.conf
> index f1dc0ff..b7ec8ad 100644
> --- a/conf/bitbake.conf
> +++ b/conf/bitbake.conf
> @@ -369,6 +369,9 @@ IMAGE_CMD_ext2.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -b ${RO
> IMAGE_CMD_ext3 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
> IMAGE_CMD_ext3.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz"
> IMAGE_CMD_ext3.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.bz2"
> +IMAGE_CMD_ext4 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4; e2fsck.e2fsprogs-native -y -fDC0 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4"
> +IMAGE_CMD_ext4.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; e2fsck.e2fsprogs-native -y -fDC0 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.gz"
> +IMAGE_CMD_ext4.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; e2fsck.e2fsprogs-native -y -fDC0 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.bz2"
> IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
> IMAGE_CMD_squashfs-lzma = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend -comp lzma"
> IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ."
> @@ -402,6 +405,9 @@ IMAGE_DEPENDS_ext2.bz2 = "genext2fs-native"
> IMAGE_DEPENDS_ext3 = "genext2fs-native e2fsprogs-native"
> IMAGE_DEPENDS_ext3.gz = "genext2fs-native e2fsprogs-native"
> IMAGE_DEPENDS_ext3.bz2 = "genext2fs-native e2fsprogs-native"
> +IMAGE_DEPENDS_ext4 = "genext2fs-native e2fsprogs-native"
> +IMAGE_DEPENDS_ext4.gz = "genext2fs-native e2fsprogs-native"
> +IMAGE_DEPENDS_ext4.bz2 = "genext2fs-native e2fsprogs-native"
> IMAGE_DEPENDS_cpio.gz.u-boot = "u-boot-mkimage-native"
> IMAGE_DEPENDS_cpio.lzma = "lzma-native"
> IMAGE_DEPENDS_squashfs = "squashfs-tools-native"
> @@ -718,6 +724,8 @@ IMAGE_ROOTFS_SIZE_ext2 ?= "65536"
> IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536"
> IMAGE_ROOTFS_SIZE_ext3 ?= "65536"
> IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536"
> +IMAGE_ROOTFS_SIZE_ext4 ?= "65536"
> +IMAGE_ROOTFS_SIZE_ext4.gz ?= "65536"
> DISTRO_PR ?= ""
>
> # Forcefully set CACHE now so future changes to things like
> diff --git a/conf/local.conf.sample b/conf/local.conf.sample
> index 60c10e4..c2d5c54 100644
> --- a/conf/local.conf.sample
> +++ b/conf/local.conf.sample
> @@ -114,7 +114,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
> # INHERIT = "package_tar"
>
> # Add the required image file system types below. Valid are
> -# jffs2, tar(.gz|bz2), cpio(.gz), cramfs, ext2(.gz), ext3(.gz)
> +# jffs2, tar(.gz|bz2), cpio(.gz), cramfs, ext2(.gz), ext3(.gz), ext4(.gz),
> # squashfs, squashfs-lzma
> IMAGE_FSTYPES = "jffs2 tar"
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: Author: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
2010-11-17 15:05 ` Author: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> Bernhard Reutner-Fischer
2010-11-17 15:11 ` Frans Meulenbroeks
@ 2010-11-17 15:18 ` Tom Rini
2010-11-17 16:47 ` Bernhard Reutner-Fischer
1 sibling, 1 reply; 31+ messages in thread
From: Tom Rini @ 2010-11-17 15:18 UTC (permalink / raw)
To: openembedded-devel
On 11/17/2010 08:05 AM, Bernhard Reutner-Fischer wrote:
>
> bitbake.conf: add ext4 image support
Looks like e2fsprogs needs to be more careful about moving stuff for
update-alternatives. Mind fixing that and doing this as a 2 parter?
--
Tom Rini
Mentor Graphics Corporation
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: Author: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
2010-11-17 15:18 ` Tom Rini
@ 2010-11-17 16:47 ` Bernhard Reutner-Fischer
2010-11-18 19:27 ` [PATCH 0/2] add ext4 image support Bernhard Reutner-Fischer
` (2 more replies)
0 siblings, 3 replies; 31+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-11-17 16:47 UTC (permalink / raw)
To: openembedded-devel
Hi,
Yeah, I will have a look, sure.
On 17 Nov 2010 16:20, "Tom Rini" <tom_rini@mentor.com> wrote:
On 11/17/2010 08:05 AM, Bernhard Reutner-Fischer wrote:
>
>
> bitbake.conf: add ext4 image suppo...
Looks like e2fsprogs needs to be more careful about moving stuff for
update-alternatives. Mind fixing that and doing this as a 2 parter?
--
Tom Rini
Mentor Graphics Corporation
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel...
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: Author: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
2010-11-17 15:11 ` Frans Meulenbroeks
@ 2010-11-17 16:47 ` Bernhard Reutner-Fischer
0 siblings, 0 replies; 31+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-11-17 16:47 UTC (permalink / raw)
To: openembedded-devel
Hi,
Sorry for that!
Apparently I've accidentally sent a commit and not a patch. I will
follow-up.
On 17 Nov 2010 16:13, "Frans Meulenbroeks" <fransmeulenbroeks@gmail.com>
wrote:
2010/11/17 Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>:
> bitbake.conf: add ext4 image support
>
> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.no...
did you use git send-email?
The subject line is not ok.
>
> diff --git a/conf/bitbake.conf b/conf/bitbake.conf
> index f1dc0ff..b7ec8ad 100644
> --- a/conf...
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 0/2] add ext4 image support
2010-11-17 16:47 ` Bernhard Reutner-Fischer
@ 2010-11-18 19:27 ` Bernhard Reutner-Fischer
2010-11-18 19:27 ` [PATCH 1/2] e2fsprogs: add 1.41.12, remove old versions Bernhard Reutner-Fischer
2010-11-18 19:27 ` [PATCH 2/2] bitbake.conf: add ext4 image support Bernhard Reutner-Fischer
2 siblings, 0 replies; 31+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-11-18 19:27 UTC (permalink / raw)
To: openembedded-devel
Hi,
This adds ext4 image support.
The bump patch can be considered optional.
The 2 patches were build tested on an i386 host.
chattr and tune2fs could potentially come from busybox too, to be
considered later.
Please apply.
Bernhard Reutner-Fischer (2):
e2fsprogs: add 1.41.12, remove old versions
bitbake.conf: add ext4 image support
conf/bitbake.conf | 8 ++++++
conf/local.conf.sample | 2 +-
recipes/e2fsprogs/e2fsprogs.inc | 41 +++++++++++++------------------
recipes/e2fsprogs/e2fsprogs_1.41.12.bb | 10 +++++++
recipes/e2fsprogs/e2fsprogs_1.41.9.bb | 10 -------
5 files changed, 36 insertions(+), 35 deletions(-)
create mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.12.bb
delete mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.9.bb
--
1.7.2.3
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 1/2] e2fsprogs: add 1.41.12, remove old versions
2010-11-17 16:47 ` Bernhard Reutner-Fischer
2010-11-18 19:27 ` [PATCH 0/2] add ext4 image support Bernhard Reutner-Fischer
@ 2010-11-18 19:27 ` Bernhard Reutner-Fischer
2010-11-19 14:00 ` Tom Rini
2010-11-18 19:27 ` [PATCH 2/2] bitbake.conf: add ext4 image support Bernhard Reutner-Fischer
2 siblings, 1 reply; 31+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-11-18 19:27 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
recipes/e2fsprogs/e2fsprogs_1.41.12.bb | 10 ++++++++++
recipes/e2fsprogs/e2fsprogs_1.41.9.bb | 10 ----------
2 files changed, 10 insertions(+), 10 deletions(-)
create mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.12.bb
delete mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.9.bb
diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.12.bb b/recipes/e2fsprogs/e2fsprogs_1.41.12.bb
new file mode 100644
index 0000000..5798501
--- /dev/null
+++ b/recipes/e2fsprogs/e2fsprogs_1.41.12.bb
@@ -0,0 +1,10 @@
+require e2fsprogs.inc
+
+PR = "${INC_PR}"
+
+do_configure() {
+ oe_runconf
+}
+
+SRC_URI[md5sum] = "1b24a21fc0c2381ef420961cbfec733f"
+SRC_URI[sha256sum] = "9c26d0dc20bfdafd0f27f3564791d6121d1c1876549d4f2ff1e41955c9bb9f20"
diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.9.bb b/recipes/e2fsprogs/e2fsprogs_1.41.9.bb
deleted file mode 100644
index 6a8c113..0000000
--- a/recipes/e2fsprogs/e2fsprogs_1.41.9.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require e2fsprogs.inc
-
-PR = "${INC_PR}"
-
-do_configure() {
- oe_runconf
-}
-
-SRC_URI[md5sum] = "52f60a9e19a02f142f5546f1b5681927"
-SRC_URI[sha256sum] = "cbf1e34261a16b3d7911b60b91290b19f2010036d6ba628d45b5f0b2af2b66e8"
--
1.7.2.3
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 2/2] bitbake.conf: add ext4 image support
2010-11-17 16:47 ` Bernhard Reutner-Fischer
2010-11-18 19:27 ` [PATCH 0/2] add ext4 image support Bernhard Reutner-Fischer
2010-11-18 19:27 ` [PATCH 1/2] e2fsprogs: add 1.41.12, remove old versions Bernhard Reutner-Fischer
@ 2010-11-18 19:27 ` Bernhard Reutner-Fischer
2010-11-19 13:59 ` Tom Rini
2 siblings, 1 reply; 31+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-11-18 19:27 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
conf/bitbake.conf | 8 +++++++
conf/local.conf.sample | 2 +-
recipes/e2fsprogs/e2fsprogs.inc | 41 ++++++++++++++++----------------------
3 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index f1dc0ff..d89f7bb 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -369,6 +369,9 @@ IMAGE_CMD_ext2.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -b ${RO
IMAGE_CMD_ext3 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
IMAGE_CMD_ext3.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz"
IMAGE_CMD_ext3.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.bz2"
+IMAGE_CMD_ext4 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac;"
+IMAGE_CMD_ext4.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; set +e;e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.gz"
+IMAGE_CMD_ext4.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.bz2"
IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
IMAGE_CMD_squashfs-lzma = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend -comp lzma"
IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ."
@@ -402,6 +405,9 @@ IMAGE_DEPENDS_ext2.bz2 = "genext2fs-native"
IMAGE_DEPENDS_ext3 = "genext2fs-native e2fsprogs-native"
IMAGE_DEPENDS_ext3.gz = "genext2fs-native e2fsprogs-native"
IMAGE_DEPENDS_ext3.bz2 = "genext2fs-native e2fsprogs-native"
+IMAGE_DEPENDS_ext4 = "genext2fs-native e2fsprogs-native"
+IMAGE_DEPENDS_ext4.gz = "genext2fs-native e2fsprogs-native"
+IMAGE_DEPENDS_ext4.bz2 = "genext2fs-native e2fsprogs-native"
IMAGE_DEPENDS_cpio.gz.u-boot = "u-boot-mkimage-native"
IMAGE_DEPENDS_cpio.lzma = "lzma-native"
IMAGE_DEPENDS_squashfs = "squashfs-tools-native"
@@ -718,6 +724,8 @@ IMAGE_ROOTFS_SIZE_ext2 ?= "65536"
IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536"
IMAGE_ROOTFS_SIZE_ext3 ?= "65536"
IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536"
+IMAGE_ROOTFS_SIZE_ext4 ?= "65536"
+IMAGE_ROOTFS_SIZE_ext4.gz ?= "65536"
DISTRO_PR ?= ""
# Forcefully set CACHE now so future changes to things like
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 60c10e4..31357b9 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -114,7 +114,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
# INHERIT = "package_tar"
# Add the required image file system types below. Valid are
-# jffs2, tar(.gz|bz2), cpio(.gz), cramfs, ext2(.gz), ext3(.gz)
+# jffs2, tar(.gz|bz2), cpio(.gz), cramfs, ext2(.gz), ext3(.gz), ext4(.gz|.bz2),
# squashfs, squashfs-lzma
IMAGE_FSTYPES = "jffs2 tar"
diff --git a/recipes/e2fsprogs/e2fsprogs.inc b/recipes/e2fsprogs/e2fsprogs.inc
index 7697440..3d3e874 100644
--- a/recipes/e2fsprogs/e2fsprogs.inc
+++ b/recipes/e2fsprogs/e2fsprogs.inc
@@ -9,7 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz"
S = "${WORKDIR}/e2fsprogs-${PV}"
-INC_PR = "r24"
+INC_PR = "r25"
inherit autotools
@@ -31,29 +31,22 @@ do_install_append () {
oe_runmake install-libs DESTDIR=${D}
- mv ${D}${base_sbindir}/e2fsck ${D}${base_sbindir}/e2fsck.${PN}
- rm ${D}${base_sbindir}/fsck.ext2
- rm ${D}${base_sbindir}/fsck.ext3
- rm ${D}${base_sbindir}/fsck.ext4*
- mv ${D}${base_sbindir}/mke2fs ${D}${base_sbindir}/mke2fs.${PN}
- rm ${D}${base_sbindir}/mkfs.ext2
- rm ${D}${base_sbindir}/mkfs.ext3
- rm ${D}${base_sbindir}/mkfs.ext4*
-
- cd ${D}/${base_sbindir}
- ln -sf ./e2fsck.${PN} fsck.ext2.${PN}
- ln -sf ./e2fsck.${PN} fsck.ext3.${PN}
- ln -sf ./e2fsck.${PN} fsck.ext4.${PN}
- ln -sf ./e2fsck.${PN} fsck.ext4dev.${PN}
- ln -sf ./mke2fs.${PN} mkfs.ext2.${PN}
- ln -sf ./mke2fs.${PN} mkfs.ext3.${PN}
- ln -sf ./mke2fs.${PN} mkfs.ext4.${PN}
- ln -sf ./mke2fs.${PN} mkfs.ext4dev.${PN}
-
- ln -sf ./tune2fs findfs
- ln -sf ./tune2fs e2label
-
- mv ${D}${bindir}/chattr ${D}${bindir}/chattr.${PN}
+ if ${@['true','false'][(bb.data.inherits_class('packaged-staging', d))]}; then
+ for f in e2fsck mke2fs; do
+ mv ${D}${base_sbindir}/$f ${D}${base_sbindir}/$f.${PN}
+ done
+ for f in chattr; do
+ mv ${D}${bindir}/$f ${D}${bindir}/$f.${PN}
+ done
+ fsck=$(cd ${D}${base_sbindir}/ && ls -1 fsck.ext* | sed s/[^\.]*//)
+ for e in $fsck;do
+ rm ${D}${base_sbindir}/{fsck,mkfs}$e;
+ ln -s ${D}${base_sbindir}/e2fsck$e.${PN}$e fsck$e.${PN}
+ ln -s ${D}${base_sbindir}/mke2fs$e.${PN}$e mkfs$e.${PN}
+ done
+ fi
+ ln -sf ${D}/${base_sbindir}/tune2fs findfs
+ ln -sf ${D}/${base_sbindir}/tune2fs e2label
}
pkg_postinst_e2fsprogs () {
--
1.7.2.3
^ permalink raw reply related [flat|nested] 31+ messages in thread
* Re: [PATCH 2/2] bitbake.conf: add ext4 image support
2010-11-18 19:27 ` [PATCH 2/2] bitbake.conf: add ext4 image support Bernhard Reutner-Fischer
@ 2010-11-19 13:59 ` Tom Rini
2010-12-01 19:15 ` [PATCH v2 0/3] " Bernhard Reutner-Fischer
` (3 more replies)
0 siblings, 4 replies; 31+ messages in thread
From: Tom Rini @ 2010-11-19 13:59 UTC (permalink / raw)
To: openembedded-devel
On 11/18/2010 12:27 PM, Bernhard Reutner-Fischer wrote:
> diff --git a/recipes/e2fsprogs/e2fsprogs.inc b/recipes/e2fsprogs/e2fsprogs.inc
> index 7697440..3d3e874 100644
> --- a/recipes/e2fsprogs/e2fsprogs.inc
> +++ b/recipes/e2fsprogs/e2fsprogs.inc
> @@ -9,7 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz"
>
> S = "${WORKDIR}/e2fsprogs-${PV}"
>
> -INC_PR = "r24"
> +INC_PR = "r25"
>
> inherit autotools
>
> @@ -31,29 +31,22 @@ do_install_append () {
>
> oe_runmake install-libs DESTDIR=${D}
>
> - mv ${D}${base_sbindir}/e2fsck ${D}${base_sbindir}/e2fsck.${PN}
> - rm ${D}${base_sbindir}/fsck.ext2
> - rm ${D}${base_sbindir}/fsck.ext3
> - rm ${D}${base_sbindir}/fsck.ext4*
> - mv ${D}${base_sbindir}/mke2fs ${D}${base_sbindir}/mke2fs.${PN}
> - rm ${D}${base_sbindir}/mkfs.ext2
> - rm ${D}${base_sbindir}/mkfs.ext3
> - rm ${D}${base_sbindir}/mkfs.ext4*
> -
> - cd ${D}/${base_sbindir}
> - ln -sf ./e2fsck.${PN} fsck.ext2.${PN}
> - ln -sf ./e2fsck.${PN} fsck.ext3.${PN}
> - ln -sf ./e2fsck.${PN} fsck.ext4.${PN}
> - ln -sf ./e2fsck.${PN} fsck.ext4dev.${PN}
> - ln -sf ./mke2fs.${PN} mkfs.ext2.${PN}
> - ln -sf ./mke2fs.${PN} mkfs.ext3.${PN}
> - ln -sf ./mke2fs.${PN} mkfs.ext4.${PN}
> - ln -sf ./mke2fs.${PN} mkfs.ext4dev.${PN}
> -
> - ln -sf ./tune2fs findfs
> - ln -sf ./tune2fs e2label
> -
> - mv ${D}${bindir}/chattr ${D}${bindir}/chattr.${PN}
> + if ${@['true','false'][(bb.data.inherits_class('packaged-staging', d))]}; then
> + for f in e2fsck mke2fs; do
> + mv ${D}${base_sbindir}/$f ${D}${base_sbindir}/$f.${PN}
> + done
> + for f in chattr; do
> + mv ${D}${bindir}/$f ${D}${bindir}/$f.${PN}
> + done
> + fsck=$(cd ${D}${base_sbindir}/&& ls -1 fsck.ext* | sed s/[^\.]*//)
> + for e in $fsck;do
> + rm ${D}${base_sbindir}/{fsck,mkfs}$e;
> + ln -s ${D}${base_sbindir}/e2fsck$e.${PN}$e fsck$e.${PN}
> + ln -s ${D}${base_sbindir}/mke2fs$e.${PN}$e mkfs$e.${PN}
> + done
> + fi
> + ln -sf ${D}/${base_sbindir}/tune2fs findfs
> + ln -sf ${D}/${base_sbindir}/tune2fs e2label
> }
>
> pkg_postinst_e2fsprogs () {
This part should be separate. And I like making it a loop, the way (I)
have been doing this for other conflicts is with:
do_install_append_pn-e2fsprogs () {
...
}
--
Tom Rini
Mentor Graphics Corporation
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 1/2] e2fsprogs: add 1.41.12, remove old versions
2010-11-18 19:27 ` [PATCH 1/2] e2fsprogs: add 1.41.12, remove old versions Bernhard Reutner-Fischer
@ 2010-11-19 14:00 ` Tom Rini
0 siblings, 0 replies; 31+ messages in thread
From: Tom Rini @ 2010-11-19 14:00 UTC (permalink / raw)
To: openembedded-devel
On 11/18/2010 12:27 PM, Bernhard Reutner-Fischer wrote:
> Signed-off-by: Bernhard Reutner-Fischer<rep.dot.nop@gmail.com>
> ---
> recipes/e2fsprogs/e2fsprogs_1.41.12.bb | 10 ++++++++++
> recipes/e2fsprogs/e2fsprogs_1.41.9.bb | 10 ----------
> 2 files changed, 10 insertions(+), 10 deletions(-)
> create mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.12.bb
> delete mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.9.bb
Acked-by: Tom Rini <tom_rini@mentor.com>
--
Tom Rini
Mentor Graphics Corporation
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH v2 0/3] ext4 image support
2010-11-19 13:59 ` Tom Rini
@ 2010-12-01 19:15 ` Bernhard Reutner-Fischer
2010-12-01 19:26 ` Tom Rini
2010-12-01 19:15 ` [PATCH v2 1/3] e2fsprogs: add 1.41.12, remove old versions Bernhard Reutner-Fischer
` (2 subsequent siblings)
3 siblings, 1 reply; 31+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-12-01 19:15 UTC (permalink / raw)
To: Tom Rini; +Cc: openembedded-devel
Changes from previous iteration:
o factor out e2fsprogs.inc changes into separate patch
o use do_install_append_pn-e2fsprogs
Bernhard Reutner-Fischer (3):
e2fsprogs: add 1.41.12, remove old versions
e2fsprogs: fix alternatives of non-packaged native sysroot
add ext4 image support
conf/bitbake.conf | 4 +++
conf/local.conf.sample | 2 +-
recipes/e2fsprogs/e2fsprogs.inc | 42 +++++++++++++------------------
recipes/e2fsprogs/e2fsprogs_1.41.12.bb | 10 +++++++
recipes/e2fsprogs/e2fsprogs_1.41.9.bb | 10 -------
5 files changed, 33 insertions(+), 35 deletions(-)
create mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.12.bb
delete mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.9.bb
--
1.7.2.3
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH v2 1/3] e2fsprogs: add 1.41.12, remove old versions
2010-11-19 13:59 ` Tom Rini
2010-12-01 19:15 ` [PATCH v2 0/3] " Bernhard Reutner-Fischer
@ 2010-12-01 19:15 ` Bernhard Reutner-Fischer
2010-12-01 19:15 ` [PATCH v2 2/3] e2fsprogs: fix alternatives of non-packaged native sysroot Bernhard Reutner-Fischer
2010-12-01 19:15 ` [PATCH v2 3/3] add ext4 image support Bernhard Reutner-Fischer
3 siblings, 0 replies; 31+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-12-01 19:15 UTC (permalink / raw)
To: Tom Rini; +Cc: openembedded-devel
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
recipes/e2fsprogs/e2fsprogs_1.41.12.bb | 10 ++++++++++
recipes/e2fsprogs/e2fsprogs_1.41.9.bb | 10 ----------
2 files changed, 10 insertions(+), 10 deletions(-)
create mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.12.bb
delete mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.9.bb
diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.12.bb b/recipes/e2fsprogs/e2fsprogs_1.41.12.bb
new file mode 100644
index 0000000..5798501
--- /dev/null
+++ b/recipes/e2fsprogs/e2fsprogs_1.41.12.bb
@@ -0,0 +1,10 @@
+require e2fsprogs.inc
+
+PR = "${INC_PR}"
+
+do_configure() {
+ oe_runconf
+}
+
+SRC_URI[md5sum] = "1b24a21fc0c2381ef420961cbfec733f"
+SRC_URI[sha256sum] = "9c26d0dc20bfdafd0f27f3564791d6121d1c1876549d4f2ff1e41955c9bb9f20"
diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.9.bb b/recipes/e2fsprogs/e2fsprogs_1.41.9.bb
deleted file mode 100644
index 6a8c113..0000000
--- a/recipes/e2fsprogs/e2fsprogs_1.41.9.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require e2fsprogs.inc
-
-PR = "${INC_PR}"
-
-do_configure() {
- oe_runconf
-}
-
-SRC_URI[md5sum] = "52f60a9e19a02f142f5546f1b5681927"
-SRC_URI[sha256sum] = "cbf1e34261a16b3d7911b60b91290b19f2010036d6ba628d45b5f0b2af2b66e8"
--
1.7.2.3
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH v2 2/3] e2fsprogs: fix alternatives of non-packaged native sysroot
2010-11-19 13:59 ` Tom Rini
2010-12-01 19:15 ` [PATCH v2 0/3] " Bernhard Reutner-Fischer
2010-12-01 19:15 ` [PATCH v2 1/3] e2fsprogs: add 1.41.12, remove old versions Bernhard Reutner-Fischer
@ 2010-12-01 19:15 ` Bernhard Reutner-Fischer
2010-12-21 13:38 ` Andreas Oberritter
2010-12-21 13:50 ` Andreas Oberritter
2010-12-01 19:15 ` [PATCH v2 3/3] add ext4 image support Bernhard Reutner-Fischer
3 siblings, 2 replies; 31+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-12-01 19:15 UTC (permalink / raw)
To: Tom Rini; +Cc: openembedded-devel
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
recipes/e2fsprogs/e2fsprogs.inc | 42 ++++++++++++++++----------------------
1 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/recipes/e2fsprogs/e2fsprogs.inc b/recipes/e2fsprogs/e2fsprogs.inc
index 7697440..ccf6163 100644
--- a/recipes/e2fsprogs/e2fsprogs.inc
+++ b/recipes/e2fsprogs/e2fsprogs.inc
@@ -9,7 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz"
S = "${WORKDIR}/e2fsprogs-${PV}"
-INC_PR = "r24"
+INC_PR = "r25"
inherit autotools
@@ -31,29 +31,23 @@ do_install_append () {
oe_runmake install-libs DESTDIR=${D}
- mv ${D}${base_sbindir}/e2fsck ${D}${base_sbindir}/e2fsck.${PN}
- rm ${D}${base_sbindir}/fsck.ext2
- rm ${D}${base_sbindir}/fsck.ext3
- rm ${D}${base_sbindir}/fsck.ext4*
- mv ${D}${base_sbindir}/mke2fs ${D}${base_sbindir}/mke2fs.${PN}
- rm ${D}${base_sbindir}/mkfs.ext2
- rm ${D}${base_sbindir}/mkfs.ext3
- rm ${D}${base_sbindir}/mkfs.ext4*
-
- cd ${D}/${base_sbindir}
- ln -sf ./e2fsck.${PN} fsck.ext2.${PN}
- ln -sf ./e2fsck.${PN} fsck.ext3.${PN}
- ln -sf ./e2fsck.${PN} fsck.ext4.${PN}
- ln -sf ./e2fsck.${PN} fsck.ext4dev.${PN}
- ln -sf ./mke2fs.${PN} mkfs.ext2.${PN}
- ln -sf ./mke2fs.${PN} mkfs.ext3.${PN}
- ln -sf ./mke2fs.${PN} mkfs.ext4.${PN}
- ln -sf ./mke2fs.${PN} mkfs.ext4dev.${PN}
-
- ln -sf ./tune2fs findfs
- ln -sf ./tune2fs e2label
-
- mv ${D}${bindir}/chattr ${D}${bindir}/chattr.${PN}
+ ln -sf ${D}/${base_sbindir}/tune2fs findfs
+ ln -sf ${D}/${base_sbindir}/tune2fs e2label
+}
+
+do_install_append_pn-e2fsprogs () {
+ for f in e2fsck mke2fs; do
+ mv ${D}${base_sbindir}/$f ${D}${base_sbindir}/$f.${PN}
+ done
+ for f in chattr; do
+ mv ${D}${bindir}/$f ${D}${bindir}/$f.${PN}
+ done
+ fsck=$(cd ${D}${base_sbindir}/ && ls -1 fsck.ext* | sed s/[^\.]*//)
+ for e in $fsck;do
+ rm ${D}${base_sbindir}/{fsck,mkfs}$e;
+ ln -s ${D}${base_sbindir}/e2fsck$e.${PN}$e fsck$e.${PN}
+ ln -s ${D}${base_sbindir}/mke2fs$e.${PN}$e mkfs$e.${PN}
+ done
}
pkg_postinst_e2fsprogs () {
--
1.7.2.3
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH v2 3/3] add ext4 image support
2010-11-19 13:59 ` Tom Rini
` (2 preceding siblings ...)
2010-12-01 19:15 ` [PATCH v2 2/3] e2fsprogs: fix alternatives of non-packaged native sysroot Bernhard Reutner-Fischer
@ 2010-12-01 19:15 ` Bernhard Reutner-Fischer
2010-12-01 20:10 ` [PATCH v3] " Bernhard Reutner-Fischer
3 siblings, 1 reply; 31+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-12-01 19:15 UTC (permalink / raw)
To: Tom Rini; +Cc: openembedded-devel
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
conf/bitbake.conf | 4 ++++
conf/local.conf.sample | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index f1dc0ff..b476f28 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -369,6 +369,10 @@ IMAGE_CMD_ext2.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -b ${RO
IMAGE_CMD_ext3 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
IMAGE_CMD_ext3.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz"
IMAGE_CMD_ext3.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.bz2"
+IMAGE_CMD_ext4 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac;"
+IMAGE_CMD_ext4.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; set +e;e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.gz"
+IMAGE_CMD_ext4.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.bz2"
+
IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
IMAGE_CMD_squashfs-lzma = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend -comp lzma"
IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ."
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 1085163..7dfb7d7 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -118,7 +118,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
# INHERIT = "package_tar"
# Add the required image file system types below. Valid are
-# jffs2, tar(.gz|bz2), cpio(.gz), cramfs, ext2(.gz), ext3(.gz)
+# jffs2, tar(.gz|bz2), cpio(.gz), cramfs, ext2(.gz), ext3(.gz), ext4(.gz|.bz2),
# squashfs, squashfs-lzma
IMAGE_FSTYPES = "jffs2 tar"
--
1.7.2.3
^ permalink raw reply related [flat|nested] 31+ messages in thread
* Re: [PATCH v2 0/3] ext4 image support
2010-12-01 19:15 ` [PATCH v2 0/3] " Bernhard Reutner-Fischer
@ 2010-12-01 19:26 ` Tom Rini
2010-12-01 19:44 ` Bernhard Reutner-Fischer
0 siblings, 1 reply; 31+ messages in thread
From: Tom Rini @ 2010-12-01 19:26 UTC (permalink / raw)
To: Bernhard Reutner-Fischer; +Cc: openembedded-devel
On 12/01/2010 12:15 PM, Bernhard Reutner-Fischer wrote:
> Changes from previous iteration:
> o factor out e2fsprogs.inc changes into separate patch
> o use do_install_append_pn-e2fsprogs
>
> Bernhard Reutner-Fischer (3):
> e2fsprogs: add 1.41.12, remove old versions
> e2fsprogs: fix alternatives of non-packaged native sysroot
> add ext4 image support
>
> conf/bitbake.conf | 4 +++
> conf/local.conf.sample | 2 +-
> recipes/e2fsprogs/e2fsprogs.inc | 42 +++++++++++++------------------
> recipes/e2fsprogs/e2fsprogs_1.41.12.bb | 10 +++++++
> recipes/e2fsprogs/e2fsprogs_1.41.9.bb | 10 -------
> 5 files changed, 33 insertions(+), 35 deletions(-)
> create mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.12.bb
> delete mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.9.bb
Whole series is:
Acked-by: Tom Rini <tom_rini@mentor.com>
--
Tom Rini
Mentor Graphics Corporation
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH v2 0/3] ext4 image support
2010-12-01 19:26 ` Tom Rini
@ 2010-12-01 19:44 ` Bernhard Reutner-Fischer
0 siblings, 0 replies; 31+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-12-01 19:44 UTC (permalink / raw)
To: Tom Rini; +Cc: openembedded-devel
On Wed, Dec 01, 2010 at 12:26:37PM -0700, Tom Rini wrote:
>On 12/01/2010 12:15 PM, Bernhard Reutner-Fischer wrote:
>>Changes from previous iteration:
>>o factor out e2fsprogs.inc changes into separate patch
>>o use do_install_append_pn-e2fsprogs
>>
>>Bernhard Reutner-Fischer (3):
>> e2fsprogs: add 1.41.12, remove old versions
>> e2fsprogs: fix alternatives of non-packaged native sysroot
>> add ext4 image support
>>
>> conf/bitbake.conf | 4 +++
>> conf/local.conf.sample | 2 +-
>> recipes/e2fsprogs/e2fsprogs.inc | 42 +++++++++++++------------------
>> recipes/e2fsprogs/e2fsprogs_1.41.12.bb | 10 +++++++
>> recipes/e2fsprogs/e2fsprogs_1.41.9.bb | 10 -------
>> 5 files changed, 33 insertions(+), 35 deletions(-)
>> create mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.12.bb
>> delete mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.9.bb
>
>Whole series is:
>Acked-by: Tom Rini <tom_rini@mentor.com>
May i ask you to push them (i think i have no write-access to oe, just
bitbake)? Khem?
thanks,
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH v3] add ext4 image support
2010-12-01 19:15 ` [PATCH v2 3/3] add ext4 image support Bernhard Reutner-Fischer
@ 2010-12-01 20:10 ` Bernhard Reutner-Fischer
0 siblings, 0 replies; 31+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-12-01 20:10 UTC (permalink / raw)
To: Tom Rini; +Cc: openembedded-devel
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
conf/bitbake.conf | 7 +++++++
conf/local.conf.sample | 2 +-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index f1dc0ff..0c0356d 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -369,6 +369,10 @@ IMAGE_CMD_ext2.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -b ${RO
IMAGE_CMD_ext3 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
IMAGE_CMD_ext3.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz"
IMAGE_CMD_ext3.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.bz2"
+IMAGE_CMD_ext4 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac;"
+IMAGE_CMD_ext4.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; set +e;e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.gz"
+IMAGE_CMD_ext4.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -O extents,uninit_bg,dir_index,has_journal ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; set +e; e2fsck -yfDC0 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4;chk=$?; set -e; case $chk in 0|1|2);;*)exit $chk;;esac; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext4.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.bz2"
+
IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
IMAGE_CMD_squashfs-lzma = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend -comp lzma"
IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ."
@@ -402,6 +406,9 @@ IMAGE_DEPENDS_ext2.bz2 = "genext2fs-native"
IMAGE_DEPENDS_ext3 = "genext2fs-native e2fsprogs-native"
IMAGE_DEPENDS_ext3.gz = "genext2fs-native e2fsprogs-native"
IMAGE_DEPENDS_ext3.bz2 = "genext2fs-native e2fsprogs-native"
+IMAGE_DEPENDS_ext4 = "genext2fs-native e2fsprogs-native"
+IMAGE_DEPENDS_ext4.gz = "genext2fs-native e2fsprogs-native"
+IMAGE_DEPENDS_ext4.bz2 = "genext2fs-native e2fsprogs-native"
IMAGE_DEPENDS_cpio.gz.u-boot = "u-boot-mkimage-native"
IMAGE_DEPENDS_cpio.lzma = "lzma-native"
IMAGE_DEPENDS_squashfs = "squashfs-tools-native"
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 1085163..7dfb7d7 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -118,7 +118,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
# INHERIT = "package_tar"
# Add the required image file system types below. Valid are
-# jffs2, tar(.gz|bz2), cpio(.gz), cramfs, ext2(.gz), ext3(.gz)
+# jffs2, tar(.gz|bz2), cpio(.gz), cramfs, ext2(.gz), ext3(.gz), ext4(.gz|.bz2),
# squashfs, squashfs-lzma
IMAGE_FSTYPES = "jffs2 tar"
--
1.7.2.3
^ permalink raw reply related [flat|nested] 31+ messages in thread
* Re: [PATCH v2 2/3] e2fsprogs: fix alternatives of non-packaged native sysroot
2010-12-01 19:15 ` [PATCH v2 2/3] e2fsprogs: fix alternatives of non-packaged native sysroot Bernhard Reutner-Fischer
@ 2010-12-21 13:38 ` Andreas Oberritter
2010-12-21 17:03 ` Bernhard Reutner-Fischer
2010-12-21 13:50 ` Andreas Oberritter
1 sibling, 1 reply; 31+ messages in thread
From: Andreas Oberritter @ 2010-12-21 13:38 UTC (permalink / raw)
To: Bernhard Reutner-Fischer; +Cc: openembedded-devel
Hello Bernhard,
On 12/01/2010 08:15 PM, Bernhard Reutner-Fischer wrote:
> +do_install_append_pn-e2fsprogs () {
> + for f in e2fsck mke2fs; do
> + mv ${D}${base_sbindir}/$f ${D}${base_sbindir}/$f.${PN}
> + done
> + for f in chattr; do
> + mv ${D}${bindir}/$f ${D}${bindir}/$f.${PN}
> + done
> + fsck=$(cd ${D}${base_sbindir}/ && ls -1 fsck.ext* | sed s/[^\.]*//)
> + for e in $fsck;do
> + rm ${D}${base_sbindir}/{fsck,mkfs}$e;
this doesn't work with dash. I had to split it into two seperate lines:
rm ${D}${base_sbindir}/fsck$e
rm ${D}${base_sbindir}/mkfs$e
> + ln -s ${D}${base_sbindir}/e2fsck$e.${PN}$e fsck$e.${PN}
> + ln -s ${D}${base_sbindir}/mke2fs$e.${PN}$e mkfs$e.${PN}
These two symlinks don't seem to make sense to me. I think this would be
right:
ln -sf e2fsck.${PN} ${D}${base_sbindir}/fsck$e.${PN}
ln -sf mke2fs.${PN} ${D}${base_sbindir}/mkfs$e.${PN}
Do you agree?
Regards,
Andreas
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH v2 2/3] e2fsprogs: fix alternatives of non-packaged native sysroot
2010-12-01 19:15 ` [PATCH v2 2/3] e2fsprogs: fix alternatives of non-packaged native sysroot Bernhard Reutner-Fischer
2010-12-21 13:38 ` Andreas Oberritter
@ 2010-12-21 13:50 ` Andreas Oberritter
2010-12-23 9:37 ` [PATCH] e2fsprogs: fix symlinks and work with dash Bernhard Reutner-Fischer
1 sibling, 1 reply; 31+ messages in thread
From: Andreas Oberritter @ 2010-12-21 13:50 UTC (permalink / raw)
To: Bernhard Reutner-Fischer; +Cc: openembedded-devel
On 12/01/2010 08:15 PM, Bernhard Reutner-Fischer wrote:
> @@ -31,29 +31,23 @@ do_install_append () {
>
> oe_runmake install-libs DESTDIR=${D}
>
> - mv ${D}${base_sbindir}/e2fsck ${D}${base_sbindir}/e2fsck.${PN}
> - rm ${D}${base_sbindir}/fsck.ext2
> - rm ${D}${base_sbindir}/fsck.ext3
> - rm ${D}${base_sbindir}/fsck.ext4*
> - mv ${D}${base_sbindir}/mke2fs ${D}${base_sbindir}/mke2fs.${PN}
> - rm ${D}${base_sbindir}/mkfs.ext2
> - rm ${D}${base_sbindir}/mkfs.ext3
> - rm ${D}${base_sbindir}/mkfs.ext4*
> -
> - cd ${D}/${base_sbindir}
> - ln -sf ./e2fsck.${PN} fsck.ext2.${PN}
> - ln -sf ./e2fsck.${PN} fsck.ext3.${PN}
> - ln -sf ./e2fsck.${PN} fsck.ext4.${PN}
> - ln -sf ./e2fsck.${PN} fsck.ext4dev.${PN}
> - ln -sf ./mke2fs.${PN} mkfs.ext2.${PN}
> - ln -sf ./mke2fs.${PN} mkfs.ext3.${PN}
> - ln -sf ./mke2fs.${PN} mkfs.ext4.${PN}
> - ln -sf ./mke2fs.${PN} mkfs.ext4dev.${PN}
> -
> - ln -sf ./tune2fs findfs
> - ln -sf ./tune2fs e2label
> -
> - mv ${D}${bindir}/chattr ${D}${bindir}/chattr.${PN}
> + ln -sf ${D}/${base_sbindir}/tune2fs findfs
> + ln -sf ${D}/${base_sbindir}/tune2fs e2label
These two symliks are broken, too.
ln -sf tune2fs ${D}/${base_sbindir}/findfs
ln -sf tune2fs ${D}/${base_sbindir}/e2label
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH v2 2/3] e2fsprogs: fix alternatives of non-packaged native sysroot
2010-12-21 13:38 ` Andreas Oberritter
@ 2010-12-21 17:03 ` Bernhard Reutner-Fischer
0 siblings, 0 replies; 31+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-12-21 17:03 UTC (permalink / raw)
To: Andreas Oberritter; +Cc: openembedded-devel
On Tue, Dec 21, 2010 at 02:38:55PM +0100, Andreas Oberritter wrote:
>Hello Bernhard,
>
>On 12/01/2010 08:15 PM, Bernhard Reutner-Fischer wrote:
>> +do_install_append_pn-e2fsprogs () {
>> + for f in e2fsck mke2fs; do
>> + mv ${D}${base_sbindir}/$f ${D}${base_sbindir}/$f.${PN}
>> + done
>> + for f in chattr; do
>> + mv ${D}${bindir}/$f ${D}${bindir}/$f.${PN}
>> + done
>> + fsck=$(cd ${D}${base_sbindir}/ && ls -1 fsck.ext* | sed s/[^\.]*//)
>> + for e in $fsck;do
>> + rm ${D}${base_sbindir}/{fsck,mkfs}$e;
>
>this doesn't work with dash. I had to split it into two seperate lines:
>
>rm ${D}${base_sbindir}/fsck$e
>rm ${D}${base_sbindir}/mkfs$e
>
>> + ln -s ${D}${base_sbindir}/e2fsck$e.${PN}$e fsck$e.${PN}
>> + ln -s ${D}${base_sbindir}/mke2fs$e.${PN}$e mkfs$e.${PN}
>
>These two symlinks don't seem to make sense to me. I think this would be
>right:
>
>ln -sf e2fsck.${PN} ${D}${base_sbindir}/fsck$e.${PN}
>ln -sf mke2fs.${PN} ${D}${base_sbindir}/mkfs$e.${PN}
>
>Do you agree?
drats, not sure how i managed to goof that!
You are absolutely right, of course, let me double-check a build with
these fixed.
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH] e2fsprogs: fix symlinks and work with dash
2010-12-21 13:50 ` Andreas Oberritter
@ 2010-12-23 9:37 ` Bernhard Reutner-Fischer
2010-12-23 10:58 ` Andreas Oberritter
0 siblings, 1 reply; 31+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-12-23 9:37 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
recipes/e2fsprogs/e2fsprogs.inc | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/recipes/e2fsprogs/e2fsprogs.inc b/recipes/e2fsprogs/e2fsprogs.inc
index ef9aace..e400c75 100644
--- a/recipes/e2fsprogs/e2fsprogs.inc
+++ b/recipes/e2fsprogs/e2fsprogs.inc
@@ -30,8 +30,8 @@ do_compile_prepend () {
do_install_append () {
oe_runmake install-libs DESTDIR=${D}
- ln -sf ${D}/${base_sbindir}/tune2fs findfs
- ln -sf ${D}/${base_sbindir}/tune2fs e2label
+ ln -sf tune2fs ${D}${base_sbindir}/findfs
+ ln -sf tune2fs ${D}${base_sbindir}/e2label
}
do_install_append_pn-e2fsprogs () {
@@ -43,9 +43,10 @@ do_install_append_pn-e2fsprogs () {
done
fsck=$(cd ${D}${base_sbindir}/ && ls -1 fsck.ext* | sed s/[^\.]*//)
for e in $fsck; do
- rm ${D}${base_sbindir}/{fsck,mkfs}$e;
- ln -s ${D}${base_sbindir}/e2fsck$e.${PN}$e fsck$e.${PN}
- ln -s ${D}${base_sbindir}/mke2fs$e.${PN}$e mkfs$e.${PN}
+ rm ${D}${base_sbindir}/fsck$e;
+ rm ${D}${base_sbindir}/mkfs$e;
+ ln -s e2fsck$e.${PN}$e ${D}${base_sbindir}/fsck$e.${PN}
+ ln -s mke2fs$e.${PN}$e ${D}${base_sbindir}/mkfs$e.${PN}
done
}
--
1.7.2.3
^ permalink raw reply related [flat|nested] 31+ messages in thread
* Re: [PATCH] e2fsprogs: fix symlinks and work with dash
2010-12-23 9:37 ` [PATCH] e2fsprogs: fix symlinks and work with dash Bernhard Reutner-Fischer
@ 2010-12-23 10:58 ` Andreas Oberritter
2010-12-23 12:19 ` Bernhard Reutner-Fischer
0 siblings, 1 reply; 31+ messages in thread
From: Andreas Oberritter @ 2010-12-23 10:58 UTC (permalink / raw)
To: openembedded-devel
Hello Bernhard,
On 12/23/2010 10:37 AM, Bernhard Reutner-Fischer wrote:
> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
> ---
> recipes/e2fsprogs/e2fsprogs.inc | 11 ++++++-----
> 1 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/recipes/e2fsprogs/e2fsprogs.inc b/recipes/e2fsprogs/e2fsprogs.inc
> index ef9aace..e400c75 100644
> --- a/recipes/e2fsprogs/e2fsprogs.inc
> +++ b/recipes/e2fsprogs/e2fsprogs.inc
> @@ -30,8 +30,8 @@ do_compile_prepend () {
> do_install_append () {
>
> oe_runmake install-libs DESTDIR=${D}
> - ln -sf ${D}/${base_sbindir}/tune2fs findfs
> - ln -sf ${D}/${base_sbindir}/tune2fs e2label
> + ln -sf tune2fs ${D}${base_sbindir}/findfs
> + ln -sf tune2fs ${D}${base_sbindir}/e2label
> }
>
> do_install_append_pn-e2fsprogs () {
> @@ -43,9 +43,10 @@ do_install_append_pn-e2fsprogs () {
> done
> fsck=$(cd ${D}${base_sbindir}/ && ls -1 fsck.ext* | sed s/[^\.]*//)
> for e in $fsck; do
> - rm ${D}${base_sbindir}/{fsck,mkfs}$e;
> - ln -s ${D}${base_sbindir}/e2fsck$e.${PN}$e fsck$e.${PN}
> - ln -s ${D}${base_sbindir}/mke2fs$e.${PN}$e mkfs$e.${PN}
> + rm ${D}${base_sbindir}/fsck$e;
> + rm ${D}${base_sbindir}/mkfs$e;
> + ln -s e2fsck$e.${PN}$e ${D}${base_sbindir}/fsck$e.${PN}
> + ln -s mke2fs$e.${PN}$e ${D}${base_sbindir}/mkfs$e.${PN}
this would create fsck.ext3.e2fsprogs -> e2fsck.ext3.e2fsprogs.ext3
etc., which is not what we want. Also, PR needs to be incremented,
because the links didn't appear in the current package.
Would you mind if I pushed the following changeset instead?
http://git.opendreambox.org/?p=obi/openembedded.git;a=commitdiff;h=d87d337f2d2693f3859de64a8b09c5b4b362abdd
Regards,
Andreas
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH] e2fsprogs: fix symlinks and work with dash
2010-12-23 10:58 ` Andreas Oberritter
@ 2010-12-23 12:19 ` Bernhard Reutner-Fischer
0 siblings, 0 replies; 31+ messages in thread
From: Bernhard Reutner-Fischer @ 2010-12-23 12:19 UTC (permalink / raw)
To: openembedded-devel
On Thu, Dec 23, 2010 at 11:58:00AM +0100, Andreas Oberritter wrote:
>this would create fsck.ext3.e2fsprogs -> e2fsck.ext3.e2fsprogs.ext3
>etc., which is not what we want. Also, PR needs to be incremented,
>because the links didn't appear in the current package.
>
>Would you mind if I pushed the following changeset instead?
>
>http://git.opendreambox.org/?p=obi/openembedded.git;a=commitdiff;h=d87d337f2d2693f3859de64a8b09c5b4b362abdd
Sounds good.
^ permalink raw reply [flat|nested] 31+ messages in thread
end of thread, other threads:[~2010-12-23 12:19 UTC | newest]
Thread overview: 31+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-06 9:40 [PATCH 1/4] bitbake.conf: add ext4 image support Bernhard Reutner-Fischer
2010-08-06 9:40 ` [PATCH 2/4] e2fsprogs: add 1.41.12, remove old versions Bernhard Reutner-Fischer
2010-08-06 9:40 ` [PATCH 3/4] git: add 1.7.2.1 Bernhard Reutner-Fischer
2010-08-06 10:07 ` Paul Menzel
2010-08-06 10:29 ` Bernhard Reutner-Fischer
2010-08-06 9:40 ` [PATCH 4/4] bison: preparation for adding 2.4.2 Bernhard Reutner-Fischer
2010-08-06 12:46 ` [PATCH 1/4] bitbake.conf: add ext4 image support Bjørn Forsman
2010-08-06 12:52 ` Bjørn Forsman
2010-11-17 15:05 ` Author: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> Bernhard Reutner-Fischer
2010-11-17 15:11 ` Frans Meulenbroeks
2010-11-17 16:47 ` Bernhard Reutner-Fischer
2010-11-17 15:18 ` Tom Rini
2010-11-17 16:47 ` Bernhard Reutner-Fischer
2010-11-18 19:27 ` [PATCH 0/2] add ext4 image support Bernhard Reutner-Fischer
2010-11-18 19:27 ` [PATCH 1/2] e2fsprogs: add 1.41.12, remove old versions Bernhard Reutner-Fischer
2010-11-19 14:00 ` Tom Rini
2010-11-18 19:27 ` [PATCH 2/2] bitbake.conf: add ext4 image support Bernhard Reutner-Fischer
2010-11-19 13:59 ` Tom Rini
2010-12-01 19:15 ` [PATCH v2 0/3] " Bernhard Reutner-Fischer
2010-12-01 19:26 ` Tom Rini
2010-12-01 19:44 ` Bernhard Reutner-Fischer
2010-12-01 19:15 ` [PATCH v2 1/3] e2fsprogs: add 1.41.12, remove old versions Bernhard Reutner-Fischer
2010-12-01 19:15 ` [PATCH v2 2/3] e2fsprogs: fix alternatives of non-packaged native sysroot Bernhard Reutner-Fischer
2010-12-21 13:38 ` Andreas Oberritter
2010-12-21 17:03 ` Bernhard Reutner-Fischer
2010-12-21 13:50 ` Andreas Oberritter
2010-12-23 9:37 ` [PATCH] e2fsprogs: fix symlinks and work with dash Bernhard Reutner-Fischer
2010-12-23 10:58 ` Andreas Oberritter
2010-12-23 12:19 ` Bernhard Reutner-Fischer
2010-12-01 19:15 ` [PATCH v2 3/3] add ext4 image support Bernhard Reutner-Fischer
2010-12-01 20:10 ` [PATCH v3] " Bernhard Reutner-Fischer
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.