Patchwork [2/9] update-alternatives-dpkg: Update to dpkg base 1.15.8.7

login
register
mail settings
Submitter Saul Wold
Date May 22, 2011, 6:48 p.m.
Message ID <f69c937a66b3dc7055eb3454b0fbec60fd894bab.1306089781.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/4599/
State New, archived
Headers show

Comments

Saul Wold - May 22, 2011, 6:48 p.m.
[YOCTO #1062]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../update-alternatives-dpkg.inc                   |    6 ++++--
 .../update-alternatives-dpkg_1.13.22.bb            |    7 -------
 .../update-alternatives-dpkg_1.15.8.7.bb           |   13 +++++++++++++
 3 files changed, 17 insertions(+), 9 deletions(-)
 delete mode 100644 meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb
 create mode 100644 meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb
Joshua Lock - May 22, 2011, 9:20 p.m.
On Sun, 2011-05-22 at 11:48 -0700, Saul Wold wrote:
> [YOCTO #1062]

Can we include more of a description than just the bug ID here? It's a
pain to have to switch to the browser when your navigating git logs to
try and understand changes. Further it makes patches more difficult to
review.

I thought we'd encoded this in our patch policy?

Cheers,
Joshua

> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  .../update-alternatives-dpkg.inc                   |    6 ++++--
>  .../update-alternatives-dpkg_1.13.22.bb            |    7 -------
>  .../update-alternatives-dpkg_1.15.8.7.bb           |   13 +++++++++++++
>  3 files changed, 17 insertions(+), 9 deletions(-)
>  delete mode 100644 meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb
>  create mode 100644 meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb
> 
> diff --git a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
> index 9b53df8..63bfe95 100644
> --- a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
> +++ b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
> @@ -5,10 +5,12 @@ programs fulfilling the same or similar functions and how they can be installed
>  time."
>  LICENSE = "GPL"
>  SECTION = "base"
> -SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz"
> +SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.bz2"
>  S = "${WORKDIR}/dpkg-${PV}"
>  PACKAGE_ARCH = "all"
> -PR = "r2"
> +PR = "r0"
> +
> +inherit gettext
>  
>  do_patch () {
>      cat ${S}/scripts/update-alternatives.pl | \
> diff --git a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb
> deleted file mode 100644
> index 5d38d5d..0000000
> --- a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -require update-alternatives-dpkg.inc
> -
> -PROVIDES += "virtual/update-alternatives"
> -RPROVIDES_${PN} += "update-alternatives"
> -EXTRA_RDEPENDS = "perl dpkg"
> -EXTRA_RDEPENDS_virtclass-native = ""
> -RDEPENDS_${PN} += "${EXTRA_RDEPENDS}"
> diff --git a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb
> new file mode 100644
> index 0000000..15f3ced
> --- /dev/null
> +++ b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb
> @@ -0,0 +1,13 @@
> +require update-alternatives-dpkg.inc
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
> +
> +SRC_URI[md5sum] = "d1731d4147c1ea3b537a4d094519a6dc"
> +SRC_URI[sha256sum] = "1ec1376471b04717a4497e5d7a27cd545248c92116898ce0c53ced8ea94267b5"
> +
> +
> +PROVIDES += "virtual/update-alternatives"
> +RPROVIDES_${PN} += "update-alternatives"
> +EXTRA_RDEPENDS = "perl dpkg"
> +EXTRA_RDEPENDS_virtclass-native = ""
> +RDEPENDS_${PN} += "${EXTRA_RDEPENDS}"
Phil Blundell - May 23, 2011, 9:29 a.m.
On Sun, 2011-05-22 at 11:48 -0700, Saul Wold wrote:
> --- a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
> +++ b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
> @@ -5,10 +5,12 @@ programs fulfilling the same or similar functions and how they can be installed
>  time."
>  LICENSE = "GPL"
>  SECTION = "base"
> -SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz"
> +SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.bz2"
>  S = "${WORKDIR}/dpkg-${PV}"
>  PACKAGE_ARCH = "all"
> -PR = "r2"
> +PR = "r0"

Why is this in the .inc file at all?  It seems a bit bogus to have a PR
value defined here that needs to be rewound whenever PV is changed
somewhere else.

> +PROVIDES += "virtual/update-alternatives"
> +RPROVIDES_${PN} += "update-alternatives"
> +EXTRA_RDEPENDS = "perl dpkg"
> +EXTRA_RDEPENDS_virtclass-native = ""
> +RDEPENDS_${PN} += "${EXTRA_RDEPENDS}"

Conversely, why is this stuff in the .bb file rather than in the .inc?
Presumably all the lines above are version invariant.

Also (although this isn't really a comment on your patch), why does
u-a-dpkg RDEPEND on dpkg in the first place?  That seems like it rather
defeats the whole point of having this as a separate recipe.

p.

Patch

diff --git a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
index 9b53df8..63bfe95 100644
--- a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
+++ b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg.inc
@@ -5,10 +5,12 @@  programs fulfilling the same or similar functions and how they can be installed
 time."
 LICENSE = "GPL"
 SECTION = "base"
-SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz"
+SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.bz2"
 S = "${WORKDIR}/dpkg-${PV}"
 PACKAGE_ARCH = "all"
-PR = "r2"
+PR = "r0"
+
+inherit gettext
 
 do_patch () {
     cat ${S}/scripts/update-alternatives.pl | \
diff --git a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb
deleted file mode 100644
index 5d38d5d..0000000
--- a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.13.22.bb
+++ /dev/null
@@ -1,7 +0,0 @@ 
-require update-alternatives-dpkg.inc
-
-PROVIDES += "virtual/update-alternatives"
-RPROVIDES_${PN} += "update-alternatives"
-EXTRA_RDEPENDS = "perl dpkg"
-EXTRA_RDEPENDS_virtclass-native = ""
-RDEPENDS_${PN} += "${EXTRA_RDEPENDS}"
diff --git a/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb
new file mode 100644
index 0000000..15f3ced
--- /dev/null
+++ b/meta/recipes-devtools/update-alternatives/update-alternatives-dpkg_1.15.8.7.bb
@@ -0,0 +1,13 @@ 
+require update-alternatives-dpkg.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+
+SRC_URI[md5sum] = "d1731d4147c1ea3b537a4d094519a6dc"
+SRC_URI[sha256sum] = "1ec1376471b04717a4497e5d7a27cd545248c92116898ce0c53ced8ea94267b5"
+
+
+PROVIDES += "virtual/update-alternatives"
+RPROVIDES_${PN} += "update-alternatives"
+EXTRA_RDEPENDS = "perl dpkg"
+EXTRA_RDEPENDS_virtclass-native = ""
+RDEPENDS_${PN} += "${EXTRA_RDEPENDS}"