diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /poky/meta-selftest | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta-selftest')
6 files changed, 49 insertions, 3 deletions
diff --git a/poky/meta-selftest/conf/layer.conf b/poky/meta-selftest/conf/layer.conf index f574a505d6..0626b2a3ea 100644 --- a/poky/meta-selftest/conf/layer.conf +++ b/poky/meta-selftest/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "selftest" BBFILE_PATTERN_selftest = "^${LAYERDIR}/" BBFILE_PRIORITY_selftest = "5" -LAYERSERIES_COMPAT_selftest = "sumo" +LAYERSERIES_COMPAT_selftest = "thud" diff --git a/poky/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py b/poky/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py index 1aa7274701..64a3502370 100644 --- a/poky/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py +++ b/poky/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py @@ -27,7 +27,7 @@ class DnfSelftest(DnfTest): Expected: 1. Feeds were correctly set for dnf 2. Update recovers packages from host's repo Author: Humberto Ibarra <humberto.ibarra.lopez@intel.com> - Author: Alexander Kanavin <alexander.kanavin@intel.com> + Author: Alexander Kanavin <alex.kanavin@gmail.com> """ # When we created an image, we had to supply fake ip and port # for the feeds. Now we can patch the real ones into the config file. diff --git a/poky/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb b/poky/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb index 073cf5665c..922518bc39 100644 --- a/poky/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb +++ b/poky/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb @@ -28,5 +28,8 @@ FILES_${PN} = "${bindir}/aspell" FILES_libpspell = "${libdir}/libpspell.so.*" FILES_libpspell-dev = "${libdir}/libpspell* ${bindir}/pspell-config ${includedir}/pspell" -ARM_INSTRUCTION_SET = "arm" +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET_armv6 = "arm" + inherit autotools gettext diff --git a/poky/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink.bb b/poky/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink.bb new file mode 100644 index 0000000000..842a9772cb --- /dev/null +++ b/poky/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink.bb @@ -0,0 +1,30 @@ +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +LICENSE = "MIT" + +SRC_URI = "file://hello.c \ + file://gdb.sh \ +" + +S = "${WORKDIR}" + +do_compile () { + ${CC} hello.c -o hello1 ${CFLAGS} ${LDFLAGS} +} + +do_install () { + install -d ${D}${bindir} + install -m 755 ${WORKDIR}/gdb.sh ${D}${bindir}/ + install -m 755 hello1 ${D}${bindir}/hello1 + ln ${D}${bindir}/hello1 ${D}${bindir}/hello2 + + install -d ${D}${libexecdir} + ln ${D}${bindir}/hello1 ${D}${libexecdir}/hello3 + ln ${D}${bindir}/hello1 ${D}${libexecdir}/hello4 + + dd if=/dev/zero of=${D}${bindir}/sparsetest bs=1 count=0 seek=1M +} + +RDEPENDS_${PN}-gdb += "gdb" +PACKAGES =+ "${PN}-gdb" +FILES_${PN}-gdb = "${bindir}/gdb.sh" diff --git a/poky/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink/gdb.sh b/poky/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink/gdb.sh new file mode 100755 index 0000000000..f6417d5458 --- /dev/null +++ b/poky/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink/gdb.sh @@ -0,0 +1,8 @@ +#!/bin/sh +gdb -q $1 <<'EOF' +b main +r +c +q +EOF +echo "" diff --git a/poky/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink/hello.c b/poky/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink/hello.c new file mode 100644 index 0000000000..5c45dc60bd --- /dev/null +++ b/poky/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink/hello.c @@ -0,0 +1,5 @@ +#include <stdio.h> + +int main() { + printf("Hello World!\n"); +}
\ No newline at end of file |