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 /meta-ibm | |
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 'meta-ibm')
-rw-r--r-- | meta-ibm/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-ibm/meta-palmetto/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-ibm/meta-romulus/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-ibm/meta-witherspoon/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-ibm/recipes-httpd/nginx/nginx_%.bbappend | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/meta-ibm/conf/layer.conf b/meta-ibm/conf/layer.conf index 434f61695..fd05fc463 100644 --- a/meta-ibm/conf/layer.conf +++ b/meta-ibm/conf/layer.conf @@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "ibm-layer" BBFILE_PATTERN_ibm-layer = "" -LAYERSERIES_COMPAT_ibm-layer = "sumo" +LAYERSERIES_COMPAT_ibm-layer = "thud" # Provide a variable that points the base of the ibm layer. IBMBASE = '${@os.path.normpath("${LAYERDIR}/")}' diff --git a/meta-ibm/meta-palmetto/conf/layer.conf b/meta-ibm/meta-palmetto/conf/layer.conf index 58de44f62..61c7538ac 100644 --- a/meta-ibm/meta-palmetto/conf/layer.conf +++ b/meta-ibm/meta-palmetto/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "palmetto-layer" BBFILE_PATTERN_palmetto-layer = "" -LAYERSERIES_COMPAT_palmetto-layer = "sumo" +LAYERSERIES_COMPAT_palmetto-layer = "thud" diff --git a/meta-ibm/meta-romulus/conf/layer.conf b/meta-ibm/meta-romulus/conf/layer.conf index fa58c4495..d1eb838d3 100644 --- a/meta-ibm/meta-romulus/conf/layer.conf +++ b/meta-ibm/meta-romulus/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "romulus-layer" BBFILE_PATTERN_romulus-layer = "" -LAYERSERIES_COMPAT_romulus-layer = "sumo" +LAYERSERIES_COMPAT_romulus-layer = "thud" diff --git a/meta-ibm/meta-witherspoon/conf/layer.conf b/meta-ibm/meta-witherspoon/conf/layer.conf index 7ace31d84..7dd1f0b0f 100644 --- a/meta-ibm/meta-witherspoon/conf/layer.conf +++ b/meta-ibm/meta-witherspoon/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "witherspoon-layer" BBFILE_PATTERN_witherspoon-layer = "" -LAYERSERIES_COMPAT_witherspoon-layer = "sumo" +LAYERSERIES_COMPAT_witherspoon-layer = "thud" diff --git a/meta-ibm/recipes-httpd/nginx/nginx_%.bbappend b/meta-ibm/recipes-httpd/nginx/nginx_%.bbappend index 7acc986c2..ee5ffd5da 100644 --- a/meta-ibm/recipes-httpd/nginx/nginx_%.bbappend +++ b/meta-ibm/recipes-httpd/nginx/nginx_%.bbappend @@ -10,7 +10,7 @@ SRC_URI += " \ " RDEPENDS_${PN} += " \ - openssl \ + openssl-bin \ ${VIRTUAL-RUNTIME_base-utils} \ " |