Prepare for EXTRA_OEMAKE = "" in oe-core bitbake.conf

This series fixes various recipes that rely on the current default value of EXTRA_OEMAKE = "-e MAKEFLAGS=" to explicitly set that value in the hope that bitbake.conf can set EXTRA_OEMAKE = "" in the future.

The affected recipes are:

meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb meta-networking/recipes-connectivity/vlan/vlan_1.9.bb meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb meta-networking/recipes-daemons/squid/squid_3.5.7.bb meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb meta-networking/recipes-support/pimd/pimd_2.1.8.bb meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb meta-oe/recipes-devtools/iptraf/iptraf_3.0.0.bb meta-oe/recipes-devtools/luajit/luajit_2.0.4.bb meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb meta-oe/recipes-extended/efivar/efivar_0.21.bb meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb meta-oe/recipes-extended/sysdig/sysdig_git.bb meta-oe/recipes-graphics/wayland/wayland-fits_git.bb meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb meta-oe/recipes-support/ckermit/ckermit_302.bb meta-oe/recipes-support/libtinyxml2/libtinyxml2_git.bb meta-oe/recipes-support/mg/mg_20110905.bb meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb meta-oe/recipes-support/uim/uim_1.8.6.bb

Mike.

This recipe currently relies on EXTRA_OEMAKE having been to set to "-e MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this explicit so that the default in bitbake.conf can be changed.

---
 meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

index 445e8ad..d523b7a 100644
@@ -9,6 +9,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/png-mng/${BPN}/${PV}/${BPN}-${PV}.tar.g
 SRC_URI[md5sum] = "980bd6d9a3830fdce746d7fe3c9166ee"
 SRC_URI[sha256sum] = "77f0a039ac64df55fbd06af6f872fdbad4f639d009bbb5cd5cbe4db25690f35f"
 
+EXTRA_OEMAKE = "-e MAKEFLAGS="
+
 do_compile() {
     oe_runmake -f Makefile.unx INCS=-I${STAGING_DIR_HOST}${incdir} LIBS=${STAGING_DIR_HOST}${libdir}/libz.a
 }

@@ -19,4 +21,3 @@ do_install() {
     install png-fix-IDAT-windowsize ${D}${bindir}
     install pngsplit ${D}${bindir}
 }
-

2.1.4

This recipe currently relies on EXTRA_OEMAKE having been to set to "-e MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this explicit so that the default in bitbake.conf can be changed.

---
 meta-oe/recipes-support/mg/mg_20110905.bb | 2 ++
 1 file changed, 2 insertions(+)

index b9a4d33..e924bbd 100644
@@ -11,6 +11,8 @@ SRC_URI = "http://homepage.boetes.org/software/mg/mg-${PV}.tar.gz \
 SRC_URI[md5sum] = "2de35316fa8ebafe6003efaae70b723e"
 SRC_URI[sha256sum] = "1cd37d7e6a3eecc890a5718c38b8f38495057ba93856762a756ccee2f9618229"
 
+EXTRA_OEMAKE = "-e MAKEFLAGS="
+
 do_configure () {
     sed -i Makefile.in -e 's,^prefix=.*,prefix=${prefix},'
     ./configure

2.1.4

This recipe currently relies on EXTRA_OEMAKE having been to set to "-e MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this explicit so that the default in bitbake.conf can be changed.

---
 meta-oe/recipes-devtools/iptraf/iptraf_3.0.0.bb | 2 ++
 1 file changed, 2 insertions(+)

index 7b8f0db..25e6001 100644
@@ -17,6 +17,8 @@ SRC_URI[md5sum] = "377371c28ee3c21a76f7024920649ea8"
 SRC_URI[sha256sum] = "9ee433d95573d612539da4b452e6cdcbca6ab6674a88bfbf6eaf12d4902b5163"
 RDEPENDS_${PN} = "ncurses"
 
+EXTRA_OEMAKE = "-e MAKEFLAGS="
+
 do_compile() {
     oe_runmake -C src all  
 }

2.1.4

This recipe currently relies on EXTRA_OEMAKE having been to set to "-e MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this explicit so that the default in bitbake.conf can be changed.

---
 meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb | 2 ++
 1 file changed, 2 insertions(+)

index 98324e8..d2de523 100644
@@ -11,6 +11,8 @@ SRCREV = "63854a2d0c0129efab132ec328a75279e013fb84"
 
 S = "${WORKDIR}/git"
 
+EXTRA_OEMAKE = "-e MAKEFLAGS="
+
 CFLAGS_prepend = "-Wall -Wextra -Wno-sign-compare -Wno-pointer-sign "
 
 do_install() {

2.1.4

This recipe currently relies on EXTRA_OEMAKE having been to set to "-e MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this explicit so that the default in bitbake.conf can be changed.

---
 meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb | 2 ++
 1 file changed, 2 insertions(+)

index d4e32de..a192d1a 100644
@@ -10,6 +10,8 @@ PV = "0.0"
 PR = "r2"
 S = "${WORKDIR}/git"
 
+EXTRA_OEMAKE = "-e MAKEFLAGS="
+
 # The yavta sources include copies of the headers required to build in the
 # include directory.  The Makefile uses CFLAGS to include these, but since
 # we override the CFLAGS then we need to add this include path back in.

2.1.4

This recipe currently relies on EXTRA_OEMAKE having been to set to "-e MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this explicit so that the default in bitbake.conf can be changed.

---
 meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb | 2 ++
 1 file changed, 2 insertions(+)

index d5ea546..8cc4aaa 100644
@@ -27,6 +27,8 @@ LIC_FILES_CHKSUM = "file://rarpd.c;md5=199b20b172ea93121bc613a9c77b6931"
 
 S = "${WORKDIR}/${BPN}"
 
+EXTRA_OEMAKE = "-e MAKEFLAGS="
+
 do_install() {
     install -d ${D}${sysconfdir}/init.d
     install -d ${D}${sbindir}

2.1.4

This recipe currently relies on EXTRA_OEMAKE having been to set to "-e MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this explicit so that the default in bitbake.conf can be changed.

---
 meta-oe/recipes-support/ckermit/ckermit_302.bb | 2 ++
 1 file changed, 2 insertions(+)

index 9c561a2..187a57e 100644
@@ -18,6 +18,8 @@ export BINDIR = "${bindir}"
 export MANDIR = "${mandir}/man1"
 export INFODIR = "${infodir}"
 
+EXTRA_OEMAKE = "-e MAKEFLAGS="
+
 # Additional flags. For uclibc we add -DNOARROWKEYS which stops ckermit
 # trying to look inside the stdio headers.
 CKERMIT_ADDITIONAL = ""

2.1.4

This recipe currently relies on EXTRA_OEMAKE having been to set to "-e MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this explicit so that the default in bitbake.conf can be changed.

---
 meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb | 2 ++
 1 file changed, 2 insertions(+)

index 2eedd7e..56272d9 100644
@@ -13,6 +13,8 @@ SRC_URI = "http://www.tux.org/~mayer/linux/${BP}.tar.gz \
 SRC_URI[md5sum] = "285dfab361080759d477ea1fe7d3093a"
 SRC_URI[sha256sum] = "723dd073f80e9969639eb577d2af4b540fc29716b6eafdac488d8f5aed9101ac"
 
+EXTRA_OEMAKE = "-e MAKEFLAGS="
+
 TARGET_CC_ARCH += "${CFLAGS} ${LDFLAGS}"
 do_compile() {
     oe_runmake

2.1.4

This recipe currently relies on EXTRA_OEMAKE having been to set to "-e MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this explicit so that the default in bitbake.conf can be changed.

---
 meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb | 2 ++
 1 file changed, 2 insertions(+)

index 877e176..7cc0ec7 100644
@@ -6,6 +6,8 @@ SRC_URI = "http://dl.matroska.org/downloads/libebml/libebml-${PV}.tar.bz2"
 SRC_URI[md5sum] = "efec729bf5a51e649e1d9d1f61c0ae7a"
 SRC_URI[sha256sum] = "83b074d6b62715aa0080406ea84d33df2e44b5d874096640233a4db49b8096de"
 
+EXTRA_OEMAKE = "-e MAKEFLAGS="
+
 do_compile() {
     cd ${S}/make/linux
     oe_runmake CROSS="${TARGET_PREFIX}"

2.1.4

This recipe currently relies on EXTRA_OEMAKE having been to set to "-e MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this explicit so that the default in bitbake.conf can be changed.

---
 meta-networking/recipes-connectivity/vlan/vlan_1.9.bb | 2 ++
 1 file changed, 2 insertions(+)

index 8df93e4..09c4007 100644
@@ -11,6 +11,8 @@ SRC_URI[sha256sum] = "3b8f0a1bf0d3642764e5f646e1f3bbc8b1eeec474a77392d9aeb486884
 
 S = "${WORKDIR}/${BPN}"
 
+EXTRA_OEMAKE = "-e MAKEFLAGS="
+
 # comment out MakeInclude in Makefile which sets build environment
 do_configure_append () {
     sed -i 's/^ include/#^include/' ${S}/Makefile

2.1.4

This recipe currently relies on EXTRA_OEMAKE having been to set to "-e MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this explicit so that the default in bitbake.conf can be changed.

---
 meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb | 2 ++
 1 file changed, 2 insertions(+)

index 580dabe..4ee881d 100644
@@ -42,6 +42,8 @@ inherit update-rc.d useradd systemd
 CONFFILES_${PN} = "${sysconfdir}/vsftpd.conf"
 LDFLAGS_append =" -lcrypt -lcap"
 
+EXTRA_OEMAKE = "-e MAKEFLAGS="
+
 do_configure() {
     # Fix hardcoded /usr, /etc, /var mess.
     cat tunables.c|sed s:\"/usr:\"${prefix}:g|sed s:\"/var:\"${localstatedir}:g \

2.1.4

This recipe currently relies on EXTRA_OEMAKE having been to set to "-e MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this explicit so that the default in bitbake.conf can be changed.

---
 meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb | 2 ++
 1 file changed, 2 insertions(+)

index f14d8a5..003361c 100644
@@ -21,6 +21,8 @@ SRC_URI[sha256sum] = "e98ae0065d2a39fa3131654ff28cb7070e996f668ed6d0e7d9a445b8d3
 
 S = "${WORKDIR}/pptp-${PV}"
 
+EXTRA_OEMAKE = "-e MAKEFLAGS="
+
 do_install() {
     install -d ${D}${sbindir} ${D}${sysconfdir}/ppp ${D}${mandir}/man8
     install -m 555 pptp ${D}${sbindir}

2.1.4

This recipe currently relies on EXTRA_OEMAKE having been to set to "-e MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this explicit so that the default in bitbake.conf can be changed.

---
 meta-networking/recipes-support/pimd/pimd_2.1.8.bb | 1 +
 1 file changed, 1 insertion(+)

index ba63be5..3469043 100644
@@ -8,6 +8,7 @@ SRC_URI = "ftp://troglobit.com/pimd/${BP}.tar.bz2"
 SRC_URI[md5sum] = "a12448bc7c9bfcebf51a13ebf1ffa962"
 SRC_URI[sha256sum] = "01016940543a0a6131d4e6c91b595d47e187012c59a298eec14c3dbc38564b3a"
 
+EXTRA_OEMAKE = "-e MAKEFLAGS="
 CFLAGS += "-I ${S}/include "
 
 do_install() {

2.1.4

This recipe currently relies on EXTRA_OEMAKE having been to set to "-e MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this explicit so that the default in bitbake.conf can be changed.

---
 meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb | 1 +
 1 file changed, 1 insertion(+)

index b2412ff..0670c5e 100644
@@ -8,6 +8,7 @@ DEPENDS = "libgcrypt"
 
 inherit perlnative
 
+EXTRA_OEMAKE = "-e MAKEFLAGS="
 CFLAGS_append = ' -DVERSION=\\"${PV}\\"'
 LDFLAGS_append = " -lgcrypt -lgpg-error"
 

2.1.4

thanks for doing it Mike.