quilt.inc: avoid using += with an over-ride (drop unmaintained darwin support)

PATCH New Andre McCurdy 1 participant 2 messages Jul 6, 2018

lore

Share & tools

lore

Andre McCurdy

author

2018-07-06 03:49 UTC #0 lore raw

PATCH 1/2 quilt.inc: avoid using += with an over-ride (drop unmaintained darwin support)

Using += with an over-ride can be a source of confusion so try to avoid the construct in core recipes.

In this case, the _darwin over-ride seems to be unmaintained. It was added in early 2013 but has not been accounted for in subsequent updates to the recipe and (from inspection) now appears to be broken. Remove the _darwin over-ride rather than try to debug or fix it.

Signed-off-by Andre McCurdy <[email protected]>

---
 meta/recipes-devtools/quilt/quilt.inc | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

meta/recipes-devtools/quilt/quilt.inc +1 -8

index c7bb741..ff94cc9 100644
@@ -16,10 +16,6 @@ SRC_URI[sha256sum] = "f6cbc788e5cbbb381a3c6eab5b9efce67c776a8662a7795c7432fd27aa
 
 inherit autotools-brokensep ptest
 
-EXTRA_OECONF_darwin += "--without-date \
-                        --without-getopt \
-                        "
-
 CLEANBROKEN = "1"
 
 PACKAGES += "guards guards-doc"

@@ -31,9 +27,6 @@ FILES_guards-doc = "${mandir}/man1/guards.1"
 
 RDEPENDS_${PN} = "bash"
 
-EXTRA_OE_MAKE_ARGS_darwin ?= ""
-EXTRA_OE_MAKE_ARGS ?= "BUILD_ROOT=${D}"
-
 EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch"
 
 CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash"

@@ -51,7 +44,7 @@ do_configure_append () {
 
 # quilt ignores DESTDIR
 do_install () {
-	oe_runmake ${EXTRA_OE_MAKE_ARGS} install
+	oe_runmake 'BUILD_ROOT=${D}' install
 	# cleanup unpackaged files
 	rm -rf ${D}/${datadir}/emacs
 }

Signature · 1 line

1.9.1

Andre McCurdy

author

2018-07-06 03:49 UTC #1 lore raw

PATCH 2/2 quilt.inc: minor recipe formatting tweaks

Minor comment update and re-order variables to align more closely to the OE style-guide.

Signed-off-by Andre McCurdy <[email protected]>

---
 meta/recipes-devtools/quilt/quilt.inc | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

meta/recipes-devtools/quilt/quilt.inc +10 ~~-10~~

index ff94cc9..48ed9ba 100644
@@ -18,15 +18,6 @@ inherit autotools-brokensep ptest
 
 CLEANBROKEN = "1"
 
-PACKAGES += "guards guards-doc"
-FILES_${PN} = "${sysconfdir} ${datadir}/quilt \
-               ${bindir}/quilt ${libdir}/quilt"
-FILES_guards = "${bindir}/guards"
-FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${BPN}"
-FILES_guards-doc = "${mandir}/man1/guards.1"
-
-RDEPENDS_${PN} = "bash"
-
 EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch"
 
 CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash"

@@ -42,7 +33,7 @@ do_configure_append () {
 	sed -e 's,^COMPAT_SYMLINKS.*:=.*,COMPAT_SYMLINKS	:=,' -i ${S}/Makefile
 }
 
-# quilt ignores DESTDIR
+# quilt Makefiles install to BUILD_ROOT instead of DESTDIR
 do_install () {
 	oe_runmake 'BUILD_ROOT=${D}' install
 	# cleanup unpackaged files

@@ -62,6 +53,15 @@ do_install_ptest() {
 	cp ${WORKDIR}/test.sh ${D}${PTEST_PATH}
 }
 
+PACKAGES += "guards guards-doc"
+
+FILES_${PN} = "${sysconfdir} ${datadir}/quilt \
+               ${bindir}/quilt ${libdir}/quilt"
+FILES_guards = "${bindir}/guards"
+FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${BPN}"
+FILES_guards-doc = "${mandir}/man1/guards.1"
+
+RDEPENDS_${PN} = "bash"
 RDEPENDS_${PN}-ptest = "make file sed gawk diffutils findutils ed perl \
                         perl-module-filehandle perl-module-getopt-std \
                         perl-module-posix perl-module-file-temp \

Signature · 1 line

1.9.1