From 193236933b0f4ab91b1625b64e2187e2db4e0e8f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 5 Apr 2019 15:28:33 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop --- .../devtool/devtool-test-local_6.03.bb | 1 - .../multiconfig/multiconfig-image-packager_0.1.bb | 28 ++++++++++++++++++++++ .../recipes-test/recipeutils/recipeutils-test.inc | 5 ++++ .../recipeutils/recipeutils-test/anotherfile | 0 .../recipeutils/recipeutils-test/somefile | 0 .../recipeutils/recipeutils-test_1.2.bb | 13 ++++++++++ 6 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 poky/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb create mode 100644 poky/meta-selftest/recipes-test/recipeutils/recipeutils-test.inc create mode 100644 poky/meta-selftest/recipes-test/recipeutils/recipeutils-test/anotherfile create mode 100644 poky/meta-selftest/recipes-test/recipeutils/recipeutils-test/somefile create mode 100644 poky/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb (limited to 'poky/meta-selftest/recipes-test') diff --git a/poky/meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb b/poky/meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb index b377cb760..6bfc55706 100644 --- a/poky/meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb +++ b/poky/meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb @@ -9,7 +9,6 @@ SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/syslinux-${PV}.tar.x SRC_URI[md5sum] = "92a253df9211e9c20172796ecf388f13" SRC_URI[sha256sum] = "26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e" -UPSTREAM_VERSION_UNKNOWN = "1" S = "${WORKDIR}/syslinux-${PV}" diff --git a/poky/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb b/poky/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb new file mode 100644 index 000000000..3dbc0f5d1 --- /dev/null +++ b/poky/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb @@ -0,0 +1,28 @@ +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +MCMACHINE_virtclass-mcextend-musl = "qemux86-64" +MCMACHINE_virtclass-mcextend-tiny = "qemux86" +MCIMGTYPE_virtclass-mcextend-musl = "ext4" +MCIMGTYPE_virtclass-mcextend-tiny = "cpio.gz" + +MC_DEPLOY_DIR_IMAGE = "${TOPDIR}/tmp-mc-${MCNAME}/deploy/images/${MCMACHINE}" + +do_install[mcdepends] += "multiconfig::${MCNAME}:core-image-minimal:do_image_complete multiconfig::${MCNAME}:virtual/kernel:do_deploy" + +do_install () { + install -d ${D}/var/lib/machines/${MCNAME} + install ${MC_DEPLOY_DIR_IMAGE}/core-image-minimal-${MCMACHINE}.${MCIMGTYPE} ${D}/var/lib/machines/${MCNAME}/core-image-minimal.${MCIMGTYPE} + install ${MC_DEPLOY_DIR_IMAGE}/bzImage ${D}/var/lib/machines/${MCNAME} +} + +python () { + mcname = d.getVar('MCNAME') + if not mcname: + raise bb.parse.SkipRecipe("Not a multiconfig target") + multiconfigs = d.getVar('BBMULTICONFIG') or "" + if mcname not in multiconfigs: + raise bb.parse.SkipRecipe("multiconfig target %s not enabled" % mcname) +} + +BBCLASSEXTEND = "mcextend:tiny mcextend:musl" diff --git a/poky/meta-selftest/recipes-test/recipeutils/recipeutils-test.inc b/poky/meta-selftest/recipes-test/recipeutils/recipeutils-test.inc new file mode 100644 index 000000000..8490b902d --- /dev/null +++ b/poky/meta-selftest/recipes-test/recipeutils/recipeutils-test.inc @@ -0,0 +1,5 @@ +SRC_URI = "http://xorg.freedesktop.org/releases/individual/lib/libxshmfence-${PV}.tar.bz2" + +SRC_URI[md5sum] = "66662e76899112c0f99e22f2fc775a7e" +SRC_URI[sha256sum] = "d21b2d1fd78c1efbe1f2c16dae1cb23f8fd231dcf891465b8debe636a9054b0c" + diff --git a/poky/meta-selftest/recipes-test/recipeutils/recipeutils-test/anotherfile b/poky/meta-selftest/recipes-test/recipeutils/recipeutils-test/anotherfile new file mode 100644 index 000000000..e69de29bb diff --git a/poky/meta-selftest/recipes-test/recipeutils/recipeutils-test/somefile b/poky/meta-selftest/recipes-test/recipeutils/recipeutils-test/somefile new file mode 100644 index 000000000..e69de29bb diff --git a/poky/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb b/poky/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb new file mode 100644 index 000000000..7c20d9a68 --- /dev/null +++ b/poky/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb @@ -0,0 +1,13 @@ +SUMMARY = "Test recipe for recipeutils.patch_recipe()" + +require recipeutils-test.inc + +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://${WORKDIR}/somefile;md5=d41d8cd98f00b204e9800998ecf8427e" +DEPENDS += "virtual/libx11" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI += "file://somefile" + +SRC_URI_append = " file://anotherfile" -- cgit v1.2.3