diff options
Diffstat (limited to 'poky/meta/recipes-core')
| -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 |
2 files changed, 3 insertions, 2 deletions
diff --git a/poky/meta/recipes-core/busybox/busybox.inc b/poky/meta/recipes-core/busybox/busybox.inc index 8c6dbbaf9b..f1b09d95ce 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 6cb679a6e9..8ab59a9dd2 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 \ |