Skip to contentSkip to conversation

e2fsprogs and manual recipe checks updates

PATCH Applied Scott Garman 2 participants 5 messages Mar 16, 2012 – Mar 21, 2012

lore
Share & tools
lore
#0 lore raw

cover e2fsprogs and manual recipe checks updates

Hello,

This pull request includes an upgrade for our e2fsprogs recipe, and updates for all of my recipes which require manual checks.

e2fsprogs was build tested successfully on all 5 of our qemu architectures, and I did a visual comparison of the image and package output between this and the previous version to check for unusual discrepancies.

Scott

The following changes since commit 9950163c91412eb58c3475354cc7f87a7be33c2b:

python-imaging: bring in fixes from meta-oe (2012-03-16 10:56:31 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib sgarman/recipe-upgrades3-oe
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/recipe-upgrades3-oe

Scott Garman (2):
e2fsprogs: upgrade to 1.42.1
distro_tracking: updates for upgraded recipes and manual checks

 .../conf/distro/include/distro_tracking_fields.inc |   26 ++++++++++----------
 .../acinclude.m4                                   |    0
 .../fallocate.patch                                |    4 +-
 .../mkdir.patch                                    |    1 +
 .../remove.ldconfig.call.patch                     |   11 ++++++--
 .../{e2fsprogs_1.42.bb => e2fsprogs_1.42.1.bb}     |    6 ++--
 6 files changed, 27 insertions(+), 21 deletions(-)
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42 => e2fsprogs-1.42.1}/acinclude.m4 (100%)
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42 => e2fsprogs-1.42.1}/fallocate.patch (100%)
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42 => e2fsprogs-1.42.1}/mkdir.patch (99%)
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42 => e2fsprogs-1.42.1}/remove.ldconfig.call.patch (76%)
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.42.bb => e2fsprogs_1.42.1.bb} (93%)
Signature · 1 line
1.7.5.4
#1 lore raw

PATCH 1/2 e2fsprogs: upgrade to 1.42.1

Includes minor tweaks to the formatting of some patch headers and the addition of a SOB line where needed.

---
 .../acinclude.m4                                   |    0
 .../fallocate.patch                                |    4 ++--
 .../mkdir.patch                                    |    1 +
 .../remove.ldconfig.call.patch                     |   11 ++++++++---
 .../{e2fsprogs_1.42.bb => e2fsprogs_1.42.1.bb}     |    6 +++---
 5 files changed, 14 insertions(+), 8 deletions(-)
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42 => e2fsprogs-1.42.1}/acinclude.m4 (100%)
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42 => e2fsprogs-1.42.1}/fallocate.patch (100%)
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42 => e2fsprogs-1.42.1}/mkdir.patch (99%)
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42 => e2fsprogs-1.42.1}/remove.ldconfig.call.patch (76%)
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.42.bb => e2fsprogs_1.42.1.bb} (93%)
meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/acinclude.m4 renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/acinclude.m4 +0 -0
similarity index 100%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/acinclude.m4
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/acinclude.m4
meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/fallocate.patch renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/fallocate.patch +2 -2
similarity index 100%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/fallocate.patch
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/fallocate.patch
index 4d952a5..d074c15 100644
@@ -3,10 +3,10 @@ but we need to check if we have fallocate()
 this problem shows up on uclibc systems since
 uclibc does not have fallocate() implemented
 
-Signed-off-by: Khem Raj <[email protected]>
-
 Upstream-Status: Pending
 
+Signed-off-by: Khem Raj <[email protected]>
+
 Index: e2fsprogs-1.42/lib/ext2fs/unix_io.c
 ===================================================================
 --- e2fsprogs-1.42.orig/lib/ext2fs/unix_io.c	2012-01-17 17:24:34.290780625 -0800
meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/mkdir.patch renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/mkdir.patch +1 -0
similarity index 99%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/mkdir.patch
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/mkdir.patch
index e91ffa9..aa7a298 100644
@@ -1,4 +1,5 @@
 Upstream-Status: Inappropriate [configuration]
+
 Signed-off-by: Mei Lei <[email protected]>
 
 Index: e2fsprogs-1.41.5/po/Makefile.in.in
meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/remove.ldconfig.call.patch renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/remove.ldconfig.call.patch +8 -3
similarity index 76%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/remove.ldconfig.call.patch
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/remove.ldconfig.call.patch
index 0e5fd7d..7be4c3e 100644
@@ -1,11 +1,16 @@
-When /etc/ld.so.cache is writeable by user running bitbake then it creates invalid cache
-(in my case libstdc++.so cannot be found after building zlib(-native) and I have to call
-touch */libstdc++.so && /sbin/ldconfig to fix it.
+When /etc/ld.so.cache is writeable by user running bitbake then it
+creates invalid cache (in my case libstdc++.so cannot be found after
+building zlib(-native) and I have to call touch */libstdc++.so &&
+/sbin/ldconfig to fix it.
 
 So remove ldconfig call from make install-libs
 
+Patch authored by Martin Jansa.
+
 Upstream-Status: Inappropriate [disable feature]
 
+Signed-off-by: Scott Garman <[email protected]>
+
 diff -uNr e2fsprogs-1.42.orig/lib/Makefile.elf-lib e2fsprogs-1.42/lib/Makefile.elf-lib
 --- e2fsprogs-1.42.orig/lib/Makefile.elf-lib	2010-06-14 05:07:36.000000000 +0200
 +++ e2fsprogs-1.42/lib/Makefile.elf-lib	2012-02-23 14:26:07.021272275 +0100
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb +3 -3
similarity index 93%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb
index 6e3f7b8..6df7cea 100644
@@ -1,14 +1,14 @@
 require e2fsprogs.inc
 
-PR = "r4"
+PR = "r0"
 
 SRC_URI += "file://fallocate.patch \
             file://acinclude.m4 \
             file://remove.ldconfig.call.patch \
 "
 
-SRC_URI[md5sum] = "a3c4ffd7352310ab5e9412965d575610"
-SRC_URI[sha256sum] = "55b46db0cec3e2eb0e5de14494a88b01ff6c0500edf8ca8927cad6da7b5e4a46"
+SRC_URI[md5sum] = "8ed1501ae6746e2e735bdd1407211dc9"
+SRC_URI[sha256sum] = "0f1fdc10c6289b6750714490837df9aab691f352d33f5ecb64507704df6ff991"
 
 EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid --disable-uuidd"
 EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs"
Signature · 1 line
1.7.5.4
#2 lore raw

PATCH 2/2 distro_tracking: updates for upgraded recipes and manual checks

In reply to Scott Garman

Updates for upgraded recipes e2fsprogs and ...?

Manual checks done for libpng, libgdbus, expat, chrpath, opensp, and nfs-utils.

---
 .../conf/distro/include/distro_tracking_fields.inc |   26 ++++++++++----------
 1 files changed, 13 insertions(+), 13 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +13 -13
index 8ad924b..252c027 100644
@@ -249,7 +249,7 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-expat = "17 months"
 RECIPE_LATEST_RELEASE_DATE_pn-expat = "Jun 5, 2007"
 RECIPE_COMMENTS_pn-expat = ""
 RECIPE_LAST_UPDATE_pn-expat = "Jul 7, 2010"
-RECIPE_MANUAL_CHECK_DATE_pn-expat = "Jan 12, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-expat = "Mar 15, 2012"
 RECIPE_MAINTAINER_pn-expat = "Scott Garman <[email protected]>"
 
 RECIPE_STATUS_pn-dbus = "green"
@@ -285,15 +285,15 @@ RECIPE_MAINTAINER_pn-neon = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-libpng = "green"
 RECIPE_DEPENDENCY_CHECK_pn-libpng = "not done"
-RECIPE_LATEST_VERSION_pn-libpng = "1.5.7"
+RECIPE_LATEST_VERSION_pn-libpng = "1.5.9"
 RECIPE_NO_UPDATE_REASON_pn-libpng = "1.4.3 and later changes the API and breaks libmatchbox. Sticking with the 1.2.x series instead"
 RECIPE_PATCH_pn-libpng+makefile = "by RP; 2008; to define ECHO explicitly for lbitool 2.2.2. need check whether it's still valide for new libtool. candidate for upstream"
 RECIPE_INTEL_SECTION_pn-libpng = "base libs"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libpng = "unknown"
-RECIPE_LATEST_RELEASE_DATE_pn-libpng = "Jul 01, 2011"
+RECIPE_LATEST_RELEASE_DATE_pn-libpng = "Mar 08, 2012"
 RECIPE_COMMENTS_pn-libpng = ""
 RECIPE_LAST_UPDATE_pn-libpng = "Jul 18, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-libpng = "Jan 19, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-libpng = "Mar 15, 2012"
 RECIPE_MAINTAINER_pn-libpng = "Scott Garman <[email protected]>"
 
 RECIPE_STATUS_pn-libidn = "green"
@@ -678,16 +678,16 @@ RECIPE_MAINTAINER_pn-dbus-wait= "Zhai Edwin <[email protected]>"
 RECIPE_STATUS_pn-e2fsprogs = "yellow" 
 # patch comment
 RECIPE_DEPENDENCY_CHECK_pn-e2fsprogs = "not done"
-RECIPE_LATEST_VERSION_pn-e2fsprogs = "1.42"
+RECIPE_LATEST_VERSION_pn-e2fsprogs = "1.42.1"
 RECIPE_PATCH_pn-e2fsprogs+quotefix = "to be pushed upstream"
 RECIPE_PATCH_pn-e2fsprogs+mkdir = "to be pushed upstream; no comment; MKINSTALLDIRS is not supported in new version autotool"
 RECIPE_PATCH_pn-e2fsprogs+acinclude = "to be pushed upstream;"
 RECIPE_INTEL_SECTION_pn-e2fsprogs = "base utils"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-e2fsprogs = "11 months"
-RECIPE_LATEST_RELEASE_DATE_pn-e2fsprogs = "Nov 29, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-e2fsprogs = "2 months"
+RECIPE_LATEST_RELEASE_DATE_pn-e2fsprogs = "Feb 17, 2012"
 RECIPE_COMMENTS_pn-e2fsprogs = ""
-RECIPE_LAST_UPDATE_pn-e2fsprogs = "Jan 12, 2012"
-RECIPE_MANUAL_CHECK_DATE_pn-e2fsprogs = "Jan 12, 2012"
+RECIPE_LAST_UPDATE_pn-e2fsprogs = "Mar 15, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-e2fsprogs = "Mar 15, 2012"
 RECIPE_MAINTAINER_pn-e2fsprogs = "Scott Garman <[email protected]>"
 
 RECIPE_STATUS_pn-initramfs-boot = "green"
@@ -1217,7 +1217,7 @@ RECIPE_NO_OF_PATCHES_pn-libgdbus = "0"
 RECIPE_LATEST_RELEASE_DATE_pn-libgdbus = "Sep 01, 2008"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libgdbus = "unknown"
 RECIPE_LAST_UPDATE_pn-libgdbus = "Jan 4, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-libgdbus = "Jan 19, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-libgdbus = "Mar 15, 2012"
 DISTRO_PN_ALIAS_pn-libgdbus = "Intel"
 RECIPE_MAINTAINER_pn-libgdbus = "Scott Garman <[email protected]>"
 
@@ -1245,7 +1245,7 @@ RECIPE_LATEST_VERSION_pn-chrpath = "0.14"
 RECIPE_LATEST_RELEASE_DATE_pn-chrpath = "Sep 27, 2011"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-chrpath = "unknown"
 RECIPE_LAST_UPDATE_pn-chrpath = "Jan 12, 2012"
-RECIPE_MANUAL_CHECK_DATE_pn-chrpath = "Jan 12, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-chrpath = "Mar 15, 2012"
 RECIPE_MAINTAINER_pn-chrpath = "Scott Garman <[email protected]>"
 
 RECIPE_STATUS_pn-dosfstools = "red"
@@ -1658,7 +1658,7 @@ RECIPE_PATCH_pn-nfs-utils+nfsserver = "init script"
 RECIPE_INTEL_SECTION_pn-nfs-utils = "base utils"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-nfs-utils = "3 months"
 RECIPE_LATEST_RELEASE_DATE_pn-nfs-utils = "Feb 01, 2010"
-RECIPE_MANUAL_CHECK_DATE_pn-nfs-utils = "Jan 19, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-nfs-utils = "Mar 15, 2012"
 RECIPE_MAINTAINER_pn-nfs-utils = "Scott Garman <[email protected]>"
 
 RECIPE_STATUS_pn-dropbear = "green"
@@ -6133,7 +6133,7 @@ RECIPE_LATEST_RELEASE_DATE_pn-opensp = "Dec 23, 2005"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-opensp = "2 years"
 RECIPE_COMMENTS_pn-opensp = ""
 RECIPE_LAST_UPDATE_pn-opensp = "Jan 26, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-opensp = "Jan 19, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-opensp = "Mar 15, 2012"
 RECIPE_MAINTAINER_pn-opensp = "Scott Garman <[email protected]>"
 
 RECIPE_STATUS_pn-openjade = "green"
Signature · 1 line
1.7.5.4
#3 lore raw

Re: [PATCH 2/2] distro_tracking: updates for upgraded recipes and manual checks

Quoted 1 line · Scott Garman

Updates for upgraded recipes e2fsprogs and ...?

Whoops, just rebased my tree to eliminate that typo at the end.

Scott

Signature · 3 lines
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center
Applied
#4 lore raw
In reply to Scott Garman
Quoted 35 lines · Scott Garman

Hello,

This pull request includes an upgrade for our e2fsprogs recipe, and updates for all of my recipes which require manual checks.

e2fsprogs was build tested successfully on all 5 of our qemu architectures, and I did a visual comparison of the image and package output between this and the previous version to check for unusual discrepancies.

Scott

The following changes since commit 9950163c91412eb58c3475354cc7f87a7be33c2b:

   python-imaging: bring in fixes from meta-oe (2012-03-16 10:56:31 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib sgarman/recipe-upgrades3-oe
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/recipe-upgrades3-oe

Scott Garman (2):
e2fsprogs: upgrade to 1.42.1
distro_tracking: updates for upgraded recipes and manual checks

  .../conf/distro/include/distro_tracking_fields.inc |   26 ++++++++++----------
  .../acinclude.m4                                   |    0
  .../fallocate.patch                                |    4 +-
  .../mkdir.patch                                    |    1 +
  .../remove.ldconfig.call.patch                     |   11 ++++++--
  .../{e2fsprogs_1.42.bb =>  e2fsprogs_1.42.1.bb}     |    6 ++--
  6 files changed, 27 insertions(+), 21 deletions(-)
  rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42 =>  e2fsprogs-1.42.1}/acinclude.m4 (100%)
  rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42 =>  e2fsprogs-1.42.1}/fallocate.patch (100%)
  rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42 =>  e2fsprogs-1.42.1}/mkdir.patch (99%)
  rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42 =>  e2fsprogs-1.42.1}/remove.ldconfig.call.patch (76%)
Quoted 2 lines

rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.42.bb => e2fsprogs_1.42.1.bb} (93%)

Merged into OE-Core

Thanks
Sau!