[meta-oe][PATCH 0/1][v2] toybox-inittab unpack to S

[meta-oe][PATCH 0/1][v2] toybox-inittab unpack to S

[Joe Slater]

Should apply to master or master-next.  Built for both
using poky.

Joe Slater (1):
  toybox-inittab: unpack to S

 .../recipes-core/toybox/toybox-inittab_0.8.2.bb   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

-- 
2.17.1

[meta-oe][PATCH 1/1][v2] toybox-inittab: unpack to S

[Joe Slater]

toybox-inittab does not unpack source files into S, so
the archiver cannot see them.  We copy them to a sub-directory
in order to keep the originals available if running do_configure()
(again) without first running do_unpack().

Signed-off-by: Joe Slater <joe.slater@windriver.com>
---
 .../recipes-core/toybox/toybox-inittab_0.8.2.bb   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/meta-oe/recipes-core/toybox/toybox-inittab_0.8.2.bb b/meta-oe/recipes-core/toybox/toybox-inittab_0.8.2.bb
index 9af1e3f14..f82f8e9ce 100644
--- a/meta-oe/recipes-core/toybox/toybox-inittab_0.8.2.bb
+++ b/meta-oe/recipes-core/toybox/toybox-inittab_0.8.2.bb
@@ -2,10 +2,12 @@ SUMMARY = "Toybox Inittab Configuration"
 LICENSE = "BSD-0-Clause"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-0-Clause;md5=81eeb0083e31f11ab1e33ded846d521c"
 
+# Unpack to ${S}/orig
+#
 SRC_URI = "\
-    file://inittab \
-    file://rcK \
-    file://rcS \
+    file://inittab;subdir=${BP}/orig \
+    file://rcK;subdir=${BP}/orig \
+    file://rcS;subdir=${BP}/orig \
 "
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -15,6 +17,9 @@ RCONFLICTS_${PN} = "\
     sysvinit-inittab \
 "
 
+# Just being sure.
+B = "${S}"
+
 # most users may want to have getty enabled by default
 PACKAGECONFIG ??= "getty"
 
@@ -26,9 +31,7 @@ do_patch[noexec] = "1"
 
 do_configure() {
 	# copy over files now to have a fresh start on each config
-	for f in inittab rcK rcS; do
-		cp ${WORKDIR}/$f ${S}
-	done
+	cp orig/* .
 
 	for config in ${PACKAGECONFIG_CONFARGS}; do
 		if [[ ${config} == "enable_getty" ]]; then
-- 
2.17.1