[oe] [meta-networking][PATCH 2/2] dhcpcd: upgrade to dhcpcd 7.0.8
From: Stefano Cappa
Signed-off-by: Stefano Cappa
Signed-off-by: Khem Raj
---
.../{dhcpcd_6.11.5.bb => dhcpcd_7.0.8.bb} | 8 ++--
...e-INCLUDEDIR-to-prevent-build-issues.patch | 45 +++
2 files changed, 50 insertions(+), 3 deletions(-)
rename meta-networking/recipes-connectivity/dhcpcd/{dhcpcd_6.11.5.bb =>
dhcpcd_7.0.8.bb} (70%)
create mode 100644
meta-networking/recipes-connectivity/dhcpcd/files/0001-remove-INCLUDEDIR-to-prevent-build-issues.patch
diff --git a/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.5.bb
b/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_7.0.8.bb
similarity index 70%
rename from meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.5.bb
rename to meta-networking/recipes-connectivity/dhcpcd/dhcpcd_7.0.8.bb
index 885c6c0e2b..84c3db7a5c 100644
--- a/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.5.bb
+++ b/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_7.0.8.bb
@@ -5,12 +5,14 @@ DESCRIPTION = "dhcpcd runs on your machine and silently
configures your computer
HOMEPAGE = "http://roy.marples.name/projects/dhcpcd/;
LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM =
"file://dhcpcd.c;endline=26;md5=77c40d671aff804ca91ea99556da8e9b"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1e8f17e4ed38152ccf60374e0f89"
SRC_URI = "http://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz;
-SRC_URI[md5sum] = "2465624b62c1154f0e89dc69c42c849b"
-SRC_URI[sha256sum] =
"6f9674dc7e27e936cc787175404a6171618675ecfb6903ab9887b1b66a87d69e"
+SRC_URI[md5sum] = "77bbb1d73b6f30d6ddcc8b0fd3eae266"
+SRC_URI[sha256sum] =
"96968e883369ab4afd11eba9dfd9bb109f5dfff65b2814ce6c432f36362dc9b5"
+
+SRC_URI += "file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch"
inherit autotools-brokensep
diff --git
a/meta-networking/recipes-connectivity/dhcpcd/files/0001-remove-INCLUDEDIR-to-prevent-build-issues.patch
b/meta-networking/recipes-connectivity/dhcpcd/files/0001-remove-INCLUDEDIR-to-prevent-build-issues.patch
new file mode 100644
index 00..37d2344438
--- /dev/null
+++
b/meta-networking/recipes-connectivity/dhcpcd/files/0001-remove-INCLUDEDIR-to-prevent-build-issues.patch
@@ -0,0 +1,45 @@
+From aa9e3982c1e75ad49945a62f5e262279c7a905a4 Mon Sep 17 00:00:00 2001
+From: Stefano Cappa
+Date: Sun, 13 Jan 2019 01:50:52 +0100
+Subject: [PATCH] remove INCLUDEDIR to prevent build issues
+
+Upstream-Status: Pending
+
+Signed-off-by: Stefano Cappa
+---
+ configure | 5 -
+ 1 file changed, 5 deletions(-)
+
+diff --git a/configure b/configure
+index 6c81e0db..32dea2b4 100755
+--- a/configure
b/configure
+@@ -20,7 +20,6 @@ BUILD=
+ HOST=
+ HOSTCC=
+ TARGET=
+-INCLUDEDIR=
+ DEBUG=
+ FORK=
+ STATIC=
+@@ -72,7 +71,6 @@ for x do
+ --mandir) MANDIR=$var;;
+ --datadir) DATADIR=$var;;
+ --with-ccopts|CFLAGS) CFLAGS=$var;;
+- -I|--includedir) INCLUDEDIR="$INCLUDEDIR${INCLUDEDIR:+ }-I$var";;
+ CC) CC=$var;;
+ CPPFLAGS) CPPFLAGS=$var;;
+ PKG_CONFIG) PKG_CONFIG=$var;;
+@@ -309,9 +307,6 @@ if [ -n "$CPPFLAGS" ]; then
+ echo "CPPFLAGS=" >>$CONFIG_MK
+ echo "CPPFLAGS+=$CPPFLAGS" >>$CONFIG_MK
+ fi
+-if [ -n "$INCLUDEDIR" ]; then
+- echo "CPPFLAGS+=$INCLUDEDIR" >>$CONFIG_MK
+-fi
+ if [ -n "$LDFLAGS" ]; then
+ echo "LDFLAGS=" >>$CONFIG_MK
+ echo "LDFLAGS+= $LDFLAGS" >>$CONFIG_MK
+--
+2.17.2 (Apple Git-113)
+
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH V2 1/2] python-pbr_4.2.0.bb: Define src uri checksums in recipe
There moved out from inc file in oe-core Signed-off-by: Khem Raj --- v2: Correct the checksums for real meta-python/recipes-devtools/python/python-pbr_4.2.0.bb | 4 1 file changed, 4 insertions(+) diff --git a/meta-python/recipes-devtools/python/python-pbr_4.2.0.bb b/meta-python/recipes-devtools/python/python-pbr_4.2.0.bb index a4b56cdbdf..32487723b1 100644 --- a/meta-python/recipes-devtools/python/python-pbr_4.2.0.bb +++ b/meta-python/recipes-devtools/python/python-pbr_4.2.0.bb @@ -1,3 +1,7 @@ inherit setuptools # The inc file is in oe-core require recipes-devtools/python/python-pbr.inc + +SRC_URI[md5sum] = "6619780896ca81c7cd19c6e2f439b6c9" +SRC_URI[sha256sum] = "1b8be50d938c9bb75d0eaf7eda111eec1bf6dc88a62a6412e33bf077457e0f45" + -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 8/9] meta-initramfs: add pkg group and image
On Sun, Jan 13, 2019 at 6:53 PM Andrea Adami wrote:
>
> On Sat, Jan 12, 2019 at 10:33 PM Armin Kuster wrote:
> >
> > Signed-off-by: Armin Kuster
> > ---
> > .../images/meta-initramfs-image.bb| 8 +
> > .../packagegroup-meta-initramfs.bb| 36 +++
> > 2 files changed, 44 insertions(+)
> > create mode 100644
> > meta-initramfs/recipes-core/images/meta-initramfs-image.bb
> > create mode 100644
> > meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb
> >
> > diff --git a/meta-initramfs/recipes-core/images/meta-initramfs-image.bb
> > b/meta-initramfs/recipes-core/images/meta-initramfs-image.bb
> > new file mode 100644
> > index 00..9d70d6d02d
> > --- /dev/null
> > +++ b/meta-initramfs/recipes-core/images/meta-initramfs-image.bb
> > @@ -0,0 +1,8 @@
> > +SUMMARY = "meta-initramfs build test image"
> > +
> > +IMAGE_INSTALL = "packagegroup-core-boot \
> > + packagegroup-meta-initramfs"
> > +
> > +LICENSE = "MIT"
> > +
> > +inherit core-image
> > diff --git
> > a/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb
> > b/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb
> > new file mode 100644
> > index 00..bfede5a749
> > --- /dev/null
> > +++
> > b/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb
> > @@ -0,0 +1,36 @@
> > +SUMMARY = "Meta-initramfs packagegroups"
> > +
> > +inherit packagegroup
> > +
> > +PROVIDES = "${PACKAGES}"
> > +PACKAGES = ' \
> > +packagegroup-meta-initramfs \
> > +packagegroup-meta-initramfs-devtools \
> > +packagegroup-meta-initramfs-kernel \
> > +'
> > +
> > +RDEPENDS_packagegroup-meta-initramfs = "\
> > +packagegroup-meta-initramfs-devtools \
> > +packagegroup-meta-initramfs-kernel \
> > +"
> > +
> > +RDEPENDS_packagegroup-meta-initramfs-devtools = "\
> > +libklibc dracut \
> > +klibc-utils-cat klibc-utils-losetup klibc-utils-readlink
> > klibc-utils-chroot \
> > +klibc-utils-ls klibc-utils-reboot klibc-utils-cpio klibc-utils-minips \
> > +klibc-utils-resume klibc-utils-dd klibc-utils-mkdir
> > klibc-utils-run-init \
> > +klibc-utils-dmesg klibc-utils-mkfifo klibc-utils-sh.shared
> > klibc-utils-false \
> > +klibc-utils-mknod klibc-utils-sleep klibc-utils-fstype
> > klibc-utils-mount \
> > +klibc-utils-sync klibc-utils-halt klibc-utils-mv klibc-utils-true
> > klibc-utils-ipconfig \
> > +klibc-utils-nfsmount klibc-utils-umount klibc-utils-kill
> > klibc-utils-nuke klibc-utils-uname \
> > +mtdinfo-klibc ubiattach-klibc ubiblock-klibc ubicrc32-klibc
> > ubidetach-klibc \
> > +ubiformat-klibc ubimkvol-klibc ubinfo-klibc ubinize-klibc
> > ubirename-klibc \
> > +ubirmvol-klibc ubirsvol-klibc ubiupdatevol-klibc \
> > +${@bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 x86-64",
> > "grubby", "", d)} \
> > +"
> > +
> > +RDEPENDS_packagegroup-meta-initramfs-kernel = "\
> > +kexec-klibc vmcore-dmesg-klibc \
> > +"
> > +
> > +EXCLUDE_FROM_WORLD = "1"
> > --
> > 2.17.1
> >
> > --
> > ___
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
>
> Armin,
>
> nice work, we had something similar once in oe-classic.
>
> About the klibc utilities, I fear there might be some runtime bugs
> because there are many uncommitted patches around.
> See i.e. the last one of Ben https://salsa.debian.org/kernel-team/klibc
> Let's hope for a new release.
>
> Cheers
> Andrea
Armin,
just a small note: the other images reside in /meta-initramfs/recipes-bsp/images
Can we keep the images unified?
Cheers
Andrea
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 8/9] meta-initramfs: add pkg group and image
On Sat, Jan 12, 2019 at 10:33 PM Armin Kuster wrote:
>
> Signed-off-by: Armin Kuster
> ---
> .../images/meta-initramfs-image.bb| 8 +
> .../packagegroup-meta-initramfs.bb| 36 +++
> 2 files changed, 44 insertions(+)
> create mode 100644 meta-initramfs/recipes-core/images/meta-initramfs-image.bb
> create mode 100644
> meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb
>
> diff --git a/meta-initramfs/recipes-core/images/meta-initramfs-image.bb
> b/meta-initramfs/recipes-core/images/meta-initramfs-image.bb
> new file mode 100644
> index 00..9d70d6d02d
> --- /dev/null
> +++ b/meta-initramfs/recipes-core/images/meta-initramfs-image.bb
> @@ -0,0 +1,8 @@
> +SUMMARY = "meta-initramfs build test image"
> +
> +IMAGE_INSTALL = "packagegroup-core-boot \
> + packagegroup-meta-initramfs"
> +
> +LICENSE = "MIT"
> +
> +inherit core-image
> diff --git
> a/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb
> b/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb
> new file mode 100644
> index 00..bfede5a749
> --- /dev/null
> +++ b/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb
> @@ -0,0 +1,36 @@
> +SUMMARY = "Meta-initramfs packagegroups"
> +
> +inherit packagegroup
> +
> +PROVIDES = "${PACKAGES}"
> +PACKAGES = ' \
> +packagegroup-meta-initramfs \
> +packagegroup-meta-initramfs-devtools \
> +packagegroup-meta-initramfs-kernel \
> +'
> +
> +RDEPENDS_packagegroup-meta-initramfs = "\
> +packagegroup-meta-initramfs-devtools \
> +packagegroup-meta-initramfs-kernel \
> +"
> +
> +RDEPENDS_packagegroup-meta-initramfs-devtools = "\
> +libklibc dracut \
> +klibc-utils-cat klibc-utils-losetup klibc-utils-readlink
> klibc-utils-chroot \
> +klibc-utils-ls klibc-utils-reboot klibc-utils-cpio klibc-utils-minips \
> +klibc-utils-resume klibc-utils-dd klibc-utils-mkdir klibc-utils-run-init
> \
> +klibc-utils-dmesg klibc-utils-mkfifo klibc-utils-sh.shared
> klibc-utils-false \
> +klibc-utils-mknod klibc-utils-sleep klibc-utils-fstype klibc-utils-mount
> \
> +klibc-utils-sync klibc-utils-halt klibc-utils-mv klibc-utils-true
> klibc-utils-ipconfig \
> +klibc-utils-nfsmount klibc-utils-umount klibc-utils-kill
> klibc-utils-nuke klibc-utils-uname \
> +mtdinfo-klibc ubiattach-klibc ubiblock-klibc ubicrc32-klibc
> ubidetach-klibc \
> +ubiformat-klibc ubimkvol-klibc ubinfo-klibc ubinize-klibc
> ubirename-klibc \
> +ubirmvol-klibc ubirsvol-klibc ubiupdatevol-klibc \
> +${@bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 x86-64",
> "grubby", "", d)} \
> +"
> +
> +RDEPENDS_packagegroup-meta-initramfs-kernel = "\
> +kexec-klibc vmcore-dmesg-klibc \
> +"
> +
> +EXCLUDE_FROM_WORLD = "1"
> --
> 2.17.1
>
> --
> ___
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Armin,
nice work, we had something similar once in oe-classic.
About the klibc utilities, I fear there might be some runtime bugs
because there are many uncommitted patches around.
See i.e. the last one of Ben https://salsa.debian.org/kernel-team/klibc
Let's hope for a new release.
Cheers
Andrea
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH] python-pbr_4.2.0.bb: Define src uri checksums in recipe
There moved out from inc file in oe-core Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-pbr_4.2.0.bb | 4 1 file changed, 4 insertions(+) diff --git a/meta-python/recipes-devtools/python/python-pbr_4.2.0.bb b/meta-python/recipes-devtools/python/python-pbr_4.2.0.bb index a4b56cdbdf..3a12204224 100644 --- a/meta-python/recipes-devtools/python/python-pbr_4.2.0.bb +++ b/meta-python/recipes-devtools/python/python-pbr_4.2.0.bb @@ -1,3 +1,7 @@ inherit setuptools # The inc file is in oe-core require recipes-devtools/python/python-pbr.inc + +SRC_URI[md5sum] = "dbc94417a8ff0432d6244501a7f1bd49" +SRC_URI[sha256sum] = "f59d71442f9ece3dffc17bc36575768e1ee9967756e6b6535f0ee1f0054c3d68" + -- 2.20.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH] remove True option to getVar calls
From: André Draszik
getVar() has been defaulting to expanding by default for
a long time (2016), thus remove the True option from
getVar() calls with a regex search and replace.
Search & replace made using the following command:
sed -e 's|\(d\.getVar \?\)( \?\([^,()]*\), \?True)|\1(\2)|g' \
-i $(git grep -E 'getVar ?\( ?([^,()]*), ?True\)' \
| cut -d':' -f1 \
| sort -u)
Signed-off-by: André Draszik
---
classes/java-library.bbclass | 4 ++--
classes/openjdk-build-helper.bbclass | 10 +-
recipes-core/openjdk/openjdk-7-common.inc | 2 +-
recipes-core/openjdk/openjdk-8-common.inc | 4 ++--
recipes-core/openjdk/openjdk-8-cross.inc | 10 +-
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass
index e0159ba..d801930 100644
--- a/classes/java-library.bbclass
+++ b/classes/java-library.bbclass
@@ -27,8 +27,8 @@ def java_package_name(d):
pre=""
post=""
- bpn = d.getVar('BPN', True)
- ml = d.getVar('MLPREFIX', True)
+ bpn = d.getVar('BPN')
+ ml = d.getVar('MLPREFIX')
if not bpn.startswith("lib"):
pre='lib'
diff --git a/classes/openjdk-build-helper.bbclass
b/classes/openjdk-build-helper.bbclass
index 01ed591..8d83e02 100644
--- a/classes/openjdk-build-helper.bbclass
+++ b/classes/openjdk-build-helper.bbclass
@@ -9,7 +9,7 @@ EXTRA_OEMAKE_remove_task-install = "${PARALLEL_MAKEINST}"
# In OE we have PARALLEL_MAKE which is the actual option passed to make,
# e.g. "-j 4".
def openjdk_build_helper_get_parallel_make(d):
-pm = d.getVar('PARALLEL_MAKE', True);
+pm = d.getVar('PARALLEL_MAKE');
if not pm or '-j' not in pm:
return 1
@@ -55,7 +55,7 @@ def openjdk_build_helper_get_target_cflags(d):
def openjdk_build_helper_get_jdk_arch(d):
import bb
-jdk_arch = d.getVar('TRANSLATED_TARGET_ARCH', True)
+jdk_arch = d.getVar('TRANSLATED_TARGET_ARCH')
if jdk_arch == "x86-64":
jdk_arch = "amd64"
elif jdk_arch == "powerpc":
@@ -73,7 +73,7 @@ def openjdk_build_helper_get_jdk_arch(d):
def openjdk_build_helper_get_llvm_configure_arch(d):
import bb;
-arch = d.getVar('TRANSLATED_TARGET_ARCH', True)
+arch = d.getVar('TRANSLATED_TARGET_ARCH')
if arch in ['i386', 'i486', 'i586', 'i686', 'x86-64']:
arch = "x86"
elif arch in ['mipsel', 'mips']:
@@ -84,7 +84,7 @@ def openjdk_build_helper_get_llvm_configure_arch(d):
arch = "arm"
else:
if 'shark' in d.getVar('PACKAGECONFIG').split():
-bb.warn("%s does not support %s in Shark builds yet" %
(d.getVar('PN', True), arch) );
+bb.warn("%s does not support %s in Shark builds yet" %
(d.getVar('PN'), arch) );
return arch
@@ -93,7 +93,7 @@ def openjdk_build_helper_get_llvm_configure_arch(d):
def openjdk_build_helper_get_icedtea_arch(d):
import bb;
-arch = d.getVar('TRANSLATED_TARGET_ARCH', True)
+arch = d.getVar('TRANSLATED_TARGET_ARCH')
if arch == "x86-64":
arch = "amd64"
elif arch in ['i386', 'i486', 'i586', 'i686']:
diff --git a/recipes-core/openjdk/openjdk-7-common.inc
b/recipes-core/openjdk/openjdk-7-common.inc
index 794bf58..d59a57a 100644
--- a/recipes-core/openjdk/openjdk-7-common.inc
+++ b/recipes-core/openjdk/openjdk-7-common.inc
@@ -93,7 +93,7 @@ export ALT_CUPS_HEADERS_PATH = "${STAGING_INCDIR}"
export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2"
export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}"
export CACAO_CONFIGURE_ARGS = " \
-${@['','--enable-softfloat'][d.getVar('TARGET_FPU', True) == 'soft']}"
+${@['','--enable-softfloat'][d.getVar('TARGET_FPU') == 'soft']}"
JAVA_HOME[unexport] = "1"
diff --git a/recipes-core/openjdk/openjdk-8-common.inc
b/recipes-core/openjdk/openjdk-8-common.inc
index 4d8f935..1fbe7fe 100644
--- a/recipes-core/openjdk/openjdk-8-common.inc
+++ b/recipes-core/openjdk/openjdk-8-common.inc
@@ -163,8 +163,8 @@ export DEBUG_BINARIES = "true"
ALTERNATIVE_PRIORITY = "50"
-OPENJDK_UPDATE_VERSION = "${@d.getVar('PV', True).split('b')[0]}"
-OPENJDK_BUILD_NUMBER = "b${@d.getVar('PV', True).split('b')[1]}"
+OPENJDK_UPDATE_VERSION = "${@d.getVar('PV').split('b')[0]}"
+OPENJDK_BUILD_NUMBER = "b${@d.getVar('PV').split('b')[1]}"
EXTRA_OECONF_append = "\
--with-build-number=${OPENJDK_BUILD_NUMBER} \
--with-update-version=${OPENJDK_UPDATE_VERSION} \
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc
b/recipes-core/openjdk/openjdk-8-cross.inc
index d04b0d3..7d6c1a5 100644
--- a/recipes-core/openjdk/openjdk-8-cross.inc
+++ b/recipes-core/openjdk/openjdk-8-cross.inc
@@ -108,14 +108,14 @@ EXTRA_OEMAKE_append = '\
'
python remove_debuglink() {
-dvar = d.getVar('PKGD', True)
-objcopy = d.getVar("OBJCOPY", True)
+dvar = d.getVar('PKGD')
+objcopy = d.getVar("OBJCOPY")
# Remove the previous debuglink if it has existed, because it has a
different file
[oe] [meta-oe][PATCH] meta-oe: remove True option to getVar calls (again)
From: André Draszik
A couple have still been missed in the past despite multiple
attempts at doing so (or simply have re-appeared?).
Search & replace made using the following command:
sed -e 's|\(d\.getVar \?\)( \?\([^,()]*\), \?True)|\1(\2)|g' \
-i $(git grep -E 'getVar ?\( ?([^,()]*), ?True\)' \
| cut -d':' -f1 \
| sort -u)
Signed-off-by: André Draszik
---
meta-oe/classes/scancode.bbclass | 10 +-
meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb | 2 +-
meta-oe/recipes-devtools/php/php.inc | 2 +-
meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb | 2 +-
meta-oe/recipes-kernel/bpftool/bpftool.bb | 2 +-
meta-oe/recipes-kernel/cpupower/cpupower.bb | 2 +-
meta-oe/recipes-support/opencv/opencv_3.4.3.bb| 4 ++--
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/meta-oe/classes/scancode.bbclass b/meta-oe/classes/scancode.bbclass
index 701660f57..e0f0dbca4 100644
--- a/meta-oe/classes/scancode.bbclass
+++ b/meta-oe/classes/scancode.bbclass
@@ -3,18 +3,18 @@
# For more informaiton https://github.com/nexB/scancode-toolkit
SCANCODE_FORMAT ?= "html-app"
-EXT = "${@'html' if d.getVar('SCANCODE_FORMAT', True) == 'html-app' else
'json'}"
+EXT = "${@'html' if d.getVar('SCANCODE_FORMAT') == 'html-app' else 'json'}"
SCANCODE_TOOLKIT = "${@get_scancode_toolkit(d)}"
SCANCODE_TAG = "v2.2.1"
SCANCODE_GIT_LOCATION ?= "https://github.com/nexB/scancode-toolkit.git;
SCANCODE_SRC_LOCATION ?= "${DL_DIR}/scancode"
def get_scancode_toolkit(d):
-lf = bb.utils.lockfile(d.getVar('SCANCODE_SRC_LOCATION', True) + ".lock")
-if (not os.path.exists(d.getVar('SCANCODE_SRC_LOCATION', True))):
-os.system("git clone %s %s -b %s" % (d.getVar('SCANCODE_GIT_LOCATION',
True), d.getVar('SCANCODE_SRC_LOCATION', True), d.getVar('SCANCODE_TAG', True)))
+lf = bb.utils.lockfile(d.getVar('SCANCODE_SRC_LOCATION') + ".lock")
+if (not os.path.exists(d.getVar('SCANCODE_SRC_LOCATION'))):
+os.system("git clone %s %s -b %s" %
(d.getVar('SCANCODE_GIT_LOCATION'), d.getVar('SCANCODE_SRC_LOCATION'),
d.getVar('SCANCODE_TAG')))
bb.utils.unlockfile(lf)
-return (d.getVar('SCANCODE_SRC_LOCATION', True))
+return (d.getVar('SCANCODE_SRC_LOCATION'))
do_scancode() {
mkdir -p ${DEPLOY_DIR_IMAGE}/scancode
diff --git a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
b/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
index f3a0f70ee..c2d2180ba 100644
--- a/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
+++ b/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
@@ -22,7 +22,7 @@ BBCLASSEXTEND = "native"
# you need to install the multilib development package (e.g.
# libc6-dev-i386 on Debian/Ubuntu) and build a 32 bit host part
# (HOST_CC="gcc -m32").
-BUILD_CC_ARCH_append = " ${@['-m32',''][d.getVar('SITEINFO_BITS', True) !=
'32']}"
+BUILD_CC_ARCH_append = " ${@['-m32',''][d.getVar('SITEINFO_BITS') != '32']}"
# The lua makefiles expect the TARGET_SYS to be from uname -s
# Values: Windows, Linux, Darwin, iOS, SunOS, PS3, GNU/kFreeBSD
diff --git a/meta-oe/recipes-devtools/php/php.inc
b/meta-oe/recipes-devtools/php/php.inc
index bfd0ddfb8..ca7bd91b2 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -8,7 +8,7 @@ BBCLASSEXTEND = "native"
DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native"
DEPENDS_class-native = "zlib-native libxml2-native"
-PHP_MAJOR_VERSION = "${@d.getVar('PV', True).split('.')[0]}"
+PHP_MAJOR_VERSION = "${@d.getVar('PV').split('.')[0]}"
SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \
file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \
diff --git a/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb
b/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb
index ca38e6aa2..30c850365 100644
--- a/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb
+++ b/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb
@@ -21,7 +21,7 @@ LDFLAGS_append_libc-musl = " -largp"
def set_target_arch(d):
import re
-arch = d.getVar('TARGET_ARCH', True)
+arch = d.getVar('TARGET_ARCH')
if re.match(r'i.86', arch, re.I):
return 'i386'
else:
diff --git a/meta-oe/recipes-kernel/bpftool/bpftool.bb
b/meta-oe/recipes-kernel/bpftool/bpftool.bb
index dd7eaa2aa..f75ac6f81 100644
--- a/meta-oe/recipes-kernel/bpftool/bpftool.bb
+++ b/meta-oe/recipes-kernel/bpftool/bpftool.bb
@@ -27,7 +27,7 @@ do_install() {
PACKAGE_ARCH = "${MACHINE_ARCH}"
python do_package_prepend() {
-d.setVar('PKGV', d.getVar("KERNEL_VERSION", True).split("-")[0])
+d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0])
}
B = "${WORKDIR}/${BPN}-${PV}"
diff --git a/meta-oe/recipes-kernel/cpupower/cpupower.bb
b/meta-oe/recipes-kernel/cpupower/cpupower.bb
index 4544f5b2e..928973871 100644
--- a/meta-oe/recipes-kernel/cpupower/cpupower.bb
+++ b/meta-oe/recipes-kernel/cpupower/cpupower.bb
@@ -30,7
[oe] [meta-networking][PATCH] meta-networking: remove True option to getVar calls (again)
From: André Draszik
A couple have still been missed in the past despite multiple
attempts at doing so (or simply have re-appeared?).
Search & replace made using the following command:
sed -e 's|\(d\.getVar \?\)( \?\([^,()]*\), \?True)|\1(\2)|g' \
-i $(git grep -E 'getVar ?\( ?([^,()]*), ?True\)' \
| cut -d':' -f1 \
| sort -u)
Signed-off-by: André Draszik
---
.../recipes-connectivity/mosquitto/mosquitto_1.5.4.bb | 2 +-
meta-networking/recipes-connectivity/samba/samba_4.8.4.bb | 6 +++---
meta-networking/recipes-support/nis/nis.inc | 2 +-
.../recipes-support/strongswan/strongswan_5.7.1.bb | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.4.bb
b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.4.bb
index 01562aad1..8f406ff9c 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.4.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.4.bb
@@ -39,7 +39,7 @@ EXTRA_OEMAKE = " \
WITH_BUNDLED_DEPS=no \
"
-export LIB_SUFFIX = "${@d.getVar('baselib', True).replace('lib', '')}"
+export LIB_SUFFIX = "${@d.getVar('baselib').replace('lib', '')}"
do_install() {
oe_runmake 'DESTDIR=${D}' install
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.8.4.bb
b/meta-networking/recipes-connectivity/samba/samba_4.8.4.bb
index f1aaeb83d..e86ed96a5 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.8.4.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.8.4.bb
@@ -193,15 +193,15 @@ PACKAGES =+ "${PN}-python ${PN}-pidl \
python samba_populate_packages() {
def module_hook(file, pkg, pattern, format, basename):
-pn = d.getVar('PN', True)
+pn = d.getVar('PN')
d.appendVar('RRECOMMENDS_%s-base' % pn, ' %s' % pkg)
-mlprefix = d.getVar('MLPREFIX', True) or ''
+mlprefix = d.getVar('MLPREFIX') or ''
pam_libdir = d.expand('${base_libdir}/security')
pam_pkgname = mlprefix + 'pam-plugin%s'
do_split_packages(d, pam_libdir, '^pam_(.*)\.so$', pam_pkgname, 'PAM
plugin for %s', extra_depends='', prepend=True)
-libdir = d.getVar('libdir', True)
+libdir = d.getVar('libdir')
do_split_packages(d, libdir, '^lib(.*)\.so\..*$', 'lib%s', 'Samba %s
library', extra_depends='${PN}-common', prepend=True, allow_links=True)
pkglibdir = '%s/samba' % libdir
do_split_packages(d, pkglibdir, '^lib(.*)\.so$', 'lib%s', 'Samba %s
library', extra_depends='${PN}-common', prepend=True)
diff --git a/meta-networking/recipes-support/nis/nis.inc
b/meta-networking/recipes-support/nis/nis.inc
index 200eaf74d..a968af174 100644
--- a/meta-networking/recipes-support/nis/nis.inc
+++ b/meta-networking/recipes-support/nis/nis.inc
@@ -25,7 +25,7 @@ do_install() {
# so force the package to be skipped here (this will cause a
# 'nothing provides' error)
python () {
-os = d.getVar("TARGET_OS", True)
+os = d.getVar("TARGET_OS")
if os == "linux-uclibc":
raise bb.parse.SkipRecipe("NIS functionality requires rpcsvc/yp.h,
uClibC does not provide this")
}
diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.7.1.bb
b/meta-networking/recipes-support/strongswan/strongswan_5.7.1.bb
index c8bb17c5b..5a4e2d36f 100644
--- a/meta-networking/recipes-support/strongswan/strongswan_5.7.1.bb
+++ b/meta-networking/recipes-support/strongswan/strongswan_5.7.1.bb
@@ -66,8 +66,8 @@ python split_strongswan_plugins () {
dbglibdir = os.path.join(libdir, '.debug')
def add_plugin_conf(f, pkg, file_regex, output_pattern, modulename):
-dvar = d.getVar('PKGD', True)
-oldfiles = d.getVar('CONFFILES_' + pkg, True)
+dvar = d.getVar('PKGD')
+oldfiles = d.getVar('CONFFILES_' + pkg)
newfile = '/' + os.path.relpath(f, dvar)
if not oldfiles:
@@ -83,7 +83,7 @@ python split_strongswan_plugins () {
split_staticdev_packages = do_split_packages(d, libdir,
'libstrongswan-(.*)\.a', '${PN}-plugin-%s-staticdev', 'strongSwan %s plugin -
Development files (Static Libraries)', prepend=True,
extra_depends='${PN}-staticdev')
if split_packages:
-pn = d.getVar('PN', True)
+pn = d.getVar('PN')
d.setVar('RRECOMMENDS_' + pn + '-plugins', ' '.join(split_packages))
d.appendVar('RRECOMMENDS_' + pn + '-dbg', ' ' + '
'.join(split_dbg_packages))
d.appendVar('RRECOMMENDS_' + pn + '-dev', ' ' + '
'.join(split_dev_packages))
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-initramfs][PATCH] meta-initramfs: remove True option to getVar calls (again)
From: André Draszik
A couple have still been missed in the past despite multiple
attempts at doing so (or simply have re-appeared?).
Search & replace made using the following command:
sed -e 's|\(d\.getVar \?\)( \?\([^,()]*\), \?True)|\1(\2)|g' \
-i $(git grep -E 'getVar ?\( ?([^,()]*), ?True\)' \
| cut -d':' -f1 \
| sort -u)
Signed-off-by: André Draszik
---
meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb
b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb
index b285b2e8b..ab2afb7f8 100644
--- a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb
+++ b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb
@@ -25,8 +25,8 @@ do_install() {
# magic by removing all the crazy escaping.
sed -i -e "2i \$TARGETSYSROOT = '${STAGING_DIR_TARGET}';" \
-e "2i \$NATIVESYSROOT = '${STAGING_DIR_NATIVE}';" \
- -e 's#${@d.getVar("STAGING_DIR_NATIVE", True).replace("/",
"/").replace("-", "-").replace(".", ".")}#${NATIVESYSROOT}#g;' \
- -e 's#${@d.getVar("STAGING_DIR_TARGET", True).replace("/",
"/").replace("-", "-").replace(".", ".")}#${TARGETSYSROOT}#g' \
+ -e 's#${@d.getVar("STAGING_DIR_NATIVE").replace("/",
"/").replace("-", "-").replace(".", ".")}#${NATIVESYSROOT}#g;' \
+ -e 's#${@d.getVar("STAGING_DIR_TARGET").replace("/",
"/").replace("-", "-").replace(".", ".")}#${TARGETSYSROOT}#g' \
${D}${bindir_crossscripts}/${TARGET_PREFIX}klcc
}
--
2.20.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
