Skip to contentSkip to conversation

bitbake.conf: add ext4 image support

PATCH In review Bernhard Reutner-Fischer 6 participants 31 messages Aug 6, 2010 – Dec 23, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 bitbake.conf: add ext4 image support

---
 conf/bitbake.conf      |    6 ++++++
 conf/local.conf.sample |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)
conf/bitbake.conf +6 -0
index abe500a..9b0afce 100644
@@ -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 
conf/local.conf.sample +1 -1
index 60c10e4..c2d5c54 100644
@@ -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"
 
Signature · 1 line
1.7.1
#1 lore raw

PATCH 2/4 e2fsprogs: add 1.41.12, remove old versions

---
 .../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
recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch deleted +0 -11
deleted file mode 100644
index 97679d6..0000000
@@ -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;
recipes/e2fsprogs/e2fsprogs-1.38/mkinstalldirs.patch deleted +0 -273

273 lines not on this page · raw message

recipes/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch deleted +0 -82

82 lines not on this page · raw message

recipes/e2fsprogs/e2fsprogs_1.38.bb deleted +0 -13
deleted file mode 100644
index 3401ed0..0000000
@@ -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"
recipes/e2fsprogs/e2fsprogs_1.41.12.bb new file +10 -0
new file mode 100644
index 0000000..5798501
@@ -0,0 +1,10 @@
+require e2fsprogs.inc
+
+PR = "${INC_PR}"
+
+do_configure() {
+        oe_runconf
+}
+
+SRC_URI[md5sum] = "1b24a21fc0c2381ef420961cbfec733f"
+SRC_URI[sha256sum] = "9c26d0dc20bfdafd0f27f3564791d6121d1c1876549d4f2ff1e41955c9bb9f20"
recipes/e2fsprogs/e2fsprogs_1.41.4.bb deleted +0 -8
deleted file mode 100644
index d51cdcc..0000000
@@ -1,8 +0,0 @@
-require e2fsprogs.inc
-
-PR = "${INC_PR}"
-
-SRC_URI += "file://mkinstalldirs.patch"
-
-SRC_URI[md5sum] = "59033388df36987d2b9c9bbf7e19bd57"
-SRC_URI[sha256sum] = "2cc10fee2b29add737e454eb634513135b34a638f7ca2b18364864fe089020dc"
recipes/e2fsprogs/e2fsprogs_1.41.5.bb deleted +0 -8
deleted file mode 100644
index 9e9d7c0..0000000
@@ -1,8 +0,0 @@
-require e2fsprogs.inc
-
-PR = "${INC_PR}"
-
-SRC_URI += "file://mkinstalldirs.patch"
-
-SRC_URI[md5sum] = "e218df6c84fc17c1126d31de9472a76c"
-SRC_URI[sha256sum] = "b3d7d0e1058a3740ddae83d47285bd9dce161eec9e299dde7996ed721da32198"
recipes/e2fsprogs/e2fsprogs_1.41.9.bb deleted +0 -10
deleted file mode 100644
index 6a8c113..0000000
@@ -1,10 +0,0 @@
-require e2fsprogs.inc
-
-PR = "${INC_PR}"
-
-do_configure() {
-        oe_runconf
-}
-
-SRC_URI[md5sum] = "52f60a9e19a02f142f5546f1b5681927"
-SRC_URI[sha256sum] = "cbf1e34261a16b3d7911b60b91290b19f2010036d6ba628d45b5f0b2af2b66e8"
Signature · 1 line
1.7.1
#2 lore raw

PATCH 3/4 git: add 1.7.2.1

In reply to Bernhard Reutner-Fischer
---
 .../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
recipes/git/files/git-gui-install-mode-arg-spaces.patch deleted +0 -32
deleted file mode 100644
index 10e4eb2..0000000
@@ -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=
recipes/git/files/git-less-hardlinks.diff +6 -5
index 183fe8f..be4924c 100644
@@ -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 && \
recipes/git/git-native_1.7.0.2.bb deleted +0 -8
deleted file mode 100644
index b55070a..0000000
@@ -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"
recipes/git/git.inc +0 -2
index 8275adb..1e69682 100644
@@ -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"
recipes/git/git_1.7.0.2.bb deleted +0 -28
deleted file mode 100644
index a3a73f0..0000000
@@ -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"
recipes/git/git_1.7.2.1.bb new file +29 -0
new file mode 100644
index 0000000..4e07d86
@@ -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"
Signature · 1 line
1.7.1
#3 lore raw

Re: [PATCH 3/4] git: add 1.7.2.1

Dear Bernhard,

Am Freitag, den 06.08.2010, 11:40 +0200 schrieb Bernhard Reutner-Fischer:

Quoted 1 line

[…]

Quoted 18 lines
recipes/git/files/git-less-hardlinks.diff +2 -3
index 183fe8f..be4924c 100644
@@ -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; } && \

recipes/git/files/git-less-hardlinks.diff This patch isn't complete though: · line 50

Quoted 10 lines
recipes/git/files/git-less-hardlinks.diff +4 -2
- 	{ 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].

Quoted 84 lines
recipes/git/git-native_1.7.0.2.bb deleted +0 -8
deleted file mode 100644
index b55070a..0000000
@@ -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"
recipes/git/git.inc +0 -2
index 8275adb..1e69682 100644
@@ -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"
recipes/git/git_1.7.0.2.bb deleted +0 -28
deleted file mode 100644
index a3a73f0..0000000
@@ -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"
recipes/git/git_1.7.2.1.bb new file +17 -0
new file mode 100644
index 0000000..4e07d86
@@ -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"
+

recipes/git/git_1.7.2.1.bb line 27

Quoted 10 lines
recipes/git/git_1.7.2.1.bb new file +10 -0
+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?

recipes/git/git_1.7.2.1.bb line 29

Quoted 1 line
recipes/git/git_1.7.2.1.bb new file +1 -0
+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/

#5 lore raw

PATCH 4/4 bison: preparation for adding 2.4.2

In reply to Bernhard Reutner-Fischer

untested

---
 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
recipes/bison/bison.inc +1 -1
index 22672e2..0068151 100644
@@ -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"
recipes/bison/bison_2.0.bb +4 -0
index d027f37..db6d601 100644
@@ -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"
recipes/bison/bison_2.3.bb +4 -2
index 2664865..e15e680 100644
@@ -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"
recipes/bison/bison_2.4.2.bb new file +7 -0
new file mode 100644
index 0000000..dff3bf0
@@ -0,0 +1,7 @@
+require bison.inc
+DEFAULT_PREFERENCE = "-1"
+
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "63584004613aaef2d3dca19088eb1654"
+SRC_URI[sha256sum] = "57fb243aa9af04a6a57c4f4d9167f4440059fe923817f1fdf5592ab892af4fb8"
recipes/bison/files/m4-inttypes.patch new file +70 -0

70 lines not on this page · raw message

recipes/bison/files/m4.patch +0 -65

77 lines not on this page · raw message

Signature · 1 line
1.7.1
#6 lore raw
In reply to Bernhard Reutner-Fischer

Hi,

Quoted 14 lines · Bernhard Reutner-Fischer

---
 conf/bitbake.conf      |    6 ++++++
 conf/local.conf.sample |    2 +-

 2 files changed, 7 insertions(+), 1 deletions(-)
conf/bitbake.conf +0 -0
index abe500a..9b0afce 100644
@@ -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"

conf/bitbake.conf IMAGE_CMD_ext2 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IM · line 370

Quoted 2 lines
conf/bitbake.conf +2 -0
+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

#7 lore raw

2010/8/6 Bjørn Forsman <[email protected]>:

Quoted 24 lines

Hi,

Quoted 14 lines · Bernhard Reutner-Fischer

---
 conf/bitbake.conf      |    6 ++++++
 conf/local.conf.sample |    2 +-

 2 files changed, 7 insertions(+), 1 deletions(-)
conf/bitbake.conf +0 -0
index abe500a..9b0afce 100644
@@ -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"

conf/bitbake.conf IMAGE_CMD_ext2 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IM · line 370

Quoted 2 lines
conf/bitbake.conf +2 -0
+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:

Quoted 6 lines

 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

#8 lore raw

Author: Bernhard Reutner-Fischer <[email protected]>

bitbake.conf: add ext4 image support

conf/bitbake.conf +8 -0
index f1dc0ff..b7ec8ad 100644
@@ -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 
conf/local.conf.sample +1 -1
index 60c10e4..c2d5c54 100644
@@ -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"
 
#9 lore raw

Re: Author: Bernhard Reutner-Fischer <[email protected]>

2010/11/17 Bernhard Reutner-Fischer <[email protected]>:

Quoted 3 lines

   bitbake.conf: add ext4 image support

did you use git send-email?
The subject line is not ok.

Quoted 53 lines
conf/bitbake.conf +0 -0
index f1dc0ff..b7ec8ad 100644
@@ -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"

conf/bitbake.conf +3 -0
+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 ."

conf/bitbake.conf +0 -0
@@ -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"

conf/bitbake.conf +3 -0
+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"

conf/bitbake.conf +0 -0
@@ -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"

conf/bitbake.conf +2 -0
+IMAGE_ROOTFS_SIZE_ext4 ?= "65536"
+IMAGE_ROOTFS_SIZE_ext4.gz ?= "65536"

 DISTRO_PR ?= ""

 # Forcefully set CACHE now so future changes to things like

conf/local.conf.sample +1 -1
index 60c10e4..c2d5c54 100644
@@ -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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#10 lore raw

Re: Author: Bernhard Reutner-Fischer <[email protected]>

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" <[email protected]> wrote:

2010/11/17 Bernhard Reutner-Fischer <[email protected]>:

Quoted 3 lines

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.

Quoted 9 lines
conf/bitbake.conf +0 -1
index f1dc0ff..b7ec8ad 100644
--- a/conf...

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#11 lore raw

Re: Author: Bernhard Reutner-Fischer <[email protected]>

In reply to Bernhard Reutner-Fischer
Quoted 2 lines · Bernhard Reutner-Fischer

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?

Signature · 2 lines
Tom Rini
Mentor Graphics Corporation
#12 lore raw

Re: Author: Bernhard Reutner-Fischer <[email protected]>

Hi,

Yeah, I will have a look, sure.

On 17 Nov 2010 16:20, "Tom Rini" <[email protected]> wrote:

Quoted 3 lines · Bernhard Reutner-Fischer

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?

Signature · 8 lines
Tom Rini
Mentor Graphics Corporation



_______________________________________________
Openembedded-devel mailing list
Openembedded-devel...
#13 lore raw

PATCH 1/2 e2fsprogs: add 1.41.12, remove old versions

---
 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
recipes/e2fsprogs/e2fsprogs_1.41.12.bb new file +10 -0
new file mode 100644
index 0000000..5798501
@@ -0,0 +1,10 @@
+require e2fsprogs.inc
+
+PR = "${INC_PR}"
+
+do_configure() {
+        oe_runconf
+}
+
+SRC_URI[md5sum] = "1b24a21fc0c2381ef420961cbfec733f"
+SRC_URI[sha256sum] = "9c26d0dc20bfdafd0f27f3564791d6121d1c1876549d4f2ff1e41955c9bb9f20"
recipes/e2fsprogs/e2fsprogs_1.41.9.bb deleted +0 -10
deleted file mode 100644
index 6a8c113..0000000
@@ -1,10 +0,0 @@
-require e2fsprogs.inc
-
-PR = "${INC_PR}"
-
-do_configure() {
-        oe_runconf
-}
-
-SRC_URI[md5sum] = "52f60a9e19a02f142f5546f1b5681927"
-SRC_URI[sha256sum] = "cbf1e34261a16b3d7911b60b91290b19f2010036d6ba628d45b5f0b2af2b66e8"
Signature · 1 line
1.7.2.3
Acked-by on v1 1/2
#14 lore raw

Re: [PATCH 1/2] e2fsprogs: add 1.41.12, remove old versions

Quoted 7 lines · Bernhard Reutner-Fischer
---
  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

Signature · 2 lines
Tom Rini
Mentor Graphics Corporation
#15 lore raw

cover add ext4 image support

In reply to Bernhard Reutner-Fischer

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
Signature · 1 line
1.7.2.3
#16 lore raw

PATCH 2/2 bitbake.conf: add ext4 image support

In reply to Bernhard Reutner-Fischer
---
 conf/bitbake.conf               |    8 +++++++
 conf/local.conf.sample          |    2 +-
 recipes/e2fsprogs/e2fsprogs.inc |   41 ++++++++++++++++----------------------
 3 files changed, 26 insertions(+), 25 deletions(-)
conf/bitbake.conf +8 -0
index f1dc0ff..d89f7bb 100644
@@ -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 
conf/local.conf.sample +1 -1
index 60c10e4..31357b9 100644
@@ -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"
 
recipes/e2fsprogs/e2fsprogs.inc +17 -24

53 lines not on this page · raw message

Signature · 1 line
1.7.2.3
#17 lore raw
Quoted 49 lines · Bernhard Reutner-Fischer
recipes/e2fsprogs/e2fsprogs.inc +10 -24
index 7697440..3d3e874 100644
@@ -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

recipes/e2fsprogs/e2fsprogs.inc do_install_append () { · line 52

Quoted 10 lines
recipes/e2fsprogs/e2fsprogs.inc +7 -0
+		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 () {
...
}

Signature · 2 lines
Tom Rini
Mentor Graphics Corporation
#18 lore raw

v2 cover ext4 image support

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
Signature · 1 line
1.7.2.3
#19 lore raw

PATCH v2 1/3 e2fsprogs: add 1.41.12, remove old versions

---
 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
recipes/e2fsprogs/e2fsprogs_1.41.12.bb new file +10 -0
new file mode 100644
index 0000000..5798501
@@ -0,0 +1,10 @@
+require e2fsprogs.inc
+
+PR = "${INC_PR}"
+
+do_configure() {
+        oe_runconf
+}
+
+SRC_URI[md5sum] = "1b24a21fc0c2381ef420961cbfec733f"
+SRC_URI[sha256sum] = "9c26d0dc20bfdafd0f27f3564791d6121d1c1876549d4f2ff1e41955c9bb9f20"
recipes/e2fsprogs/e2fsprogs_1.41.9.bb deleted +0 -10
deleted file mode 100644
index 6a8c113..0000000
@@ -1,10 +0,0 @@
-require e2fsprogs.inc
-
-PR = "${INC_PR}"
-
-do_configure() {
-        oe_runconf
-}
-
-SRC_URI[md5sum] = "52f60a9e19a02f142f5546f1b5681927"
-SRC_URI[sha256sum] = "cbf1e34261a16b3d7911b60b91290b19f2010036d6ba628d45b5f0b2af2b66e8"
Signature · 1 line
1.7.2.3
#20 lore raw

PATCH v2 2/3 e2fsprogs: fix alternatives of non-packaged native sysroot

In reply to Bernhard Reutner-Fischer
---
 recipes/e2fsprogs/e2fsprogs.inc |   42 ++++++++++++++++----------------------
 1 files changed, 18 insertions(+), 24 deletions(-)
recipes/e2fsprogs/e2fsprogs.inc +18 -24
index 7697440..ccf6163 100644
@@ -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 () {
Signature · 1 line
1.7.2.3
#21 lore raw

Re: [PATCH v2 2/3] e2fsprogs: fix alternatives of non-packaged native sysroot

Hello Bernhard,

recipes/e2fsprogs/e2fsprogs.inc do_install_append () { · line 47

Quoted 10 lines · Bernhard Reutner-Fischer
recipes/e2fsprogs/e2fsprogs.inc +10 -0
+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

recipes/e2fsprogs/e2fsprogs.inc do_install_append () { · line 49

Quoted 2 lines
recipes/e2fsprogs/e2fsprogs.inc +2 -0
+		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

#22 lore raw

Re: [PATCH v2 2/3] e2fsprogs: fix alternatives of non-packaged native sysroot

Quoted 25 lines · Andreas Oberritter

Hello Bernhard,

recipes/e2fsprogs/e2fsprogs.inc do_install_append () { · line 47

Quoted 10 lines · Bernhard Reutner-Fischer
recipes/e2fsprogs/e2fsprogs.inc +10 -0
+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

recipes/e2fsprogs/e2fsprogs.inc do_install_append () { · line 49

Quoted 2 lines
recipes/e2fsprogs/e2fsprogs.inc +2 -0
+		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:

Quoted 4 lines

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.

#23 lore raw

Re: [PATCH v2 2/3] e2fsprogs: fix alternatives of non-packaged native sysroot

In reply to Bernhard Reutner-Fischer
Quoted 19 lines · Bernhard Reutner-Fischer
recipes/e2fsprogs/e2fsprogs.inc +0 -15
@@ -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}

recipes/e2fsprogs/e2fsprogs.inc do_install_append () { · line 35

Quoted 10 lines
recipes/e2fsprogs/e2fsprogs.inc +2 -8
-	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

#24 lore raw

PATCH 1/1 e2fsprogs: fix symlinks and work with dash

---
 recipes/e2fsprogs/e2fsprogs.inc |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
recipes/e2fsprogs/e2fsprogs.inc +6 -5
index ef9aace..e400c75 100644
@@ -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
 }
 
Signature · 1 line
1.7.2.3
#25 lore raw

Re: [PATCH] e2fsprogs: fix symlinks and work with dash

Hello Bernhard,

Quoted 21 lines · Bernhard Reutner-Fischer
---
 recipes/e2fsprogs/e2fsprogs.inc |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
recipes/e2fsprogs/e2fsprogs.inc +2 -2
index ef9aace..e400c75 100644
@@ -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 () {

recipes/e2fsprogs/e2fsprogs.inc do_install_append_pn-e2fsprogs () { · line 49

Quoted 10 lines
recipes/e2fsprogs/e2fsprogs.inc +4 -3
@@ -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

#26 lore raw

Re: [PATCH] e2fsprogs: fix symlinks and work with dash

Quoted 7 lines · Andreas Oberritter

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.

#27 lore raw

PATCH v2 3/3 add ext4 image support

In reply to Bernhard Reutner-Fischer
---
 conf/bitbake.conf      |    4 ++++
 conf/local.conf.sample |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)
conf/bitbake.conf +4 -0
index f1dc0ff..b476f28 100644
@@ -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 ."
conf/local.conf.sample +1 -1
index 1085163..7dfb7d7 100644
@@ -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"
 
Signature · 1 line
1.7.2.3
#28 lore raw

PATCH v3 1/1 add ext4 image support

---
 conf/bitbake.conf      |    7 +++++++
 conf/local.conf.sample |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)
conf/bitbake.conf +7 -0
index f1dc0ff..0c0356d 100644
@@ -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"
conf/local.conf.sample +1 -1
index 1085163..7dfb7d7 100644
@@ -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"
 
Signature · 1 line
1.7.2.3
Acked-by on the v2 series
#29 lore raw

Re: [PATCH v2 0/3] ext4 image support

In reply to Bernhard Reutner-Fischer
Quoted 9 lines · Bernhard Reutner-Fischer

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

Quoted 8 lines
  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:

Signature · 2 lines
Tom Rini
Mentor Graphics Corporation
#30 lore raw

Re: [PATCH v2 0/3] ext4 image support

Quoted 19 lines · Tom Rini
Quoted 9 lines · Bernhard Reutner-Fischer

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

Quoted 8 lines
 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
Quoted 2 lines

Whole series is:

May i ask you to push them (i think i have no write-access to oe, just bitbake)? Khem?
thanks,