Patchwork [1/2] gzip: upgrade to 1.5

login
register
mail settings
Submitter Scott Garman
Date June 22, 2012, 5:25 p.m.
Message ID <014ba0776261691704af5c05b4a6bac66590adf6.1340385690.git.scott.a.garman@intel.com>
Download mbox | patch
Permalink /patch/30491/
State Accepted
Commit 570788854be1372b095d5dd1ad0549e26c8e8992
Headers show

Comments

Scott Garman - June 22, 2012, 5:25 p.m.
LIC_FILES_CHKSUM updated due to trivial copyright date change.

Use new update-alternatives syntax.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 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
Saul Wold - June 23, 2012, 4:56 a.m.
On 06/22/2012 10:25 AM, Scott Garman wrote:
> 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!

> Signed-off-by: Scott Garman<scott.a.garman@intel.com>
> ---
>   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
>
> diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc
> index 1d608a6..a4b1abe 100644
> --- a/meta/recipes-extended/gzip/gzip.inc
> +++ b/meta/recipes-extended/gzip/gzip.inc
> @@ -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"
> diff --git a/meta/recipes-extended/gzip/gzip_1.4.bb b/meta/recipes-extended/gzip/gzip_1.4.bb
> deleted file mode 100644
> index 54dd50a..0000000
> --- a/meta/recipes-extended/gzip/gzip_1.4.bb
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -require gzip.inc
> -
> -PR = "r2"
> -
> -NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
> -
> -BBCLASSEXTEND = "native"
> -
> -SRC_URI[md5sum] = "e381b8506210c794278f5527cba0e765"
> -SRC_URI[sha256sum] = "d166cfd3da380da1bd535633e8890bfb5664f9e68870a611d1dc01a3e9f711ee"
> diff --git a/meta/recipes-extended/gzip/gzip_1.5.bb b/meta/recipes-extended/gzip/gzip_1.5.bb
> new file mode 100644
> index 0000000..7a811e2
> --- /dev/null
> +++ b/meta/recipes-extended/gzip/gzip_1.5.bb
> @@ -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 - June 25, 2012, 3:36 p.m.
On 06/22/2012 09:56 PM, Saul Wold wrote:
> On 06/22/2012 10:25 AM, Scott Garman wrote:
>> 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

Patch

diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc
index 1d608a6..a4b1abe 100644
--- a/meta/recipes-extended/gzip/gzip.inc
+++ b/meta/recipes-extended/gzip/gzip.inc
@@ -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"
diff --git a/meta/recipes-extended/gzip/gzip_1.4.bb b/meta/recipes-extended/gzip/gzip_1.4.bb
deleted file mode 100644
index 54dd50a..0000000
--- a/meta/recipes-extended/gzip/gzip_1.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@ 
-require gzip.inc
-
-PR = "r2"
-
-NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
-
-BBCLASSEXTEND = "native"
-
-SRC_URI[md5sum] = "e381b8506210c794278f5527cba0e765"
-SRC_URI[sha256sum] = "d166cfd3da380da1bd535633e8890bfb5664f9e68870a611d1dc01a3e9f711ee"
diff --git a/meta/recipes-extended/gzip/gzip_1.5.bb b/meta/recipes-extended/gzip/gzip_1.5.bb
new file mode 100644
index 0000000..7a811e2
--- /dev/null
+++ b/meta/recipes-extended/gzip/gzip_1.5.bb
@@ -0,0 +1,10 @@ 
+require gzip.inc
+
+PR = "r0"
+
+NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
+
+BBCLASSEXTEND = "native"
+
+SRC_URI[md5sum] = "11b76536941ee1c0221fe6eefbcb32cb"
+SRC_URI[sha256sum] = "b5d56e8ffc9918e8c941fab56e04121194f9870adeeb859e09c09eac264035a3"