Skip to contentSkip to conversation

bzip2: Create Makefile for run-ptest

PATCH New [email protected] 1 participant 1 message Sep 14, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bzip2: Create Makefile for run-ptest

From: Ooi Cinly <[email protected]>

To improve binary reproducibility, only the relevent part of the Makefile in bzip2-ptest package that run-ptest needs are copied to the destination directory.

bzip2-ptest requires Makefile. The original Makefile contains references to build host. By copying only the relevent part,
we avoid those references making their way into the target system

Used Makefile.am as the source to extract the revelent part instead of Makefile as it is easier to parse than Makefile.

A redundant command in do_install_ptest() that repeat the copying of Makefile that was already copied by Makefile's install-ptest step is removed because it now interfers with the creation of the new Makefile by make's install-ptest.

[YOCTO #11596]

---
 meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am | 3 ++-
 meta/recipes-extended/bzip2/bzip2_1.0.6.bb          | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am +2 -1
index 05d389f..dcf6458 100644
@@ -48,7 +48,8 @@ runtest:
 	else echo "FAIL: sample3 decompress"; fi
 
 install-ptest:
-	cp $(srcdir)/Makefile		$(DESTDIR)/
+	sed  -n '/^runtest:/,/^install-ptest:/{/^install-ptest:/!p}' \
+           $(srcdir)/Makefile.am      > $(DESTDIR)/Makefile
 	cp $(srcdir)/sample1.ref	$(DESTDIR)/
 	cp $(srcdir)/sample2.ref	$(DESTDIR)/
 	cp $(srcdir)/sample3.ref	$(DESTDIR)/
meta/recipes-extended/bzip2/bzip2_1.0.6.bb +0 -1
index 0512a75..de668d6 100644
@@ -34,7 +34,6 @@ ALTERNATIVE_${PN} = "bunzip2 bzcat"
 EXTRA_OECONF_append_class-native = " --bindir=${STAGING_BINDIR_NATIVE}/${PN}"
 
 do_install_ptest () {
-	cp -f ${B}/Makefile ${D}${PTEST_PATH}/Makefile
 	sed -i -e "s|^Makefile:|_Makefile:|" ${D}${PTEST_PATH}/Makefile
 }
 
Signature · 1 line
2.7.4