diff options
Diffstat (limited to 'poky/meta')
| -rw-r--r-- | poky/meta/classes/sanity.bbclass | 11 | ||||
| -rw-r--r-- | poky/meta/recipes-connectivity/socat/socat_1.7.3.2.bb | 2 | ||||
| -rw-r--r-- | poky/meta/recipes-core/busybox/busybox.inc | 3 | ||||
| -rw-r--r-- | poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb | 2 | ||||
| -rw-r--r-- | poky/meta/recipes-extended/shadow/shadow.inc | 2 |
5 files changed, 17 insertions, 3 deletions
diff --git a/poky/meta/classes/sanity.bbclass b/poky/meta/classes/sanity.bbclass index 4e8eae894..374dacf4d 100644 --- a/poky/meta/classes/sanity.bbclass +++ b/poky/meta/classes/sanity.bbclass @@ -511,6 +511,16 @@ def check_make_version(sanity_data): return None +# Check if we're running on WSL (Windows Subsystem for Linux). Its known not to +# work but we should tell the user that upfront. +def check_wsl(d): + with open("/proc/version", "r") as f: + verdata = f.readlines() + for l in verdata: + if "Microsoft" in l: + return "OpenEmbedded doesn't work under WSL at this time, sorry" + return None + # Tar version 1.24 and onwards handle overwriting symlinks correctly # but earlier versions do not; this needs to work properly for sstate def check_tar_version(sanity_data): @@ -625,6 +635,7 @@ def check_sanity_version_change(status, d): status.addresult(check_tar_version(d)) status.addresult(check_git_version(d)) status.addresult(check_perl_modules(d)) + status.addresult(check_wsl(d)) missing = "" diff --git a/poky/meta/recipes-connectivity/socat/socat_1.7.3.2.bb b/poky/meta/recipes-connectivity/socat/socat_1.7.3.2.bb index 4dcb7b4ad..6373dd40a 100644 --- a/poky/meta/recipes-connectivity/socat/socat_1.7.3.2.bb +++ b/poky/meta/recipes-connectivity/socat/socat_1.7.3.2.bb @@ -7,7 +7,7 @@ SECTION = "console/network" DEPENDS = "openssl readline" -LICENSE = "GPL-2.0+-with-OpenSSL-exception" +LICENSE = "GPL-2.0-with-OpenSSL-exception" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://README;beginline=257;endline=287;md5=338c05eadd013872abb1d6e198e10a3f" diff --git a/poky/meta/recipes-core/busybox/busybox.inc b/poky/meta/recipes-core/busybox/busybox.inc index 8c6dbbaf9..f1b09d95c 100644 --- a/poky/meta/recipes-core/busybox/busybox.inc +++ b/poky/meta/recipes-core/busybox/busybox.inc @@ -183,7 +183,8 @@ do_compile() { oe_runmake busybox_unstripped mv busybox_unstripped busybox.$s oe_runmake busybox.links - mv busybox.links busybox.links.$s + sort busybox.links > busybox.links.$s + rm busybox.links done # hard fail if sh is being linked to the suid busybox (detects bug 10346) diff --git a/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb index 6cb679a6e..8ab59a9dd 100644 --- a/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb @@ -22,7 +22,7 @@ IMAGE_FSTYPES = "wic.vmdk" inherit core-image module-base setuptools3 -SRCREV ?= "2464dd404041a7a00b18e42950cbf4719180141d" +SRCREV ?= "1566ecdb01216ece73864c15c781fdefe9af5e37" SRC_URI = "git://git.yoctoproject.org/poky;branch=sumo \ file://Yocto_Build_Appliance.vmx \ file://Yocto_Build_Appliance.vmxf \ diff --git a/poky/meta/recipes-extended/shadow/shadow.inc b/poky/meta/recipes-extended/shadow/shadow.inc index 9691c3879..4e1eaed9b 100644 --- a/poky/meta/recipes-extended/shadow/shadow.inc +++ b/poky/meta/recipes-extended/shadow/shadow.inc @@ -53,6 +53,8 @@ PAM_SRC_URI = "file://pam.d/chfn \ inherit autotools gettext +export CONFIG_SHELL="/bin/sh" + EXTRA_OECONF += "--without-audit \ --without-libcrack \ --without-selinux \ |