Recipe upgrades - gzip and sudo

PATCH Applied Scott Garman 2 participants 6 messages Jun 22, 2012 – Jun 25, 2012

lore

Share & tools

lore

Scott Garman

author

2012-06-22 17:37 UTC #0 lore raw

cover Recipe upgrades - gzip and sudo

Hello,

These are some trivial recipe upgrades for gzip and sudo. They have been build-tested for all 5 of our qemu architectures, and I've done a visual inspection of the package output to watch for any troublesome differences. (I do intend to start using buildhistory soon)

Note, this pull request is for oe-core master.

Scott

The following changes since commit e2cc4a44d510e0d473d15f207c1c886db6a5ccf7:

[PATCH] guile: fix compilation on MIPS/PPC (2012-06-21 13:41:12 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib sgarman/recipe-upgrades-oe
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgarman/recipe-upgrades-oe

Scott Garman (2):
gzip: upgrade to 1.5
sudo: upgrade to 1.8.5p2

 meta/recipes-extended/gzip/gzip.inc                |    7 +++++--
 meta/recipes-extended/gzip/gzip_1.4.bb             |   10 ----------
 meta/recipes-extended/gzip/gzip_1.5.bb             |   10 ++++++++++
 meta/recipes-extended/sudo/sudo.inc                |    2 +-
 .../sudo/{sudo_1.8.4p4.bb => sudo_1.8.5p2.bb}      |    6 +++---
 5 files changed, 19 insertions(+), 16 deletions(-)
 delete mode 100644 meta/recipes-extended/gzip/gzip_1.4.bb
 create mode 100644 meta/recipes-extended/gzip/gzip_1.5.bb
 rename meta/recipes-extended/sudo/{sudo_1.8.4p4.bb => sudo_1.8.5p2.bb} (83%)

Signature · 1 line

1.7.9.5

Scott Garman

author

2012-06-22 17:36 UTC #1 lore raw

PATCH 1/2 gzip: upgrade to 1.5

LIC_FILES_CHKSUM updated due to trivial copyright date change.

Use new update-alternatives syntax.

Signed-off-by Scott Garman <[email protected]>

---
 meta/recipes-extended/gzip/gzip.inc    |    7 +++++--
 meta/recipes-extended/gzip/gzip_1.4.bb |   10 ----------
 meta/recipes-extended/gzip/gzip_1.5.bb |   10 ++++++++++
 3 files changed, 15 insertions(+), 12 deletions(-)
 delete mode 100644 meta/recipes-extended/gzip/gzip_1.4.bb
 create mode 100644 meta/recipes-extended/gzip/gzip_1.5.bb

meta/recipes-extended/gzip/gzip.inc +5 -2

index 1d608a6..a4b1abe 100644
@@ -6,7 +6,7 @@ SECTION = "console/utils"
 # change to GPLv3+ in 2007/07. Previous GPLv2 version is 1.3.12
 LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://gzip.h;firstline=8;endline=20;md5=e2ec6b91fbe43a18f6081f3bbae46a01"
+                    file://gzip.h;firstline=8;endline=20;md5=d31380638987e6789f06bc96a29a9a16"
 
 SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz"

@@ -22,5 +22,8 @@ do_install_append () {
 
 inherit update-alternatives
 
-ALTERNATIVE_LINKS = "${base_bindir}/gunzip ${base_bindir}/gzip ${base_bindir}/zcat"
 ALTERNATIVE_PRIORITY = "100"
+ALTERNATIVE_${PN} = "gunzip gzip zcat"
+ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip"
+ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip"
+ALTERNATIVE_LINK_NAME[zcat] = "${base_bindir}/zcat"

meta/recipes-extended/gzip/gzip_1.4.bb deleted +0 ~~-10~~

deleted file mode 100644
index 54dd50a..0000000
@@ -1,10 +0,0 @@
-require gzip.inc
-
-PR = "r2"
-
-NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
-
-BBCLASSEXTEND = "native"
-
-SRC_URI[md5sum] = "e381b8506210c794278f5527cba0e765"
-SRC_URI[sha256sum] = "d166cfd3da380da1bd535633e8890bfb5664f9e68870a611d1dc01a3e9f711ee"

meta/recipes-extended/gzip/gzip_1.5.bb new file +10 -0

new file mode 100644
index 0000000..7a811e2
@@ -0,0 +1,10 @@
+require gzip.inc
+
+PR = "r0"
+
+NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
+
+BBCLASSEXTEND = "native"
+
+SRC_URI[md5sum] = "11b76536941ee1c0221fe6eefbcb32cb"
+SRC_URI[sha256sum] = "b5d56e8ffc9918e8c941fab56e04121194f9870adeeb859e09c09eac264035a3"

Signature · 1 line

1.7.9.5

Saul Wold

2012-06-23 05:07 UTC #2 lore raw

Re: [PATCH 1/2] gzip: upgrade to 1.5

Quoted 4 lines · Scott Garman

LIC_FILES_CHKSUM updated due to trivial copyright date change.
Use new update-alternatives syntax.

I think you also need an update to PREFERRED_VERSION for gzip-native in tcmode-default.inc, not sure why I missed this earlier.

Sau!

Quoted 64 lines

Signed-off-by Scott Garman<[email protected]>

---
  meta/recipes-extended/gzip/gzip.inc    |    7 +++++--
  meta/recipes-extended/gzip/gzip_1.4.bb |   10 ----------
  meta/recipes-extended/gzip/gzip_1.5.bb |   10 ++++++++++
  3 files changed, 15 insertions(+), 12 deletions(-)

delete mode 100644 meta/recipes-extended/gzip/gzip_1.4.bb create mode 100644 meta/recipes-extended/gzip/gzip_1.5.bb

meta/recipes-extended/gzip/gzip.inc +5 -2

index 1d608a6..a4b1abe 100644
@@ -6,7 +6,7 @@ SECTION = "console/utils"
  # change to GPLv3+ in 2007/07. Previous GPLv2 version is 1.3.12
  LICENSE = "GPLv3+"
  LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://gzip.h;firstline=8;endline=20;md5=e2ec6b91fbe43a18f6081f3bbae46a01"
+                    file://gzip.h;firstline=8;endline=20;md5=d31380638987e6789f06bc96a29a9a16"
 
  SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz"

@@ -22,5 +22,8 @@ do_install_append () {
 
  inherit update-alternatives
 
-ALTERNATIVE_LINKS = "${base_bindir}/gunzip ${base_bindir}/gzip ${base_bindir}/zcat"
  ALTERNATIVE_PRIORITY = "100"
+ALTERNATIVE_${PN} = "gunzip gzip zcat"
+ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip"
+ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip"
+ALTERNATIVE_LINK_NAME[zcat] = "${base_bindir}/zcat"

meta/recipes-extended/gzip/gzip_1.4.bb deleted +0 ~~-10~~

deleted file mode 100644
index 54dd50a..0000000
@@ -1,10 +0,0 @@
-require gzip.inc
-
-PR = "r2"
-
-NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
-
-BBCLASSEXTEND = "native"
-
-SRC_URI[md5sum] = "e381b8506210c794278f5527cba0e765"
-SRC_URI[sha256sum] = "d166cfd3da380da1bd535633e8890bfb5664f9e68870a611d1dc01a3e9f711ee"

meta/recipes-extended/gzip/gzip_1.5.bb new file +10 -0

new file mode 100644
index 0000000..7a811e2
@@ -0,0 +1,10 @@
+require gzip.inc
+
+PR = "r0"
+
+NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
+
+BBCLASSEXTEND = "native"
+
+SRC_URI[md5sum] = "11b76536941ee1c0221fe6eefbcb32cb"
+SRC_URI[sha256sum] = "b5d56e8ffc9918e8c941fab56e04121194f9870adeeb859e09c09eac264035a3"

Scott Garman

author

2012-06-25 15:47 UTC #3 lore raw

Re: [PATCH 1/2] gzip: upgrade to 1.5

Quoted 8 lines · Saul Wold

Quoted 4 lines · Scott Garman
LIC_FILES_CHKSUM updated due to trivial copyright date change.
Use new update-alternatives syntax.
I think you also need an update to PREFERRED_VERSION for gzip-native in tcmode-default.inc, not sure why I missed this earlier.

Ah, I missed that. I've pushed an additional commit to my pull request branch to address this:

http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=sgarman/recipe-upgrades-oe&id=c42d223d572eb25f3296452a64461985df20ddcf

The reason I missed it was for "trivial" recipe upgrades like this I was bitbake'ing the individual recipes themselves for each architecture, not full images. I'll try to include at least one image when doing build tests in the future, although something like sato is what ends up making these build tests take forever.

Scott

Signature · 3 lines

Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center

Scott Garman

author

2012-06-22 17:37 UTC #4 lore raw

PATCH 2/2 sudo: upgrade to 1.8.5p2

In reply to Scott Garman

LIC_FILES_CHKSUM updated due to trivial copyright date change.

Signed-off-by Scott Garman <[email protected]>

---
 meta/recipes-extended/sudo/sudo.inc                |    2 +-
 .../sudo/{sudo_1.8.4p4.bb => sudo_1.8.5p2.bb}      |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-extended/sudo/{sudo_1.8.4p4.bb => sudo_1.8.5p2.bb} (83%)

meta/recipes-extended/sudo/sudo.inc +1 -1

index 2168690..babea37 100644
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws"
 BUGTRACKER = "http://www.sudo.ws/bugs/"
 SECTION = "admin"
 LICENSE = "ISC & BSD & Zlib"
-LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=19f95c610f585c26a836975654807669 \
+LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=d25a8240ca6decdecb9990789e593130 \
                     file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=fba1c1dca0951819964dfdc618e81724 \
                     file://compat/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd \
                     file://compat/getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \

meta/recipes-extended/sudo/sudo_1.8.5p2.bb renamed from meta/recipes-extended/sudo/sudo_1.8.4p4.bb +3 -3

similarity index 83%
rename from meta/recipes-extended/sudo/sudo_1.8.4p4.bb
rename to meta/recipes-extended/sudo/sudo_1.8.5p2.bb
index 20c4a14..dfba7e0 100644
@@ -1,6 +1,6 @@
 require sudo.inc
 
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
            file://libtool.patch \

@@ -8,8 +8,8 @@ SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
 
 PAM_SRC_URI = "file://sudo.pam"
 
-SRC_URI[md5sum] = "b9be6df7ecefedff2263052ed9fc5e93"
-SRC_URI[sha256sum] = "bf965b09bde9b0cf7fd2355c53a81884d02d522af2d539cf40218436e9a5051e"
+SRC_URI[md5sum] = "dc42ed9f0946d92273762d0ae7314d59"
+SRC_URI[sha256sum] = "c32ae2bc3faf83444c82ca75ccb10ad3684d8222e3535f164c4a4db7cdddf8cf"
 
 DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 RDEPENDS_${PN} += " ${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"

Signature · 1 line

1.7.9.5

Saul Wold

Applied

2012-06-25 16:37 UTC #5 lore raw

In reply to Scott Garman

Quoted 30 lines · Scott Garman

Hello,
These are some trivial recipe upgrades for gzip and sudo. They have been build-tested for all 5 of our qemu architectures, and I've done a visual inspection of the package output to watch for any troublesome differences. (I do intend to start using buildhistory soon)
Note, this pull request is for oe-core master.
Scott
The following changes since commit e2cc4a44d510e0d473d15f207c1c886db6a5ccf7:
   [PATCH] guile: fix compilation on MIPS/PPC (2012-06-21 13:41:12 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib sgarman/recipe-upgrades-oe
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgarman/recipe-upgrades-oe
Scott Garman (2):
gzip: upgrade to 1.5
sudo: upgrade to 1.8.5p2
  meta/recipes-extended/gzip/gzip.inc                |    7 +++++--
  meta/recipes-extended/gzip/gzip_1.4.bb             |   10 ----------
  meta/recipes-extended/gzip/gzip_1.5.bb             |   10 ++++++++++
  meta/recipes-extended/sudo/sudo.inc                |    2 +-
  .../sudo/{sudo_1.8.4p4.bb =>  sudo_1.8.5p2.bb}      |    6 +++---
  5 files changed, 19 insertions(+), 16 deletions(-)

Quoted 4 lines

delete mode 100644 meta/recipes-extended/gzip/gzip_1.4.bb
create mode 100644 meta/recipes-extended/gzip/gzip_1.5.bb
rename meta/recipes-extended/sudo/{sudo_1.8.4p4.bb => sudo_1.8.5p2.bb} (83%)

Merged into OE-Core

Thanks
Sau!