[PATCH 0/5] Packages Upgrade

[PATCH 0/5] Packages Upgrade

[Robert Yang]

The following changes since commit 5e21afc9395060b489156d3f90505a372b713f37:

  Revert "selftest/wic: extending test coverage for WIC script options" (2016-12-20 17:06:01 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/pu
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/pu

Robert Yang (5):
  debianutils: 4.8 -> 4.8.1
  mklibs-native: 0.1.41 -> 0.1.43
  quilt: 0.64 -> 0.65
  guile: 2.0.12 -> 2.0.13
  hdparm: 9.48 -> 9.50

 ...002-Recognize-nios2-as-compilation-target.patch | 32 ----------------------
 .../guile/{guile_2.0.12.bb => guile_2.0.13.bb}     |  5 ++--
 ...bs-native_0.1.41.bb => mklibs-native_0.1.43.bb} |  8 ++++--
 .../{quilt-native_0.64.bb => quilt-native_0.65.bb} |  0
 meta/recipes-devtools/quilt/quilt.inc              |  7 ++---
 meta/recipes-devtools/quilt/quilt/install.patch    | 13 ---------
 .../quilt/{quilt_0.64.bb => quilt_0.65.bb}         |  0
 ...-Makefile-use-weak-assignment-for-LDFALGS.patch | 30 ++++++++++++++++++++
 .../hdparm/{hdparm_9.48.bb => hdparm_9.50.bb}      |  8 ++++--
 .../{debianutils_4.8.bb => debianutils_4.8.1.bb}   |  7 +++--
 10 files changed, 49 insertions(+), 61 deletions(-)
 delete mode 100644 meta/recipes-devtools/guile/files/0002-Recognize-nios2-as-compilation-target.patch
 rename meta/recipes-devtools/guile/{guile_2.0.12.bb => guile_2.0.13.bb} (95%)
 rename meta/recipes-devtools/mklibs/{mklibs-native_0.1.41.bb => mklibs-native_0.1.43.bb} (71%)
 rename meta/recipes-devtools/quilt/{quilt-native_0.64.bb => quilt-native_0.65.bb} (100%)
 delete mode 100644 meta/recipes-devtools/quilt/quilt/install.patch
 rename meta/recipes-devtools/quilt/{quilt_0.64.bb => quilt_0.65.bb} (100%)
 create mode 100644 meta/recipes-extended/hdparm/hdparm/0001-Makefile-use-weak-assignment-for-LDFALGS.patch
 rename meta/recipes-extended/hdparm/{hdparm_9.48.bb => hdparm_9.50.bb} (80%)
 rename meta/recipes-support/debianutils/{debianutils_4.8.bb => debianutils_4.8.1.bb} (86%)

-- 
2.11.0.rc2.dirty

[PATCH 1/5] debianutils: 4.8 -> 4.8.1

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../debianutils/{debianutils_4.8.bb => debianutils_4.8.1.bb}       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename meta/recipes-support/debianutils/{debianutils_4.8.bb => debianutils_4.8.1.bb} (86%)

diff --git a/meta/recipes-support/debianutils/debianutils_4.8.bb b/meta/recipes-support/debianutils/debianutils_4.8.1.bb
similarity index 86%
rename from meta/recipes-support/debianutils/debianutils_4.8.bb
rename to meta/recipes-support/debianutils/debianutils_4.8.1.bb
index d969fd3c9af..54c74e097c0 100644
--- a/meta/recipes-support/debianutils/debianutils_4.8.bb
+++ b/meta/recipes-support/debianutils/debianutils_4.8.1.bb
@@ -3,13 +3,14 @@ SECTION = "base"
 LICENSE = "GPLv2 & SMAIL_GPL"
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=f01a5203d50512fc4830b4332b696a9f"
 
-SRC_URI = "http://snapshot.debian.org/archive/debian/20160629T224408Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz"
+SRC_URI = "http://snapshot.debian.org/archive/debian/20161118T033019Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz"
 # the package is taken from snapshots.debian.org; that source is static and goes stale
 # so we check the latest upstream from a directory that does get updated
 UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/"
 
-SRC_URI[md5sum] = "66a37e5ff17be431319bd0b43e9a46b5"
-SRC_URI[sha256sum] = "afa95bbe6b6fd3ef3c0c838b2d7232f09fabeff593ca4b5583cffa6748567ee2"
+
+SRC_URI[md5sum] = "44083fc66164746880dffd30d62d054b"
+SRC_URI[sha256sum] = "2c395c0bdcfe89de30828b1d25cc5549ded5225a6d3625fbcb2cc0881ef5f026"
 
 inherit autotools update-alternatives
 
-- 
2.11.0.rc2.dirty

[PATCH 2/5] mklibs-native: 0.1.41 -> 0.1.43

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../mklibs/{mklibs-native_0.1.41.bb => mklibs-native_0.1.43.bb}   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/mklibs/{mklibs-native_0.1.41.bb => mklibs-native_0.1.43.bb} (71%)

diff --git a/meta/recipes-devtools/mklibs/mklibs-native_0.1.41.bb b/meta/recipes-devtools/mklibs/mklibs-native_0.1.43.bb
similarity index 71%
rename from meta/recipes-devtools/mklibs/mklibs-native_0.1.41.bb
rename to meta/recipes-devtools/mklibs/mklibs-native_0.1.43.bb
index 4cf1a5cfe2b..e2444da36d4 100644
--- a/meta/recipes-devtools/mklibs/mklibs-native_0.1.41.bb
+++ b/meta/recipes-devtools/mklibs/mklibs-native_0.1.43.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://debian/copyright;md5=98d31037b13d896e33890738ef01af64"
 DEPENDS = "python-native"
 
-SRC_URI = "http://snapshot.debian.org/archive/debian/20160207T221625Z/pool/main/m/${BPN}/${BPN}_${PV}.tar.xz \
+SRC_URI = "http://snapshot.debian.org/archive/debian-debug/20161123T150725Z/pool/main/m/${BPN}/${BPN}_${PV}.tar.xz \
 	file://ac_init_fix.patch\
 	file://fix_STT_GNU_IFUNC.patch\
 	file://sysrooted-ldso.patch \
@@ -15,9 +15,11 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20160207T221625Z/pool/main/
 	file://fix_cross_compile.patch \
 "
 
-SRC_URI[md5sum] = "6b2979876a611717df3d49e7f9cf291d"
-SRC_URI[sha256sum] = "058c7349f8ec8a03b529c546a95cd6426741bd819f1e1211f499273eb4bf5d89"
+SRC_URI[md5sum] = "39b08a173454e5210ab3f598e94179bf"
+SRC_URI[sha256sum] = "6f0cf24ade13fff76e943c003413d85c3e497c984c95c1ecea1c9731ca86f13c"
 
 UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/m/mklibs/"
 
 inherit autotools gettext native pythonnative
+
+S = "${WORKDIR}/${BPN}"
-- 
2.11.0.rc2.dirty

[PATCH 3/5] quilt: 0.64 -> 0.65

[Robert Yang]

* Removed install.patch since it is already in the patch.
* Fix indent for file://test.sh

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../quilt/{quilt-native_0.64.bb => quilt-native_0.65.bb}    |  0
 meta/recipes-devtools/quilt/quilt.inc                       |  7 +++----
 meta/recipes-devtools/quilt/quilt/install.patch             | 13 -------------
 .../recipes-devtools/quilt/{quilt_0.64.bb => quilt_0.65.bb} |  0
 4 files changed, 3 insertions(+), 17 deletions(-)
 rename meta/recipes-devtools/quilt/{quilt-native_0.64.bb => quilt-native_0.65.bb} (100%)
 delete mode 100644 meta/recipes-devtools/quilt/quilt/install.patch
 rename meta/recipes-devtools/quilt/{quilt_0.64.bb => quilt_0.65.bb} (100%)

diff --git a/meta/recipes-devtools/quilt/quilt-native_0.64.bb b/meta/recipes-devtools/quilt/quilt-native_0.65.bb
similarity index 100%
rename from meta/recipes-devtools/quilt/quilt-native_0.64.bb
rename to meta/recipes-devtools/quilt/quilt-native_0.65.bb
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc
index 512b798d735..9cf7bac5eed 100644
--- a/meta/recipes-devtools/quilt/quilt.inc
+++ b/meta/recipes-devtools/quilt/quilt.inc
@@ -5,14 +5,13 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \
-        file://install.patch \
         file://run-ptest \
         file://Makefile \
-	file://test.sh \
+        file://test.sh \
 "
 
-SRC_URI[md5sum] = "fc0310db5868a0873d602d4332a76d43"
-SRC_URI[sha256sum] = "c4bfd3282214a288e8d3e921ae4d52e73e24c4fead72b5446752adee99a7affd"
+SRC_URI[md5sum] = "c67ba0228f5b7b8bbe469474661f92d6"
+SRC_URI[sha256sum] = "f6cbc788e5cbbb381a3c6eab5b9efce67c776a8662a7795c7432fd27aa096819"
 
 inherit autotools-brokensep ptest
 
diff --git a/meta/recipes-devtools/quilt/quilt/install.patch b/meta/recipes-devtools/quilt/quilt/install.patch
deleted file mode 100644
index e2a7af6550e..00000000000
--- a/meta/recipes-devtools/quilt/quilt/install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Upstream-Status: Pending
-
---- quilt-0.47/Makefile.in	2008-12-31 19:09:13.000000000 +0000
-+++ quilt-0.47/Makefile.in.orig	2008-08-21 13:21:32.000000000 +0100
-@@ -13,7 +13,7 @@
- mandir :=	@mandir@
- localedir :=	$(datadir)/locale
- emacsdir :=	$(datadir)/emacs/site-lisp
--etcdir :=	$(subst /usr/etc,/etc,$(prefix)/etc)
-+etcdir :=	@sysconfdir@
- 
- INSTALL :=	@INSTALL@
- POD2MAN :=	@POD2MAN@
diff --git a/meta/recipes-devtools/quilt/quilt_0.64.bb b/meta/recipes-devtools/quilt/quilt_0.65.bb
similarity index 100%
rename from meta/recipes-devtools/quilt/quilt_0.64.bb
rename to meta/recipes-devtools/quilt/quilt_0.65.bb
-- 
2.11.0.rc2.dirty

[PATCH 4/5] guile: 2.0.12 -> 2.0.13

[Robert Yang]

Remove 0002-Recognize-nios2-as-compilation-target.patch which is already
in the source.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 ...002-Recognize-nios2-as-compilation-target.patch | 32 ----------------------
 .../guile/{guile_2.0.12.bb => guile_2.0.13.bb}     |  5 ++--
 2 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 meta/recipes-devtools/guile/files/0002-Recognize-nios2-as-compilation-target.patch
 rename meta/recipes-devtools/guile/{guile_2.0.12.bb => guile_2.0.13.bb} (95%)

diff --git a/meta/recipes-devtools/guile/files/0002-Recognize-nios2-as-compilation-target.patch b/meta/recipes-devtools/guile/files/0002-Recognize-nios2-as-compilation-target.patch
deleted file mode 100644
index 8e847477043..00000000000
--- a/meta/recipes-devtools/guile/files/0002-Recognize-nios2-as-compilation-target.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 76155065c70b5ab65c6c805423183b360141db84 Mon Sep 17 00:00:00 2001
-From: Marek Vasut <marex@denx.de>
-Date: Thu, 28 Jan 2016 04:46:23 +0100
-Subject: [PATCH] Recognize nios2 as compilation target
-
-Signed-off-by: Marek Vasut <marex@denx.de>
-Upstream-Status: Submitted [ http://debbugs.gnu.org/cgi/bugreport.cgi?bug=22480 ]
----
- module/system/base/target.scm | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/module/system/base/target.scm b/module/system/base/target.scm
---- a/module/system/base/target.scm
-+++ b/module/system/base/target.scm
-@@ -65,7 +65,7 @@
-       (cond ((string-match "^i[0-9]86$" cpu)
-              (endianness little))
-             ((member cpu '("x86_64" "ia64"
--                           "powerpcle" "powerpc64le" "mipsel" "mips64el" "sh4"))
-+                           "powerpcle" "powerpc64le" "mipsel" "mips64el" "sh4" "nios2"))
-              (endianness little))
-             ((member cpu '("sparc" "sparc64" "powerpc" "powerpc64" "spu"
-                            "mips" "mips64" "m68k" "s390x"))
-@@ -108,7 +108,7 @@
- 
-           ((string-match "64$" cpu) 8)
-           ((string-match "64_?[lbe][lbe]$" cpu) 8)
--          ((member cpu '("sparc" "powerpc" "mips" "mipsel" "m68k" "sh4")) 4)
-+          ((member cpu '("sparc" "powerpc" "mips" "mipsel" "m68k" "sh4" "nios2")) 4)
-           ((member cpu '("s390x")) 8)
-           ((string-match "^arm.*" cpu) 4)
-           (else (error "unknown CPU word size" cpu)))))
diff --git a/meta/recipes-devtools/guile/guile_2.0.12.bb b/meta/recipes-devtools/guile/guile_2.0.13.bb
similarity index 95%
rename from meta/recipes-devtools/guile/guile_2.0.12.bb
rename to meta/recipes-devtools/guile/guile_2.0.13.bb
index d2fe511ae40..dd38b479931 100644
--- a/meta/recipes-devtools/guile/guile_2.0.12.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.13.bb
@@ -22,11 +22,10 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.xz \
            file://arm_aarch64.patch \
            file://workaround-ice-ssa-corruption.patch \
            file://libguile-Makefile.am-hook.patch \
-           file://0002-Recognize-nios2-as-compilation-target.patch \
            "
 
-SRC_URI[md5sum] = "081fdf80cd3a76f260a2a0d87f773d6b"
-SRC_URI[sha256sum] = "de8187736f9b260f2fa776ed39b52cb74dd389ccf7039c042f0606270196b7e9"
+SRC_URI[md5sum] = "d50bbb19672b72aa1e1c96e8f024bf00"
+SRC_URI[sha256sum] = "3744f2addc282a0de627aaef048f062982b44564d54ac31ff5217972529ed88b"
 
 inherit autotools gettext pkgconfig texinfo
 BBCLASSEXTEND = "native"
-- 
2.11.0.rc2.dirty

[PATCH 5/5] hdparm: 9.48 -> 9.50

[Robert Yang]

Add 0001-Makefile-use-weak-assignment-for-LDFALGS.patch to fix issues like:
ERROR: hdparm-9.50-r0 do_package: QA Issue: File '/sbin/hdparm.hdparm' from hdparm was already stripped, this will prevent future debugging! [already-stripped]
ERROR: hdparm-9.50-r0 do_package: Fatal QA errors found, failing task.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 ...-Makefile-use-weak-assignment-for-LDFALGS.patch | 30 ++++++++++++++++++++++
 .../hdparm/{hdparm_9.48.bb => hdparm_9.50.bb}      |  8 +++---
 2 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-extended/hdparm/hdparm/0001-Makefile-use-weak-assignment-for-LDFALGS.patch
 rename meta/recipes-extended/hdparm/{hdparm_9.48.bb => hdparm_9.50.bb} (80%)

diff --git a/meta/recipes-extended/hdparm/hdparm/0001-Makefile-use-weak-assignment-for-LDFALGS.patch b/meta/recipes-extended/hdparm/hdparm/0001-Makefile-use-weak-assignment-for-LDFALGS.patch
new file mode 100644
index 00000000000..f74da5f18c9
--- /dev/null
+++ b/meta/recipes-extended/hdparm/hdparm/0001-Makefile-use-weak-assignment-for-LDFALGS.patch
@@ -0,0 +1,30 @@
+From 9532fbaade3b08cef936723a6a5adf191881edbf Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Mon, 19 Dec 2016 22:36:16 -0800
+Subject: [PATCH] Makefile: use weak assignment for LDFALGS
+
+So that it can use LDFLAGS from env vars.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 05a1f78..60b67d9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,7 +15,7 @@ STRIP ?= strip
+ 
+ CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
+ 
+-LDFLAGS = -s
++LDFLAGS ?= -s
+ #LDFLAGS = -s -static
+ INSTALL = install
+ INSTALL_DATA = $(INSTALL) -m 644
+-- 
+2.10.2
+
diff --git a/meta/recipes-extended/hdparm/hdparm_9.48.bb b/meta/recipes-extended/hdparm/hdparm_9.50.bb
similarity index 80%
rename from meta/recipes-extended/hdparm/hdparm_9.48.bb
rename to meta/recipes-extended/hdparm/hdparm_9.50.bb
index cd85776cf8f..d1f10027cc9 100644
--- a/meta/recipes-extended/hdparm/hdparm_9.48.bb
+++ b/meta/recipes-extended/hdparm/hdparm_9.50.bb
@@ -20,10 +20,12 @@ FILES_wiper = "${bindir}/wiper.sh"
 
 RDEPENDS_wiper = "bash gawk stat"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/${BP}.tar.gz "
+SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/${BP}.tar.gz \
+           file://0001-Makefile-use-weak-assignment-for-LDFALGS.patch \
+"
 
-SRC_URI[md5sum] = "213efdbe7471fad3408198918e164354"
-SRC_URI[sha256sum] = "ce97b4a71cb04146f54cf6f69787e7f97ddfda9836dc803b459d3b3df3a4fbee"
+SRC_URI[md5sum] = "d380062ad6c4b40076736efbb640f1f5"
+SRC_URI[sha256sum] = "0892b44bd817c251264a24f6ecbbb010958033e0395d2030f25f1c5608ac780e"
 
 EXTRA_OEMAKE = '-e MAKEFLAGS= STRIP="echo"'
 
-- 
2.11.0.rc2.dirty

Re: [PATCH 5/5] hdparm: 9.48 -> 9.50

[Andre McCurdy]

On Tue, Dec 20, 2016 at 10:17 PM, Robert Yang <liezhi.yang@windriver.com> wrote:
> Add 0001-Makefile-use-weak-assignment-for-LDFALGS.patch to fix issues like:
> ERROR: hdparm-9.50-r0 do_package: QA Issue: File '/sbin/hdparm.hdparm' from hdparm was already stripped, this will prevent future debugging! [already-stripped]
> ERROR: hdparm-9.50-r0 do_package: Fatal QA errors found, failing task.

Passing LDFLAGS on the make command line might be a cleaner solution
than patching the Makefile.

> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>  ...-Makefile-use-weak-assignment-for-LDFALGS.patch | 30 ++++++++++++++++++++++
>  .../hdparm/{hdparm_9.48.bb => hdparm_9.50.bb}      |  8 +++---
>  2 files changed, 35 insertions(+), 3 deletions(-)
>  create mode 100644 meta/recipes-extended/hdparm/hdparm/0001-Makefile-use-weak-assignment-for-LDFALGS.patch
>  rename meta/recipes-extended/hdparm/{hdparm_9.48.bb => hdparm_9.50.bb} (80%)
>
> diff --git a/meta/recipes-extended/hdparm/hdparm/0001-Makefile-use-weak-assignment-for-LDFALGS.patch b/meta/recipes-extended/hdparm/hdparm/0001-Makefile-use-weak-assignment-for-LDFALGS.patch
> new file mode 100644
> index 00000000000..f74da5f18c9
> --- /dev/null
> +++ b/meta/recipes-extended/hdparm/hdparm/0001-Makefile-use-weak-assignment-for-LDFALGS.patch
> @@ -0,0 +1,30 @@
> +From 9532fbaade3b08cef936723a6a5adf191881edbf Mon Sep 17 00:00:00 2001
> +From: Robert Yang <liezhi.yang@windriver.com>
> +Date: Mon, 19 Dec 2016 22:36:16 -0800
> +Subject: [PATCH] Makefile: use weak assignment for LDFALGS
> +
> +So that it can use LDFLAGS from env vars.
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> +---
> + Makefile | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Makefile b/Makefile
> +index 05a1f78..60b67d9 100644
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -15,7 +15,7 @@ STRIP ?= strip
> +
> + CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
> +
> +-LDFLAGS = -s
> ++LDFLAGS ?= -s
> + #LDFLAGS = -s -static
> + INSTALL = install
> + INSTALL_DATA = $(INSTALL) -m 644
> +--
> +2.10.2
> +

Re: [PATCH 5/5] hdparm: 9.48 -> 9.50

[Robert Yang]

On 12/21/2016 09:27 PM, Andre McCurdy wrote:
> On Tue, Dec 20, 2016 at 10:17 PM, Robert Yang <liezhi.yang@windriver.com> wrote:
>> Add 0001-Makefile-use-weak-assignment-for-LDFALGS.patch to fix issues like:
>> ERROR: hdparm-9.50-r0 do_package: QA Issue: File '/sbin/hdparm.hdparm' from hdparm was already stripped, this will prevent future debugging! [already-stripped]
>> ERROR: hdparm-9.50-r0 do_package: Fatal QA errors found, failing task.
>
> Passing LDFLAGS on the make command line might be a cleaner solution
> than patching the Makefile.

We can't do that since there is a "-e MAKEFLAGS=" in EXTRA_OEMAKE, and its
Makefile is:

all:
     make -j2 hdparm

hdparm: hdparm.h sgio.h $(OBJS)
     $(CC) $(LDFLAGS) -o hdparm $(OBJS)
     $(STRIP) hdparm

The "make -j2 hdparm" doesn't pass any env vars to sub make since MAKEFLAGS=,
so that need use weak assignment "?=" here.

// Robert

>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>>  ...-Makefile-use-weak-assignment-for-LDFALGS.patch | 30 ++++++++++++++++++++++
>>  .../hdparm/{hdparm_9.48.bb => hdparm_9.50.bb}      |  8 +++---
>>  2 files changed, 35 insertions(+), 3 deletions(-)
>>  create mode 100644 meta/recipes-extended/hdparm/hdparm/0001-Makefile-use-weak-assignment-for-LDFALGS.patch
>>  rename meta/recipes-extended/hdparm/{hdparm_9.48.bb => hdparm_9.50.bb} (80%)
>>
>> diff --git a/meta/recipes-extended/hdparm/hdparm/0001-Makefile-use-weak-assignment-for-LDFALGS.patch b/meta/recipes-extended/hdparm/hdparm/0001-Makefile-use-weak-assignment-for-LDFALGS.patch
>> new file mode 100644
>> index 00000000000..f74da5f18c9
>> --- /dev/null
>> +++ b/meta/recipes-extended/hdparm/hdparm/0001-Makefile-use-weak-assignment-for-LDFALGS.patch
>> @@ -0,0 +1,30 @@
>> +From 9532fbaade3b08cef936723a6a5adf191881edbf Mon Sep 17 00:00:00 2001
>> +From: Robert Yang <liezhi.yang@windriver.com>
>> +Date: Mon, 19 Dec 2016 22:36:16 -0800
>> +Subject: [PATCH] Makefile: use weak assignment for LDFALGS
>> +
>> +So that it can use LDFLAGS from env vars.
>> +
>> +Upstream-Status: Pending
>> +
>> +Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> +---
>> + Makefile | 2 +-
>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>> +
>> +diff --git a/Makefile b/Makefile
>> +index 05a1f78..60b67d9 100644
>> +--- a/Makefile
>> ++++ b/Makefile
>> +@@ -15,7 +15,7 @@ STRIP ?= strip
>> +
>> + CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
>> +
>> +-LDFLAGS = -s
>> ++LDFLAGS ?= -s
>> + #LDFLAGS = -s -static
>> + INSTALL = install
>> + INSTALL_DATA = $(INSTALL) -m 644
>> +--
>> +2.10.2
>> +
>

Re: [PATCH 5/5] hdparm: 9.48 -> 9.50

[Robert Yang]

On 12/22/2016 10:47 AM, Robert Yang wrote:
>
>
> On 12/21/2016 09:27 PM, Andre McCurdy wrote:
>> On Tue, Dec 20, 2016 at 10:17 PM, Robert Yang <liezhi.yang@windriver.com> wrote:
>>> Add 0001-Makefile-use-weak-assignment-for-LDFALGS.patch to fix issues like:
>>> ERROR: hdparm-9.50-r0 do_package: QA Issue: File '/sbin/hdparm.hdparm' from
>>> hdparm was already stripped, this will prevent future debugging!
>>> [already-stripped]
>>> ERROR: hdparm-9.50-r0 do_package: Fatal QA errors found, failing task.
>>
>> Passing LDFLAGS on the make command line might be a cleaner solution
>> than patching the Makefile.

To be clear, passing LDFLAGS on the make command line doesn't work.

// Robert

>
> We can't do that since there is a "-e MAKEFLAGS=" in EXTRA_OEMAKE, and its
> Makefile is:
>
> all:
>     make -j2 hdparm
>
> hdparm: hdparm.h sgio.h $(OBJS)
>     $(CC) $(LDFLAGS) -o hdparm $(OBJS)
>     $(STRIP) hdparm
>
> The "make -j2 hdparm" doesn't pass any env vars to sub make since MAKEFLAGS=,
> so that need use weak assignment "?=" here.
>
> // Robert
>
>>
>>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>>> ---
>>>  ...-Makefile-use-weak-assignment-for-LDFALGS.patch | 30 ++++++++++++++++++++++
>>>  .../hdparm/{hdparm_9.48.bb => hdparm_9.50.bb}      |  8 +++---
>>>  2 files changed, 35 insertions(+), 3 deletions(-)
>>>  create mode 100644
>>> meta/recipes-extended/hdparm/hdparm/0001-Makefile-use-weak-assignment-for-LDFALGS.patch
>>>
>>>  rename meta/recipes-extended/hdparm/{hdparm_9.48.bb => hdparm_9.50.bb} (80%)
>>>
>>> diff --git
>>> a/meta/recipes-extended/hdparm/hdparm/0001-Makefile-use-weak-assignment-for-LDFALGS.patch
>>> b/meta/recipes-extended/hdparm/hdparm/0001-Makefile-use-weak-assignment-for-LDFALGS.patch
>>>
>>> new file mode 100644
>>> index 00000000000..f74da5f18c9
>>> --- /dev/null
>>> +++
>>> b/meta/recipes-extended/hdparm/hdparm/0001-Makefile-use-weak-assignment-for-LDFALGS.patch
>>>
>>> @@ -0,0 +1,30 @@
>>> +From 9532fbaade3b08cef936723a6a5adf191881edbf Mon Sep 17 00:00:00 2001
>>> +From: Robert Yang <liezhi.yang@windriver.com>
>>> +Date: Mon, 19 Dec 2016 22:36:16 -0800
>>> +Subject: [PATCH] Makefile: use weak assignment for LDFALGS
>>> +
>>> +So that it can use LDFLAGS from env vars.
>>> +
>>> +Upstream-Status: Pending
>>> +
>>> +Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>>> +---
>>> + Makefile | 2 +-
>>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>>> +
>>> +diff --git a/Makefile b/Makefile
>>> +index 05a1f78..60b67d9 100644
>>> +--- a/Makefile
>>> ++++ b/Makefile
>>> +@@ -15,7 +15,7 @@ STRIP ?= strip
>>> +
>>> + CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith
>>> -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes
>>> -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings
>>> -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
>>> +
>>> +-LDFLAGS = -s
>>> ++LDFLAGS ?= -s
>>> + #LDFLAGS = -s -static
>>> + INSTALL = install
>>> + INSTALL_DATA = $(INSTALL) -m 644
>>> +--
>>> +2.10.2
>>> +
>>

Re: [PATCH 5/5] hdparm: 9.48 -> 9.50

[Andreas Oberritter]

On 22.12.2016 03:47, Robert Yang wrote:
> On 12/21/2016 09:27 PM, Andre McCurdy wrote:
>> Passing LDFLAGS on the make command line might be a cleaner solution
>> than patching the Makefile.
> 
> We can't do that since there is a "-e MAKEFLAGS=" in EXTRA_OEMAKE, and its
> Makefile is:
> 
> all:
>     make -j2 hdparm
> 
> hdparm: hdparm.h sgio.h $(OBJS)
>     $(CC) $(LDFLAGS) -o hdparm $(OBJS)
>     $(STRIP) hdparm
> 
> The "make -j2 hdparm" doesn't pass any env vars to sub make since
> MAKEFLAGS=,
> so that need use weak assignment "?=" here.

You don't need to use target 'all'. Try this:

do_compile() {
    oe_runmake hdparm
}

Regards,
Andreas

Re: [PATCH 5/5] hdparm: 9.48 -> 9.50

[Robert Yang]

On 12/22/2016 11:09 AM, Andreas Oberritter wrote:
> On 22.12.2016 03:47, Robert Yang wrote:
>> On 12/21/2016 09:27 PM, Andre McCurdy wrote:
>>> Passing LDFLAGS on the make command line might be a cleaner solution
>>> than patching the Makefile.
>>
>> We can't do that since there is a "-e MAKEFLAGS=" in EXTRA_OEMAKE, and its
>> Makefile is:
>>
>> all:
>>     make -j2 hdparm
>>
>> hdparm: hdparm.h sgio.h $(OBJS)
>>     $(CC) $(LDFLAGS) -o hdparm $(OBJS)
>>     $(STRIP) hdparm
>>
>> The "make -j2 hdparm" doesn't pass any env vars to sub make since
>> MAKEFLAGS=,
>> so that need use weak assignment "?=" here.
>
> You don't need to use target 'all'. Try this:
>
> do_compile() {
>     oe_runmake hdparm
> }

I know this will work, but "make hdparm" rather than "all" may cause other
issues in the future when hdparm gets ugpraded, for example, "all" doesn't
only contain "hdmarm". And do we have really have to add a do_compile()
here ?

// Robert

>
> Regards,
> Andreas
>

Re: [PATCH 5/5] hdparm: 9.48 -> 9.50

[Andre McCurdy]

On Wed, Dec 21, 2016 at 6:49 PM, Robert Yang <liezhi.yang@windriver.com> wrote:
> On 12/22/2016 10:47 AM, Robert Yang wrote:
>> On 12/21/2016 09:27 PM, Andre McCurdy wrote:
>>> On Tue, Dec 20, 2016 at 10:17 PM, Robert Yang <liezhi.yang@windriver.com>
>>> wrote:
>>>>
>>>> Add 0001-Makefile-use-weak-assignment-for-LDFALGS.patch to fix issues
>>>> like:
>>>> ERROR: hdparm-9.50-r0 do_package: QA Issue: File '/sbin/hdparm.hdparm'
>>>> from
>>>> hdparm was already stripped, this will prevent future debugging!
>>>> [already-stripped]
>>>> ERROR: hdparm-9.50-r0 do_package: Fatal QA errors found, failing task.
>>>
>>> Passing LDFLAGS on the make command line might be a cleaner solution
>>> than patching the Makefile.
>
> To be clear, passing LDFLAGS on the make command line doesn't work.

You need to remove "-e MAKEFLAGS= " from EXTRA_OEMAKE and add CC and
LDFLAGS (and anything required by the install target which isn't
passed on the command line already) but that's all worthy clean up
too.

Re: [PATCH 5/5] hdparm: 9.48 -> 9.50

[Andreas Oberritter]

On 22.12.2016 04:14, Robert Yang wrote:
> On 12/22/2016 11:09 AM, Andreas Oberritter wrote:
>> On 22.12.2016 03:47, Robert Yang wrote:
>>> On 12/21/2016 09:27 PM, Andre McCurdy wrote:
>>>> Passing LDFLAGS on the make command line might be a cleaner solution
>>>> than patching the Makefile.
>>>
>>> We can't do that since there is a "-e MAKEFLAGS=" in EXTRA_OEMAKE,
>>> and its
>>> Makefile is:
>>>
>>> all:
>>>     make -j2 hdparm
>>>
>>> hdparm: hdparm.h sgio.h $(OBJS)
>>>     $(CC) $(LDFLAGS) -o hdparm $(OBJS)
>>>     $(STRIP) hdparm
>>>
>>> The "make -j2 hdparm" doesn't pass any env vars to sub make since
>>> MAKEFLAGS=,
>>> so that need use weak assignment "?=" here.
>>
>> You don't need to use target 'all'. Try this:
>>
>> do_compile() {
>>     oe_runmake hdparm
>> }
> 
> I know this will work, but "make hdparm" rather than "all" may cause other
> issues in the future when hdparm gets ugpraded, for example, "all" doesn't
> only contain "hdmarm". And do we have really have to add a do_compile()
> here ?

It's certainly easier to delete do_compile in a future version's recipe
than regenerating patches. hdparm is looking for a new maintainer, btw.

'hdparm' has been the only target built by 'all' since at least version
3.1, which dates back to 1996.

Regards,
Andreas

Re: [PATCH 5/5] hdparm: 9.48 -> 9.50

[Robert Yang]

Thanks, updated in the repo:

   git://git.openembedded.org/openembedded-core-contrib rbt/pu
   http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/pu

Robert Yang (5):
   debianutils: 4.8 -> 4.8.1
   mklibs-native: 0.1.41 -> 0.1.43
   quilt: 0.64 -> 0.65
   guile: 2.0.12 -> 2.0.13
   hdparm: 9.48 -> 9.50



Author: Robert Yang <liezhi.yang@windriver.com>
Date:   Tue Dec 20 03:09:45 2016 +0000

     hdparm: 9.48 -> 9.50

     Remove "-e MAKEFLAGS=" from EXTRA_OEMAKE to fix:
     ERROR: hdparm-9.50-r0 do_package: QA Issue: File '/sbin/hdparm.hdparm' from 
hdparm was already stripped, this will prevent future debugging! [already-stripped]
     ERROR: hdparm-9.50-r0 do_package: Fatal QA errors found, failing task.

     The "-e MAKEFLAGS=" would cause submake can't get vars from environment,
     The git log said that it was added for fixing a QA warning, but
     everything is OK after remove it now.

     Signed-off-by: Robert Yang <liezhi.yang@windriver.com>

diff --git a/meta/recipes-extended/hdparm/hdparm_9.48.bb 
b/meta/recipes-extended/hdparm/hdparm_9.50.bb
similarity index 81%
rename from meta/recipes-extended/hdparm/hdparm_9.48.bb
rename to meta/recipes-extended/hdparm/hdparm_9.50.bb
index cd85776cf8f..f89c30e4dda 100644
--- a/meta/recipes-extended/hdparm/hdparm_9.48.bb
+++ b/meta/recipes-extended/hdparm/hdparm_9.50.bb
@@ -20,12 +20,12 @@ FILES_wiper = "${bindir}/wiper.sh"

  RDEPENDS_wiper = "bash gawk stat"

-SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/${BP}.tar.gz "
+SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/${BP}.tar.gz"

-SRC_URI[md5sum] = "213efdbe7471fad3408198918e164354"
-SRC_URI[sha256sum] = 
"ce97b4a71cb04146f54cf6f69787e7f97ddfda9836dc803b459d3b3df3a4fbee"
+SRC_URI[md5sum] = "d380062ad6c4b40076736efbb640f1f5"
+SRC_URI[sha256sum] = 
"0892b44bd817c251264a24f6ecbbb010958033e0395d2030f25f1c5608ac780e"

-EXTRA_OEMAKE = '-e MAKEFLAGS= STRIP="echo"'
+EXTRA_OEMAKE = 'STRIP="echo" LDFLAGS="${LDFLAGS}"'

  inherit update-alternatives


// Robert

On 12/22/2016 09:34 PM, Andreas Oberritter wrote:
> On 22.12.2016 04:14, Robert Yang wrote:
>> On 12/22/2016 11:09 AM, Andreas Oberritter wrote:
>>> On 22.12.2016 03:47, Robert Yang wrote:
>>>> On 12/21/2016 09:27 PM, Andre McCurdy wrote:
>>>>> Passing LDFLAGS on the make command line might be a cleaner solution
>>>>> than patching the Makefile.
>>>>
>>>> We can't do that since there is a "-e MAKEFLAGS=" in EXTRA_OEMAKE,
>>>> and its
>>>> Makefile is:
>>>>
>>>> all:
>>>>     make -j2 hdparm
>>>>
>>>> hdparm: hdparm.h sgio.h $(OBJS)
>>>>     $(CC) $(LDFLAGS) -o hdparm $(OBJS)
>>>>     $(STRIP) hdparm
>>>>
>>>> The "make -j2 hdparm" doesn't pass any env vars to sub make since
>>>> MAKEFLAGS=,
>>>> so that need use weak assignment "?=" here.
>>>
>>> You don't need to use target 'all'. Try this:
>>>
>>> do_compile() {
>>>     oe_runmake hdparm
>>> }
>>
>> I know this will work, but "make hdparm" rather than "all" may cause other
>> issues in the future when hdparm gets ugpraded, for example, "all" doesn't
>> only contain "hdmarm". And do we have really have to add a do_compile()
>> here ?
>
> It's certainly easier to delete do_compile in a future version's recipe
> than regenerating patches. hdparm is looking for a new maintainer, btw.
>
> 'hdparm' has been the only target built by 'all' since at least version
> 3.1, which dates back to 1996.
>
> Regards,
> Andreas
>