Re: [OE-core] [PATCH v3 1/9] uefi.conf: add config file holding configuration for UEFI applications
Hello, ср, 18 сент. 2019 г. в 01:16, Richard Purdie : > > On Tue, 2019-09-17 at 18:36 +0300, dbarysh...@gmail.com wrote: > > From: Dmitry Eremin-Solenikov > > > > Create new config file defining common variables for all UEFI-related > > packages (bootloaders, test applications, etc). > > > > Signed-off-by: Dmitry Eremin-Solenikov < > > dmitry_eremin-soleni...@mentor.com> > > --- > > meta/conf/uefi.conf | 16 > > 1 file changed, 16 insertions(+) > > create mode 100644 meta/conf/uefi.conf > > This is heading in the right direction however if we're going to try > and clean things up I've concluded we need to do it properly and get it > right. > > Now I understand more about how this configuration file is being used, > should it be called image-uefi.conf ? Fine, I will rename the conf file > I feel really strongly that we do not want an uefi.bbclass, its simply > not warranted and will just continue to expand the current mess of > classes. If all we need it for is some functions, those functions > should be added elsewhere. As those EFI_PROVIDER bootloader classes are called only form live-vm-common, maybe I should just add them to live-vm-common and make individual classes _append those functions? > I'm also on the lookout for tests of these kinds of codepaths. Code is > much more likely to be accepted if tests are added for it. I'm not > quite sure what would make most sense here in this case buts its a > general point I will be pushing for going forward. What kind of tests would you like? This code already exists and is called as a part of any live image generation. -- With best wishes Dmitry -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] openssl: Enable os option for with-rand-seed as well
On Tue, Sep 17, 2019 at 11:49:47AM -0700, Khem Raj wrote: > with openSSL 1.1.1d we start seeing errors like > > Error Generating Key > 139979727451584:error:2406C06E:random number > generator:RAND_DRBG_instantiate:error retrieving > entropy:../openssl-1.1.1d/crypto/rand/drbg_lib.c:342: > > when using openssl from openssl-native on build hosts, this is due to > limiting the random seed to devrandom, to support older hosts, since the > option allows to have a comma separated list of methods to try, we can > try the default first and if that fails then fallback to devrandom, this > will ensure that it keeps working with build systems which dont support > getrandom() >... Thanks for fixing this problem! cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] report-error.bbclass: add local.conf/auto.conf into error report
It is ok to merge this repo first, and error-report-web still old,
since error-report-web will ignore the new field.
but cannot update error-report-web to new one first, or the database of
error-report-web will report error
since report from oe-core don't provide default value for the new field
of database.
On 9/18/19 9:31 AM, changqing...@windriver.com wrote:
From: Changqing Li
sometimes, it is not enough to reproduce a failed build with current
info on error reports web, add local.conf/auto.conf into error
report to make it more easier to reproduce failed build
Note: this need work together with change in repo error-report-web,
which will display local.conf and auto.conf as Error Details
[YOCTO #13252]
Signed-off-by: Changqing Li
---
meta/classes/report-error.bbclass | 15 +++
1 file changed, 15 insertions(+)
diff --git a/meta/classes/report-error.bbclass
b/meta/classes/report-error.bbclass
index 1c55abf..ea043b2 100644
--- a/meta/classes/report-error.bbclass
+++ b/meta/classes/report-error.bbclass
@@ -25,6 +25,19 @@ def errorreport_savedata(e, newdata, file):
json.dump(newdata, f, indent=4, sort_keys=True)
return datafile
+def get_conf_data(e, filename):
+builddir = e.data.getVar('TOPDIR')
+filepath = os.path.join(builddir, "conf", filename)
+jsonstring = ""
+if os.path.exists(filepath):
+with open(filepath, 'r') as f:
+for line in f.readlines():
+if line.startswith("#") or len(line.strip()) == 0:
+continue
+else:
+jsonstring=jsonstring + line
+return jsonstring
+
python errorreport_handler () {
import json
import codecs
@@ -51,6 +64,8 @@ python errorreport_handler () {
data['failures'] = []
data['component'] = " ".join(e.getPkgs())
data['branch_commit'] = str(base_detect_branch(e.data)) + ": " +
str(base_detect_revision(e.data))
+data['local_conf'] = get_conf_data(e, 'local.conf')
+data['auto_conf'] = get_conf_data(e, 'auto.conf')
lock = bb.utils.lockfile(datafile + '.lock')
errorreport_savedata(e, data, "error-report.txt")
bb.utils.unlockfile(lock)
--
BRs
Sandy(Li Changqing)
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] rootfs-postcommands: check /etc/gconf exists before working on it
Check that /etc/gconf exists before trying to find files under it, to avoid
writing find error messages to the rootfs log.
Also use ${sysconfdir}/gconf instead of hardcoding /etc/gconf.
Signed-off-by: Ross Burton
---
meta/classes/rootfs-postcommands.bbclass | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/classes/rootfs-postcommands.bbclass
b/meta/classes/rootfs-postcommands.bbclass
index fc338161c4d..88f75d0f442 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -361,7 +361,9 @@ rootfs_reproducible () {
echo $sformatted > ${IMAGE_ROOTFS}/etc/version
bbnote "rootfs_reproducible: set /etc/version to $sformatted"
- find ${IMAGE_ROOTFS}/etc/gconf -name '%gconf.xml' -print0 |
xargs -0r \
- sed -i -e
's@\bmtime="[0-9][0-9]*"@mtime="'${REPRODUCIBLE_TIMESTAMP_ROOTFS}'"@g'
+ if [ -d ${IMAGE_ROOTFS}${sysconfdir}/gconf ]; then
+ find ${IMAGE_ROOTFS}${sysconfdir}/gconf -name
'%gconf.xml' -print0 | xargs -0r \
+ sed -i -e
's@\bmtime="[0-9][0-9]*"@mtime="'${REPRODUCIBLE_TIMESTAMP_ROOTFS}'"@g'
+ fi
fi
}
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] dhex: Add new recipe
Signed-off-by: Daniel Ammann
---
meta/recipes-support/dhex/dhex_0.69.bb | 24
1 file changed, 24 insertions(+)
create mode 100644 meta/recipes-support/dhex/dhex_0.69.bb
diff --git a/meta/recipes-support/dhex/dhex_0.69.bb
b/meta/recipes-support/dhex/dhex_0.69.bb
new file mode 100644
index 00..cfbb2caaf6
--- /dev/null
+++ b/meta/recipes-support/dhex/dhex_0.69.bb
@@ -0,0 +1,24 @@
+SUMMARY = "dhex is a hex editor that includes a diff mode"
+SECTION = "console/utils"
+
+DEPENDS = "ncurses"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM =
"file://README.txt;beginline=229;endline=241;md5=6f252a421b65bcecf624382ba3c899da"
+
+SRC_URI = "http://www.dettus.net/dhex/dhex_0.69.tar.gz;
+SRC_URI[md5sum] = "64d557437fe110c19f23ed3e9bbcdd54"
+SRC_URI[sha256sum] =
"52730bcd1cf16bd4dae0de42531be9a4057535ec61ca38c0804eb8246ea6c41b"
+
+S = "${WORKDIR}/dhex_${PV}"
+
+EXTRA_OEMAKE += "'CC=${CC}' 'LDFLAGS=${LDFLAGS}' 'CPPFLAGS=${CPPFLAGS}'"
+
+do_compile() {
+ oe_runmake
+}
+
+do_install() {
+ install -m 0755 -d ${D}${bindir}
+ install -m 0755 ${S}/dhex ${D}${bindir}/
+}
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] dhex: Add new recipe
On 18/09/2019 12:12, Daniel Ammann wrote: +SUMMARY = "dhex is a hex editor that includes a diff mode" Doesn't seem fundamental enough to justify being in oe-core, please considering submitting this to meta-oe instead. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 1/9] uefi.conf: add config file holding configuration for UEFI applications
On Wed, 2019-09-18 at 12:04 +0300, Dmitry Eremin-Solenikov wrote: > ср, 18 сент. 2019 г. в 01:16, Richard Purdie > : > > On Tue, 2019-09-17 at 18:36 +0300, dbarysh...@gmail.com wrote: > > > > > Now I understand more about how this configuration file is being > > used, > > should it be called image-uefi.conf ? > > Fine, I will rename the conf file > > > I feel really strongly that we do not want an uefi.bbclass, its > > simply > > not warranted and will just continue to expand the current mess of > > classes. If all we need it for is some functions, those functions > > should be added elsewhere. > > As those EFI_PROVIDER bootloader classes are called only form > live-vm-common, maybe I should just add them to live-vm-common and > make individual classes _append those functions? That sounds much better. > > I'm also on the lookout for tests of these kinds of codepaths. Code > > is > > much more likely to be accepted if tests are added for it. I'm not > > quite sure what would make most sense here in this case buts its a > > general point I will be pushing for going forward. > > What kind of tests would you like? This code already exists and is > called as a part of any live image generation. I think these patches are ok, you hinted this was part of a larger set of changes and I'm worried about the fit/signed image/uboot codepaths though which are in a similar area to some of this. Its something to be mindful of as if changes are made to something which isn't currently tested I will be asking for tests. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libinput: upgrade 1.14.0 -> 1.14.1
Signed-off-by: Ross Burton
---
.../wayland/{libinput_1.14.0.bb => libinput_1.14.1.bb} | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/wayland/{libinput_1.14.0.bb =>
libinput_1.14.1.bb} (73%)
diff --git a/meta/recipes-graphics/wayland/libinput_1.14.0.bb
b/meta/recipes-graphics/wayland/libinput_1.14.1.bb
similarity index 73%
rename from meta/recipes-graphics/wayland/libinput_1.14.0.bb
rename to meta/recipes-graphics/wayland/libinput_1.14.1.bb
index d236f3fa087..38bc8d2c338 100644
--- a/meta/recipes-graphics/wayland/libinput_1.14.0.bb
+++ b/meta/recipes-graphics/wayland/libinput_1.14.1.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=1f2ea9ebff3a2c6d458faf58492efb63"
DEPENDS = "libevdev udev mtdev"
SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz;
-SRC_URI[md5sum] = "1c33d49fc7985926eab877e3de9c17eb"
-SRC_URI[sha256sum] =
"7cb85c24f8920b81bc5360220107e267ab4e0e718704c7690a8c7b03fa14fc67"
+SRC_URI[md5sum] = "da29a704dc6f7ea2d5aac754db046340"
+SRC_URI[sha256sum] =
"e333a3242835c019ca37d2cef8b51a87d3138eb47444119c0153dc7a8656ee70"
UPSTREAM_CHECK_REGEX = "libinput-(?P\d+\.\d+\.(?!9\d+)\d+)"
@@ -21,7 +21,10 @@ PACKAGECONFIG[gui] =
"-Ddebug-gui=true,-Ddebug-gui=false,cairo gtk+3"
UDEVDIR = "`pkg-config --variable=udevdir udev`"
-EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} -Ddocumentation=false -Dtests=false"
+EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} \
+ -Ddocumentation=false \
+ -Dtests=false \
+ -Dzshcompletiondir=no"
# package name changed in 1.8.1 upgrade: make sure package upgrades work
RPROVIDES_${PN} = "libinput"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 3/7] grub-efi: switch to image-uefi.conf
From: Dmitry Eremin-Solenikov
Use variables from image-uefi.conf instead of hardcoding them in the
recipe.
Signed-off-by: Dmitry Eremin-Solenikov
---
meta/recipes-bsp/grub/grub-efi_2.04.bb | 17 +++--
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/meta/recipes-bsp/grub/grub-efi_2.04.bb
b/meta/recipes-bsp/grub/grub-efi_2.04.bb
index c85879b6772f..b9d6225d2774 100644
--- a/meta/recipes-bsp/grub/grub-efi_2.04.bb
+++ b/meta/recipes-bsp/grub/grub-efi_2.04.bb
@@ -1,5 +1,7 @@
require grub2.inc
+require conf/image-uefi.conf
+
GRUBPLATFORM = "efi"
DEPENDS_append_class-target = " grub-efi-native"
@@ -18,18 +20,15 @@ python __anonymous () {
prefix = "" if d.getVar('EFI_PROVIDER') == "grub-efi" else "grub-efi-"
if target == "x86_64":
grubtarget = 'x86_64'
-grubimage = prefix + "bootx64.efi"
elif re.match('i.86', target):
grubtarget = 'i386'
-grubimage = prefix + "bootia32.efi"
elif re.match('aarch64', target):
grubtarget = 'arm64'
-grubimage = prefix + "bootaa64.efi"
elif re.match('arm', target):
grubtarget = 'arm'
-grubimage = prefix + "bootarm.efi"
else:
raise bb.parse.SkipRecipe("grub-efi is incompatible with target %s" %
target)
+grubimage = prefix + d.getVar("EFI_BOOT_IMAGE")
d.setVar("GRUB_TARGET", grubtarget)
d.setVar("GRUB_IMAGE", grubimage)
prefix = "grub-efi-" if prefix == "" else ""
@@ -45,7 +44,7 @@ do_mkimage() {
cd ${B}
# Search for the grub.cfg on the local boot media by using the
# built in cfg file provided via this recipe
- grub-mkimage -c ../cfg -p /EFI/BOOT -d ./grub-core/ \
+ grub-mkimage -c ../cfg -p ${EFIDIR} -d ./grub-core/ \
-O ${GRUB_TARGET}-efi -o
./${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} \
${GRUB_BUILDIN}
}
@@ -57,10 +56,8 @@ do_mkimage_class-native() {
}
do_install_append_class-target() {
- install -d ${D}/boot
- install -d ${D}/boot/EFI
- install -d ${D}/boot/EFI/BOOT
- install -m 644 ${B}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE}
${D}/boot/EFI/BOOT/${GRUB_IMAGE}
+ install -d ${D}${EFI_FILES_PATH}
+ install -m 644 ${B}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE}
${D}${EFI_FILES_PATH}/${GRUB_IMAGE}
}
do_install_class-native() {
@@ -100,7 +97,7 @@ addtask deploy after do_install before do_build
FILES_${PN} = "${libdir}/grub/${GRUB_TARGET}-efi \
${datadir}/grub \
- /boot/EFI/BOOT/${GRUB_IMAGE} \
+ ${EFI_FILES_PATH}/${GRUB_IMAGE} \
"
FILES_${PN}_remove_aarch64 = "${libdir}/grub/${GRUB_TARGET}-efi"
--
2.23.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 6/7] systemd-boot.bbclass: switch to image-uefi.conf
From: Dmitry Eremin-Solenikov
Use variables from image-uefi.conf instead of hardcoding them in the class.
Signed-off-by: Dmitry Eremin-Solenikov
---
meta/classes/systemd-boot.bbclass | 15 ---
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/meta/classes/systemd-boot.bbclass
b/meta/classes/systemd-boot.bbclass
index 3cd6811a6ce1..bb3221dacca8 100644
--- a/meta/classes/systemd-boot.bbclass
+++ b/meta/classes/systemd-boot.bbclass
@@ -11,28 +11,21 @@
do_bootimg[depends] += "${MLPREFIX}systemd-boot:do_deploy"
-EFIDIR = "/EFI/BOOT"
+require conf/image-uefi.conf
# Need UUID utility code.
inherit fs-uuid
efi_populate() {
DEST=$1
-EFI_IMAGE="systemd-bootia32.efi"
-DEST_EFI_IMAGE="bootia32.efi"
-if [ "${TARGET_ARCH}" = "x86_64" ]; then
-EFI_IMAGE="systemd-bootx64.efi"
-DEST_EFI_IMAGE="bootx64.efi"
-fi
-
install -d ${DEST}${EFIDIR}
# systemd-boot requires these paths for configuration files
# they are not customizable so no point in new vars
install -d ${DEST}/loader
install -d ${DEST}/loader/entries
-install -m 0644 ${DEPLOY_DIR_IMAGE}/${EFI_IMAGE}
${DEST}${EFIDIR}/${DEST_EFI_IMAGE}
+install -m 0644 ${DEPLOY_DIR_IMAGE}/systemd-${EFI_BOOT_IMAGE}
${DEST}${EFIDIR}/${EFI_BOOT_IMAGE}
EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g')
-printf 'fs0:%s\%s\n' "$EFIPATH" "$DEST_EFI_IMAGE" >${DEST}/startup.nsh
+printf 'fs0:%s\%s\n' "$EFIPATH" "${EFI_BOOT_IMAGE}"
>${DEST}/startup.nsh
install -m 0644 ${SYSTEMD_BOOT_CFG} ${DEST}/loader/loader.conf
for i in ${SYSTEMD_BOOT_ENTRIES}; do
install -m 0644 ${i} ${DEST}/loader/entries
@@ -47,7 +40,7 @@ efi_iso_populate() {
cp -r $iso_dir/loader ${EFIIMGDIR}
cp $iso_dir/${KERNEL_IMAGETYPE} ${EFIIMGDIR}
EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g')
-echo "fs0:${EFIPATH}\\${DEST_EFI_IMAGE}" > ${EFIIMGDIR}/startup.nsh
+echo "fs0:${EFIPATH}\\${EFI_BOOT_IMAGE}" > ${EFIIMGDIR}/startup.nsh
if [ -f "$iso_dir/initrd" ] ; then
cp $iso_dir/initrd ${EFIIMGDIR}
fi
--
2.23.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 4/7] grub-efi.bbclass: switch to image-uefi.conf
From: Dmitry Eremin-Solenikov
Use variables from image-uefi.conf instead of hardcoding them in the
class.
Signed-off-by: Dmitry Eremin-Solenikov
---
meta/classes/grub-efi-cfg.bbclass | 1 -
meta/classes/grub-efi.bbclass | 20
2 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/meta/classes/grub-efi-cfg.bbclass
b/meta/classes/grub-efi-cfg.bbclass
index f661a69f833a..8b5ff20c72c0 100644
--- a/meta/classes/grub-efi-cfg.bbclass
+++ b/meta/classes/grub-efi-cfg.bbclass
@@ -23,7 +23,6 @@ GRUB_TIMEOUT ?= "10"
#FIXME: build this from the machine config
GRUB_OPTS ?= "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1"
-EFIDIR = "/EFI/BOOT"
GRUB_ROOT ?= "${ROOT}"
APPEND ?= ""
diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass
index ec692f1646f3..724bbe86842c 100644
--- a/meta/classes/grub-efi.bbclass
+++ b/meta/classes/grub-efi.bbclass
@@ -1,4 +1,5 @@
inherit grub-efi-cfg
+require conf/image-uefi.conf
efi_populate() {
# DEST must be the root of the image so that EFIDIR is not
@@ -7,22 +8,9 @@ efi_populate() {
install -d ${DEST}${EFIDIR}
- GRUB_IMAGE="grub-efi-bootia32.efi"
- DEST_IMAGE="bootia32.efi"
- if [ -n "${MLPREFIX}" ]; then
- if [ "${TARGET_ARCH_MULTILIB_ORIGINAL}" = "x86_64" ]; then
- GRUB_IMAGE="grub-efi-bootx64.efi"
- DEST_IMAGE="bootx64.efi"
- fi
- else
- if [ "${TARGET_ARCH}" = "x86_64" ]; then
- GRUB_IMAGE="grub-efi-bootx64.efi"
- DEST_IMAGE="bootx64.efi"
- fi
- fi
- install -m 0644 ${DEPLOY_DIR_IMAGE}/${GRUB_IMAGE}
${DEST}${EFIDIR}/${DEST_IMAGE}
+ install -m 0644 ${DEPLOY_DIR_IMAGE}/grub-efi-${EFI_BOOT_IMAGE}
${DEST}${EFIDIR}/${EFI_BOOT_IMAGE}
EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g')
- printf 'fs0:%s\%s\n' "$EFIPATH" "$DEST_IMAGE" >${DEST}/startup.nsh
+ printf 'fs0:%s\%s\n' "$EFIPATH" "${EFI_BOOT_IMAGE}" >${DEST}/startup.nsh
install -m 0644 ${GRUB_CFG} ${DEST}${EFIDIR}/grub.cfg
}
@@ -35,7 +23,7 @@ efi_iso_populate() {
cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR}
cp $iso_dir/${KERNEL_IMAGETYPE} ${EFIIMGDIR}
EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g')
- printf 'fs0:%s\%s\n' "$EFIPATH" "$GRUB_IMAGE" > ${EFIIMGDIR}/startup.nsh
+ printf 'fs0:%s\%s\n' "$EFIPATH" "grub-efi-${EFI_BOOT_IMAGE}" >
${EFIIMGDIR}/startup.nsh
if [ -f "$iso_dir/initrd" ] ; then
cp $iso_dir/initrd ${EFIIMGDIR}
fi
--
2.23.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 2/7] grub-bootconf: switch to image-uefi.conf
From: Dmitry Eremin-Solenikov
Use variables from image-uefi.conf instead of hardcoding them in the
recipe.
Signed-off-by: Dmitry Eremin-Solenikov
---
meta/recipes-bsp/grub/grub-bootconf_1.00.bb | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-bsp/grub/grub-bootconf_1.00.bb
b/meta/recipes-bsp/grub/grub-bootconf_1.00.bb
index 9d5dab9aa808..572580313b26 100644
--- a/meta/recipes-bsp/grub/grub-bootconf_1.00.bb
+++ b/meta/recipes-bsp/grub/grub-bootconf_1.00.bb
@@ -9,6 +9,8 @@ RPROVIDES_${PN} += "virtual/grub-bootconf"
inherit grub-efi-cfg
+require conf/image-uefi.conf
+
S = "${WORKDIR}"
GRUB_CFG = "${S}/grub-bootconf"
@@ -23,10 +25,8 @@ python do_configure() {
do_configure[vardeps] += "APPEND ROOT"
do_install() {
- install -d ${D}/boot
- install -d ${D}/boot/EFI
- install -d ${D}/boot/EFI/BOOT
- install grub-bootconf ${D}/boot/EFI/BOOT/grub.cfg
+ install -d ${D}${EFI_FILES_PATH}
+ install grub-bootconf ${D}${EFI_FILES_PATH}/grub.cfg
}
-FILES_${PN} = "/boot/EFI/BOOT/grub.cfg"
+FILES_${PN} = "${EFI_FILES_PATH}/grub.cfg"
--
2.23.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 5/7] systemd-boot: switch to image-uefi.conf
From: Dmitry Eremin-Solenikov
Use variables from image-uefi.conf instead of hardcoding them in the recipe.
Signed-off-by: Dmitry Eremin-Solenikov
---
meta/recipes-core/systemd/systemd-boot_243.bb | 15 ++-
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd-boot_243.bb
b/meta/recipes-core/systemd/systemd-boot_243.bb
index 56a25c35babc..515abc289bef 100644
--- a/meta/recipes-core/systemd/systemd-boot_243.bb
+++ b/meta/recipes-core/systemd/systemd-boot_243.bb
@@ -1,6 +1,8 @@
require systemd.inc
FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:"
+require conf/image-uefi.conf
+
DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native"
# NOTE: These three patches are in theory not needed, but we haven't
@@ -33,16 +35,13 @@ python __anonymous () {
import re
target = d.getVar('TARGET_ARCH')
prefix = "" if d.getVar('EFI_PROVIDER') == "systemd-boot" else "systemd-"
-if target == "x86_64":
-systemdimage = prefix + "bootx64.efi"
-else:
-systemdimage = prefix + "bootia32.efi"
+systemdimage = prefix + d.getVar("EFI_BOOT_IMAGE")
d.setVar("SYSTEMD_BOOT_IMAGE", systemdimage)
prefix = "systemd-" if prefix == "" else ""
d.setVar("SYSTEMD_BOOT_IMAGE_PREFIX", prefix)
}
-FILES_${PN} = "/boot/EFI/BOOT/${SYSTEMD_BOOT_IMAGE}"
+FILES_${PN} = "${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE}"
RDEPENDS_${PN} += "virtual/systemd-bootconf"
@@ -61,10 +60,8 @@ do_compile() {
}
do_install() {
- install -d ${D}/boot
- install -d ${D}/boot/EFI
- install -d ${D}/boot/EFI/BOOT
- install ${B}/src/boot/efi/systemd-boot*.efi
${D}/boot/EFI/BOOT/${SYSTEMD_BOOT_IMAGE}
+ install -d ${D}${EFI_FILES_PATH}
+ install ${B}/src/boot/efi/systemd-boot*.efi
${D}${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE}
}
do_deploy () {
--
2.23.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 7/7] live-vm-common.bbclass: provide efi population functions for live images
From: Dmitry Eremin-Solenikov
Define common functions for populating EFI directories in live image by
reusing common code from grub-efi and systemd-boot bbclasses.
Signed-off-by: Dmitry Eremin-Solenikov
---
meta/classes/grub-efi.bbclass | 28 +---
meta/classes/live-vm-common.bbclass | 33 +
meta/classes/systemd-boot.bbclass | 22 ++-
3 files changed, 36 insertions(+), 47 deletions(-)
diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass
index 724bbe86842c..8fc6999e52a8 100644
--- a/meta/classes/grub-efi.bbclass
+++ b/meta/classes/grub-efi.bbclass
@@ -2,33 +2,7 @@ inherit grub-efi-cfg
require conf/image-uefi.conf
efi_populate() {
- # DEST must be the root of the image so that EFIDIR is not
- # nested under a top level directory.
- DEST=$1
-
- install -d ${DEST}${EFIDIR}
-
- install -m 0644 ${DEPLOY_DIR_IMAGE}/grub-efi-${EFI_BOOT_IMAGE}
${DEST}${EFIDIR}/${EFI_BOOT_IMAGE}
- EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g')
- printf 'fs0:%s\%s\n' "$EFIPATH" "${EFI_BOOT_IMAGE}" >${DEST}/startup.nsh
+ efi_populate_common "$1" grub-efi
install -m 0644 ${GRUB_CFG} ${DEST}${EFIDIR}/grub.cfg
}
-
-efi_iso_populate() {
- iso_dir=$1
- efi_populate $iso_dir
- # Build a EFI directory to create efi.img
- mkdir -p ${EFIIMGDIR}/${EFIDIR}
- cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR}
- cp $iso_dir/${KERNEL_IMAGETYPE} ${EFIIMGDIR}
- EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g')
- printf 'fs0:%s\%s\n' "$EFIPATH" "grub-efi-${EFI_BOOT_IMAGE}" >
${EFIIMGDIR}/startup.nsh
- if [ -f "$iso_dir/initrd" ] ; then
- cp $iso_dir/initrd ${EFIIMGDIR}
- fi
-}
-
-efi_hddimg_populate() {
- efi_populate $1
-}
diff --git a/meta/classes/live-vm-common.bbclass
b/meta/classes/live-vm-common.bbclass
index 68105d9b84f9..74e7074a5397 100644
--- a/meta/classes/live-vm-common.bbclass
+++ b/meta/classes/live-vm-common.bbclass
@@ -29,6 +29,39 @@ def pcbios(d):
PCBIOS = "${@pcbios(d)}"
PCBIOS_CLASS = "${@['','syslinux'][d.getVar('PCBIOS') == '1']}"
+# efi_populate_common DEST BOOTLOADER
+efi_populate_common() {
+# DEST must be the root of the image so that EFIDIR is not
+# nested under a top level directory.
+DEST=$1
+
+install -d ${DEST}${EFIDIR}
+
+install -m 0644 ${DEPLOY_DIR_IMAGE}/$2-${EFI_BOOT_IMAGE}
${DEST}${EFIDIR}/${EFI_BOOT_IMAGE}
+EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g')
+printf 'fs0:%s\%s\n' "$EFIPATH" "${EFI_BOOT_IMAGE}"
>${DEST}/startup.nsh
+}
+
+efi_iso_populate() {
+iso_dir=$1
+efi_populate $iso_dir
+# Build a EFI directory to create efi.img
+mkdir -p ${EFIIMGDIR}/${EFIDIR}
+cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR}
+cp $iso_dir/${KERNEL_IMAGETYPE} ${EFIIMGDIR}
+
+EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g')
+printf 'fs0:%s\%s\n' "$EFIPATH" "${EFI_BOOT_IMAGE}"
>${EFIIMGDIR}/startup.nsh
+
+if [ -f "$iso_dir/initrd" ] ; then
+cp $iso_dir/initrd ${EFIIMGDIR}
+fi
+}
+
+efi_hddimg_populate() {
+ efi_populate $1
+}
+
inherit ${EFI_CLASS}
inherit ${PCBIOS_CLASS}
diff --git a/meta/classes/systemd-boot.bbclass
b/meta/classes/systemd-boot.bbclass
index bb3221dacca8..336c4c2ff58c 100644
--- a/meta/classes/systemd-boot.bbclass
+++ b/meta/classes/systemd-boot.bbclass
@@ -16,38 +16,20 @@ require conf/image-uefi.conf
inherit fs-uuid
efi_populate() {
-DEST=$1
+efi_populate_common "$1" systemd
-install -d ${DEST}${EFIDIR}
# systemd-boot requires these paths for configuration files
# they are not customizable so no point in new vars
install -d ${DEST}/loader
install -d ${DEST}/loader/entries
-install -m 0644 ${DEPLOY_DIR_IMAGE}/systemd-${EFI_BOOT_IMAGE}
${DEST}${EFIDIR}/${EFI_BOOT_IMAGE}
-EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g')
-printf 'fs0:%s\%s\n' "$EFIPATH" "${EFI_BOOT_IMAGE}"
>${DEST}/startup.nsh
install -m 0644 ${SYSTEMD_BOOT_CFG} ${DEST}/loader/loader.conf
for i in ${SYSTEMD_BOOT_ENTRIES}; do
install -m 0644 ${i} ${DEST}/loader/entries
done
}
-efi_iso_populate() {
-iso_dir=$1
-efi_populate $iso_dir
-mkdir -p ${EFIIMGDIR}/${EFIDIR}
-cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR}
+efi_iso_populate_append() {
cp -r $iso_dir/loader ${EFIIMGDIR}
-cp $iso_dir/${KERNEL_IMAGETYPE} ${EFIIMGDIR}
-EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g')
-echo "fs0:${EFIPATH}\\${EFI_BOOT_IMAGE}" > ${EFIIMGDIR}/startup.nsh
-if [ -f "$iso_dir/initrd" ] ; then
-cp $iso_dir/initrd ${EFIIMGDIR}
-fi
-}
-
-efi_hddimg_populate() {
-efi_populate $1
}
inherit systemd-boot-cfg
--
2.23.0
--
[OE-core] [PATCH v3 1/7] image-uefi.conf: add config file holding configuration for UEFI images
From: Dmitry Eremin-Solenikov
Create new config file defining common variables for all UEFI-related
packages (bootloaders, test applications, etc).
Signed-off-by: Dmitry Eremin-Solenikov
---
meta/conf/image-uefi.conf | 16
1 file changed, 16 insertions(+)
create mode 100644 meta/conf/image-uefi.conf
diff --git a/meta/conf/image-uefi.conf b/meta/conf/image-uefi.conf
new file mode 100644
index ..aaeff12ccb80
--- /dev/null
+++ b/meta/conf/image-uefi.conf
@@ -0,0 +1,16 @@
+# Location of EFI files inside EFI System Partition
+EFIDIR ?= "/EFI/BOOT"
+
+# Prefix where ESP is mounted inside rootfs. Set to empty if package is going
+# to be installed to ESP directly
+EFI_PREFIX ?= "/boot"
+
+# Location inside rootfs.
+EFI_FILES_PATH = "${EFI_PREFIX}${EFIDIR}"
+
+# Determine name of bootloader image
+EFI_BOOT_IMAGE ?= "bootINVALID.efi"
+EFI_BOOT_IMAGE_x86-64 = "bootx64.efi"
+EFI_BOOT_IMAGE_x86 = "bootia32.efi"
+EFI_BOOT_IMAGE_aarch64 = "bootaa64.efi"
+EFI_BOOT_IMAGE_arm = "bootarm.efi"
--
2.23.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for gcc: Security fix for CVE-2019-15847 (rev2)
== Series Details == Series: gcc: Security fix for CVE-2019-15847 (rev2) Revision: 2 URL : https://patchwork.openembedded.org/series/20014/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fixRebase your series on top of targeted branch Targeted branch warrior (currently at 952bfcc3f4) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] acpica: upgrade 20190509 -> 20190816
Signed-off-by: Ross Burton
---
.../acpica/{acpica_20190509.bb => acpica_20190816.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/acpica/{acpica_20190509.bb => acpica_20190816.bb}
(91%)
diff --git a/meta/recipes-extended/acpica/acpica_20190509.bb
b/meta/recipes-extended/acpica/acpica_20190816.bb
similarity index 91%
rename from meta/recipes-extended/acpica/acpica_20190509.bb
rename to meta/recipes-extended/acpica/acpica_20190816.bb
index cf6db336a6f..8f799747756 100644
--- a/meta/recipes-extended/acpica/acpica_20190509.bb
+++ b/meta/recipes-extended/acpica/acpica_20190816.bb
@@ -17,8 +17,8 @@ COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
DEPENDS = "bison flex bison-native"
SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz;
-SRC_URI[md5sum] = "dd1f8240f924b12b0a0de0c31ab26ab1"
-SRC_URI[sha256sum] =
"860b5f94a0590b278592acf16a4556b05ff0309c08e8c48aa29827cfa02c8e9d"
+SRC_URI[md5sum] = "6a73b1e34715916fa31132dbe11008b0"
+SRC_URI[sha256sum] =
"888e80f3bb77381620a5ead208e1a1be06f3ea66ddc8cfdfa62811cae5f03752"
UPSTREAM_CHECK_URI = "https://acpica.org/downloads;
S = "${WORKDIR}/acpica-unix2-${PV}"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] gdk-pixbuf: upgrade 2.38.1 -> 2.38.2
Signed-off-by: Ross Burton
---
.../gdk-pixbuf/{gdk-pixbuf_2.38.1.bb => gdk-pixbuf_2.38.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.38.1.bb =>
gdk-pixbuf_2.38.2.bb} (96%)
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.1.bb
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.2.bb
similarity index 96%
rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.1.bb
rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.2.bb
index eb1adb50504..0f3a63d8911 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.1.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.2.bb
@@ -29,8 +29,8 @@ SRC_URI_append_class-nativesdk = " \
file://0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch \
"
-SRC_URI[md5sum] = "f6ba2195acd18c5c9555421f30c31cc1"
-SRC_URI[sha256sum] =
"f19ff836ba991031610dcc53774e8ca436160f7d981867c8c3a37acfe493ab3a"
+SRC_URI[md5sum] = "cc1d712a1643b92ff0904d589963971f"
+SRC_URI[sha256sum] =
"73fa651ec0d89d73dd3070b129ce2203a66171dfc0bd2caa3570a9c93d2d0781"
inherit meson pkgconfig gettext pixbufcache ptest-gnome
upstream-version-is-even gobject-introspection gtk-doc lib_package
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] piglit: upgrade to latest revision
Signed-off-by: Ross Burton
---
meta/recipes-graphics/piglit/piglit_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb
b/meta/recipes-graphics/piglit/piglit_git.bb
index 0b6519e3f8e..d489f82b14b 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -8,7 +8,7 @@ SRC_URI =
"git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https \
"
UPSTREAM_CHECK_COMMITS = "1"
-SRCREV = "f0e868ac6fbdc295b2955c1b8f73169e7a52f938"
+SRCREV = "0d1a47a4c10d4dd7225bd6510f8191684b31235e"
# (when PV goes above 1.0 remove the trailing r)
PV = "1.0+gitr${SRCPV}"
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [warrior][PATCH] gcc: Security fix for CVE-2019-15847
From: Armin Kuster Affects <= 9.2.0 Dropped Changelog changes Signed-off-by: Armin Kuster --- meta/recipes-devtools/gcc/gcc-8.3.inc | 3 + .../gcc/gcc-8.3/CVE-2019-15847_p1.patch| 521 + .../gcc/gcc-8.3/CVE-2019-15847_p2.patch| 77 +++ .../gcc/gcc-8.3/CVE-2019-15847_p3.patch| 45 ++ 4 files changed, 646 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc-8.3/CVE-2019-15847_p1.patch create mode 100644 meta/recipes-devtools/gcc/gcc-8.3/CVE-2019-15847_p2.patch create mode 100644 meta/recipes-devtools/gcc/gcc-8.3/CVE-2019-15847_p3.patch diff --git a/meta/recipes-devtools/gcc/gcc-8.3.inc b/meta/recipes-devtools/gcc/gcc-8.3.inc index 80f716a..8548830 100644 --- a/meta/recipes-devtools/gcc/gcc-8.3.inc +++ b/meta/recipes-devtools/gcc/gcc-8.3.inc @@ -75,6 +75,9 @@ SRC_URI = "\ file://0042-PR-debug-86964.patch \ file://0043-PR85434-Prevent-spilling-of-stack-protector-guard-s-.patch \ file://CVE-2019-14250.patch \ + file://CVE-2019-15847_p1.patch \ + file://CVE-2019-15847_p2.patch \ + file://CVE-2019-15847_p3.patch \ " SRC_URI[md5sum] = "65b210b4bfe7e060051f799e0f994896" SRC_URI[sha256sum] = "64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c" diff --git a/meta/recipes-devtools/gcc/gcc-8.3/CVE-2019-15847_p1.patch b/meta/recipes-devtools/gcc/gcc-8.3/CVE-2019-15847_p1.patch new file mode 100644 index 000..6fb5afc --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-8.3/CVE-2019-15847_p1.patch @@ -0,0 +1,521 @@ +From baf7c861e1cc523425029dcf81467f16c734fbd5 Mon Sep 17 00:00:00 2001 +From: segher +Date: Fri, 30 Aug 2019 14:13:51 + +Subject: [PATCH 1/3] Backport from trunk 2019-08-22 Segher Boessenkool + + + * config/rs6000/altivec.md (unspec): Delete UNSPEC_DARN, UNSPEC_DARN_32, + UNSPEC_DARN_RAW, UNSPEC_CMPRB, UNSPEC_CMPRB2, UNSPEC_CMPEQB; move to... + * config/rs6000/rs6000.md (unspec): ... here. + * config/rs6000/altivec.md (darn_32, darn_raw, darn, cmprb, + *cmprb_internal, setb_signed, setb_unsigned, cmprb2, *cmprb2_internal, + cmpeqb, *cmpeqb_internal): Delete, move to... + * config/rs6000/rs6000.md (darn_32, darn_raw, darn, cmprb, + *cmprb_internal, setb_signed, setb_unsigned, cmprb2, *cmprb2_internal, + cmpeqb, *cmpeqb_internal): ... here. + + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-8-branch@275180 138bc75d-0d04-0410-961f-82ee72b054a4 + +Upstream-Status: Backport +CVE: CVE-2019-14847 p1 +Affects <= 9.2.0 +Dropped Changelog changes +Signed-off-by: Armin Kuster + +--- + gcc/config/rs6000/altivec.md | 223 -- + gcc/config/rs6000/rs6000.md | 224 +++ + 3 files changed, 239 insertions(+), 223 deletions(-) + +Index: gcc-8.3.0/gcc/config/rs6000/altivec.md +=== +--- gcc-8.3.0.orig/gcc/config/rs6000/altivec.md gcc-8.3.0/gcc/config/rs6000/altivec.md +@@ -80,9 +80,6 @@ +UNSPEC_VUPKHPX +UNSPEC_VUPKLPX +UNSPEC_CONVERT_4F32_8I16 +- UNSPEC_DARN +- UNSPEC_DARN_32 +- UNSPEC_DARN_RAW +UNSPEC_DST +UNSPEC_DSTT +UNSPEC_DSTST +@@ -161,9 +158,6 @@ +UNSPEC_BCDADD +UNSPEC_BCDSUB +UNSPEC_BCD_OVERFLOW +- UNSPEC_CMPRB +- UNSPEC_CMPRB2 +- UNSPEC_CMPEQB +UNSPEC_VRLMI +UNSPEC_VRLNM + ]) +@@ -4317,223 +4311,6 @@ + [(set_attr "length" "4") +(set_attr "type" "vecsimple")]) + +-(define_insn "darn_32" +- [(set (match_operand:SI 0 "register_operand" "=r") +-(unspec:SI [(const_int 0)] UNSPEC_DARN_32))] +- "TARGET_P9_MISC" +- "darn %0,0" +- [(set_attr "type" "integer")]) +- +-(define_insn "darn_raw" +- [(set (match_operand:DI 0 "register_operand" "=r") +-(unspec:DI [(const_int 0)] UNSPEC_DARN_RAW))] +- "TARGET_P9_MISC && TARGET_64BIT" +- "darn %0,2" +- [(set_attr "type" "integer")]) +- +-(define_insn "darn" +- [(set (match_operand:DI 0 "register_operand" "=r") +-(unspec:DI [(const_int 0)] UNSPEC_DARN))] +- "TARGET_P9_MISC && TARGET_64BIT" +- "darn %0,1" +- [(set_attr "type" "integer")]) +- +-;; Test byte within range. +-;; +-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx +-;; represents a byte whose value is ignored in this context and +-;; vv, the least significant byte, holds the byte value that is to +-;; be tested for membership within the range specified by operand 2. +-;; The bytes of operand 2 are organized as xx:xx:hi:lo. +-;; +-;; Return in target register operand 0 a value of 1 if lo <= vv and +-;; vv <= hi. Otherwise, set register operand 0 to 0. +-;; +-;; Though the instructions to which this expansion maps operate on +-;; 64-bit registers, the current implementation only operates on +-;; SI-mode operands as the high-order bits provide no information +-;; that is not already available in the low-order bits. To
[OE-core] [master][PATCH] gcc: Security fix for CVE-2019-15847
From: Armin Kuster
Affects <= 9.2.0
Dropped Changelog changes.
Signed-off-by: Armin Kuster
---
meta/recipes-devtools/gcc/gcc-9.2.inc | 3 +
.../gcc/gcc-9.2/CVE-2019-15847_1.patch| 521 ++
.../gcc/gcc-9.2/CVE-2019-15847_2.patch| 77 +++
.../gcc/gcc-9.2/CVE-2019-15847_3.patch| 62 +++
4 files changed, 663 insertions(+)
create mode 100644 meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_1.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_2.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_3.patch
diff --git a/meta/recipes-devtools/gcc/gcc-9.2.inc
b/meta/recipes-devtools/gcc/gcc-9.2.inc
index 01d3bf0f32..c6395998d5 100644
--- a/meta/recipes-devtools/gcc/gcc-9.2.inc
+++ b/meta/recipes-devtools/gcc/gcc-9.2.inc
@@ -65,6 +65,9 @@ SRC_URI = "\
file://0035-Fix-for-testsuite-failure.patch \
file://0036-Re-introduce-spe-commandline-options.patch \
file://CVE-2019-14250.patch \
+ file://CVE-2019-15847_1.patch \
+ file://CVE-2019-15847_2.patch \
+ file://CVE-2019-15847_3.patch \
"
S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
SRC_URI[md5sum] = "3818ad8600447f05349098232c2ddc78"
diff --git a/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_1.patch
b/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_1.patch
new file mode 100644
index 00..227fd47c95
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-9.2/CVE-2019-15847_1.patch
@@ -0,0 +1,521 @@
+From 8c61566116d23063ff597271884f8e00d94ab1a1 Mon Sep 17 00:00:00 2001
+From: segher
+Date: Fri, 30 Aug 2019 13:48:48 +
+Subject: [PATCH] Backport from trunk 2019-08-22 Segher Boessenkool
+
+
+ * config/rs6000/altivec.md (unspec): Delete UNSPEC_DARN, UNSPEC_DARN_32,
+ UNSPEC_DARN_RAW, UNSPEC_CMPRB, UNSPEC_CMPRB2, UNSPEC_CMPEQB; move to...
+ * config/rs6000/rs6000.md (unspec): ... here.
+ * config/rs6000/altivec.md (darn_32, darn_raw, darn, cmprb,
+ *cmprb_internal, setb_signed, setb_unsigned, cmprb2, *cmprb2_internal,
+ cmpeqb, *cmpeqb_internal): Delete, move to...
+ * config/rs6000/rs6000.md (darn_32, darn_raw, darn, cmprb,
+ *cmprb_internal, setb_signed, setb_unsigned, cmprb2, *cmprb2_internal,
+ cmpeqb, *cmpeqb_internal): ... here.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch@275170
138bc75d-0d04-0410-961f-82ee72b054a4
+
+Upstream-Status: Backport
+CVE: CVE-2019-15847 p1
+Affects <= 9.2.0
+Dropped Changelog changes
+Signed-off-by: Armin Kuster
+
+---
+ gcc/config/rs6000/altivec.md | 223 --
+ gcc/config/rs6000/rs6000.md | 224 +++
+ 3 files changed, 239 insertions(+), 223 deletions(-)
+
+Index: gcc-9.2.0/gcc/config/rs6000/altivec.md
+===
+--- gcc-9.2.0.orig/gcc/config/rs6000/altivec.md
gcc-9.2.0/gcc/config/rs6000/altivec.md
+@@ -80,9 +80,6 @@
+UNSPEC_VUPKHPX
+UNSPEC_VUPKLPX
+UNSPEC_CONVERT_4F32_8I16
+- UNSPEC_DARN
+- UNSPEC_DARN_32
+- UNSPEC_DARN_RAW
+UNSPEC_DST
+UNSPEC_DSTT
+UNSPEC_DSTST
+@@ -161,9 +158,6 @@
+UNSPEC_BCDADD
+UNSPEC_BCDSUB
+UNSPEC_BCD_OVERFLOW
+- UNSPEC_CMPRB
+- UNSPEC_CMPRB2
+- UNSPEC_CMPEQB
+UNSPEC_VRLMI
+UNSPEC_VRLNM
+ ])
+@@ -4101,223 +4095,6 @@
+ "bcd. %0,%1,%2,%3"
+ [(set_attr "type" "vecsimple")])
+
+-(define_insn "darn_32"
+- [(set (match_operand:SI 0 "register_operand" "=r")
+-(unspec:SI [(const_int 0)] UNSPEC_DARN_32))]
+- "TARGET_P9_MISC"
+- "darn %0,0"
+- [(set_attr "type" "integer")])
+-
+-(define_insn "darn_raw"
+- [(set (match_operand:DI 0 "register_operand" "=r")
+-(unspec:DI [(const_int 0)] UNSPEC_DARN_RAW))]
+- "TARGET_P9_MISC && TARGET_64BIT"
+- "darn %0,2"
+- [(set_attr "type" "integer")])
+-
+-(define_insn "darn"
+- [(set (match_operand:DI 0 "register_operand" "=r")
+-(unspec:DI [(const_int 0)] UNSPEC_DARN))]
+- "TARGET_P9_MISC && TARGET_64BIT"
+- "darn %0,1"
+- [(set_attr "type" "integer")])
+-
+-;; Test byte within range.
+-;;
+-;; The bytes of operand 1 are organized as xx:xx:xx:vv, where xx
+-;; represents a byte whose value is ignored in this context and
+-;; vv, the least significant byte, holds the byte value that is to
+-;; be tested for membership within the range specified by operand 2.
+-;; The bytes of operand 2 are organized as xx:xx:hi:lo.
+-;;
+-;; Return in target register operand 0 a value of 1 if lo <= vv and
+-;; vv <= hi. Otherwise, set register operand 0 to 0.
+-;;
+-;; Though the instructions to which this expansion maps operate on
+-;; 64-bit registers, the current implementation only operates on
+-;; SI-mode operands as the high-order bits provide no information
+-;; that is not already available in the low-order bits. To avoid the
+-;; costs of data widening operations, future enhancements might allow
+-;;
Re: [OE-core] [PATCH] openssl: Enable os option for with-rand-seed as well
Thanks for fix, I was seeing these issues in couple components using
nodejs-native (example bellow) and can confirm that this is now fixed.
internal/crypto/random.js:118
if (ex) throw ex;
^
Error: error:2406C06E:random number generator:RAND_DRBG_instantiate:error
retrieving entropy
at handleError (internal/crypto/random.js:117:14)
at Object.randomBytes (internal/crypto/random.js:52:19)
at
TOPDIR/BUILD/work/x86_64-linux/node-gyp-native/0.12.2+gitAUTOINC+7e98c99ce7-r4/recipe-sysroot-native/usr/lib/node_modules/npm/lib/npm.js:424:32
at Object.
(TOPDIR/BUILD/work/x86_64-linux/node-gyp-native/0.12.2+gitAUTOINC+7e98c99ce7-r4/recipe-sysroot-native/usr/lib/node_modules/npm/lib/npm.js:476:3)
at Module._compile (internal/modules/cjs/loader.js:778:30)
at Object.Module._extensions..js (internal/modules/cjs/loader.js:789:10)
at Module.load (internal/modules/cjs/loader.js:653:32)
at tryModuleLoad (internal/modules/cjs/loader.js:593:12)
at Function.Module._load (internal/modules/cjs/loader.js:585:3)
at Module.require (internal/modules/cjs/loader.js:692:17)
On Tue, Sep 17, 2019 at 8:50 PM Khem Raj wrote:
> with openSSL 1.1.1d we start seeing errors like
>
> Error Generating Key
> 139979727451584:error:2406C06E:random number
> generator:RAND_DRBG_instantiate:error retrieving
> entropy:../openssl-1.1.1d/crypto/rand/drbg_lib.c:342:
>
> when using openssl from openssl-native on build hosts, this is due to
> limiting the random seed to devrandom, to support older hosts, since the
> option allows to have a comma separated list of methods to try, we can
> try the default first and if that fails then fallback to devrandom, this
> will ensure that it keeps working with build systems which dont support
> getrandom()
>
> Signed-off-by: Khem Raj
> Cc: Adrian Bunk
> Cc: Alexander Kanavin
> ---
> meta/recipes-connectivity/openssl/openssl_1.1.1d.bb | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb
> b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb
> index 080d1a8bb7..072f727e0b 100644
> --- a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb
> +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb
> @@ -43,10 +43,10 @@ do_configure[cleandirs] = "${B}"
> EXTRA_OECONF_append_libc-musl = " no-async"
> EXTRA_OECONF_append_libc-musl_powerpc64 = " no-asm"
>
> -# This prevents openssl from using getrandom() which is not available on
> older glibc versions
> +# adding devrandom prevents openssl from using getrandom() which is not
> available on older glibc versions
> # (native versions can be built with newer glibc, but then relocated onto
> a system with older glibc)
> -EXTRA_OECONF_class-native = "--with-rand-seed=devrandom"
> -EXTRA_OECONF_class-nativesdk = "--with-rand-seed=devrandom"
> +EXTRA_OECONF_class-native = "--with-rand-seed=os,devrandom"
> +EXTRA_OECONF_class-nativesdk = "--with-rand-seed=os,devrandom"
>
> # Relying on hardcoded built-in paths causes openssl-native to not be
> relocateable from sstate.
> CFLAGS_append_class-native = " -DOPENSSLDIR=/not/builtin
> -DENGINESDIR=/not/builtin"
> --
> 2.23.0
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] systemd: Handle slow to boot mips hwdb update timeouts
This is a temporary workaround to avoid autobuilder failures until
https://github.com/systemd/systemd/issues/13581 is resolved.
Its being done globally even though its a mips problem for simplicity,
it doesn't hurt anything else to have a longer timeout.
Signed-off-by: Richard Purdie
---
meta/recipes-core/systemd/systemd_243.bb | 5 +
1 file changed, 5 insertions(+)
diff --git a/meta/recipes-core/systemd/systemd_243.bb
b/meta/recipes-core/systemd/systemd_243.bb
index 3ae1516dfb5..f0e8c569b81 100644
--- a/meta/recipes-core/systemd/systemd_243.bb
+++ b/meta/recipes-core/systemd/systemd_243.bb
@@ -298,6 +298,11 @@ do_install() {
install -Dm 0644 ${WORKDIR}/99-default.preset
${D}${systemd_unitdir}/system-preset/99-default.preset
}
+do_install_append () {
+ # Mips qemu is extremely slow, allow more time for the hwdb update
+ # This is a workaround until
https://github.com/systemd/systemd/issues/13581 is resolved
+ sed -i -e s#TimeoutSec=90s#TimeoutSec=180s#
${D}${systemd_unitdir}/system/systemd-hwdb-update.service
+}
python populate_packages_prepend (){
systemdlibdir = d.getVar("rootlibdir")
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] meta-extsdk: Either an sstate task is a proper task or it isn't
Ensure the task is properly regsistered as an sstate task as this
"half way" state confuses new code in bitbake and it isn't supported.
Signed-off-by: Richard Purdie
---
meta/recipes-core/meta/meta-extsdk-toolchain.bb | 5 +
1 file changed, 5 insertions(+)
diff --git a/meta/recipes-core/meta/meta-extsdk-toolchain.bb
b/meta/recipes-core/meta/meta-extsdk-toolchain.bb
index 235d6ecc0f4..b4009ceaa18 100644
--- a/meta/recipes-core/meta/meta-extsdk-toolchain.bb
+++ b/meta/recipes-core/meta/meta-extsdk-toolchain.bb
@@ -24,3 +24,8 @@ python do_locked_sigs() {
sigfile = os.path.join(outdir, 'locked-sigs-extsdk-toolchain.inc')
oe.copy_buildsystem.generate_locked_sigs(sigfile, d)
}
+
+python do_locked_sigs_setscene () {
+sstate_setscene(d)
+}
+addtask do_locked_sigs_setscene
--
2.20.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [master][PATCH v3] esdk: Introduce mechanism to keep nativesdk* sstate in esdk
When doing a devtool build-sdk from within an esdk all nativesdk
components would be rebuilt. This patch introduces SDK_INCLUDE_NATIVESDK
flag to toggle the inclusion of nativesdk packages when creating the
esdk sstate
Currently locked-sigs.inc is generated during do_sdk_depends which
doesn't pull in nativesdk packages. Generating another locked-sigs.inc
in do_populate_sdk_ext and pruning it to only nativesdk* packages by
using a modified version of the already existing function
prune_locked_sigs and merging it with the current locked-sigs.inc
Also adding SDK_INCLUDE_NATIVESDK tasklistfn to the logic surrounding
setting tasklist file to not prune esdk sstate during creation
Fixes [YOCTO #13261]
Signed-off-by: Jaewon Lee
---
changes in v2:
change to commit message to include reason
got rid of some tabs
rebased to apply on master
changes in v3:
fix patchwork failure for format of short commit message
---
meta/classes/populate_sdk_ext.bbclass | 28 +++-
meta/lib/oe/copy_buildsystem.py | 8 ++--
2 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/meta/classes/populate_sdk_ext.bbclass
b/meta/classes/populate_sdk_ext.bbclass
index 800e117..086f55d 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -20,6 +20,7 @@ SDK_EXT_task-populate-sdk-ext = "-ext"
SDK_EXT_TYPE ?= "full"
SDK_INCLUDE_PKGDATA ?= "0"
SDK_INCLUDE_TOOLCHAIN ?= "${@'1' if d.getVar('SDK_EXT_TYPE') == 'full' else
'0'}"
+SDK_INCLUDE_NATIVESDK ?= "0"
SDK_RECRDEP_TASKS ?= ""
@@ -401,9 +402,27 @@ python copy_buildsystem () {
excluded_targets = get_sdk_install_targets(d, images_only=True)
sigfile = d.getVar('WORKDIR') + '/locked-sigs.inc'
lockedsigs_pruned = baseoutpath + '/conf/locked-sigs.inc'
+#nativesdk-only sigfile to merge into locked-sigs.inc
+sdk_include_nativesdk = (d.getVar("SDK_INCLUDE_NATIVESDK") == '1')
+nativesigfile = d.getVar('WORKDIR') + '/locked-sigs_nativesdk.inc'
+nativesigfile_pruned = d.getVar('WORKDIR') +
'/locked-sigs_nativesdk_pruned.inc'
+
+if sdk_include_nativesdk:
+oe.copy_buildsystem.prune_lockedsigs([],
+ excluded_targets.split(),
+ nativesigfile,
+ True,
+ nativesigfile_pruned)
+
+oe.copy_buildsystem.merge_lockedsigs([],
+ sigfile,
+ nativesigfile_pruned,
+ sigfile)
+
oe.copy_buildsystem.prune_lockedsigs([],
excluded_targets.split(),
sigfile,
+ False,
lockedsigs_pruned)
sstate_out = baseoutpath + '/sstate-cache'
@@ -414,7 +433,7 @@ python copy_buildsystem () {
sdk_include_toolchain = (d.getVar('SDK_INCLUDE_TOOLCHAIN') == '1')
sdk_ext_type = d.getVar('SDK_EXT_TYPE')
-if sdk_ext_type != 'minimal' or sdk_include_toolchain or derivative:
+if (sdk_ext_type != 'minimal' or sdk_include_toolchain or derivative) and
not sdk_include_nativesdk:
# Create the filtered task list used to generate the sstate cache
shipped with the SDK
tasklistfn = d.getVar('WORKDIR') + '/tasklist.txt'
create_filtered_tasklist(d, baseoutpath, tasklistfn, conf_initpath)
@@ -657,9 +676,16 @@ fakeroot python do_populate_sdk_ext() {
d.setVar('SDKDEPLOYDIR', '${SDKEXTDEPLOYDIR}')
# ESDKs have a libc from the buildtools so ensure we don't ship linguas
twice
d.delVar('SDKIMAGE_LINGUAS')
+if d.getVar("SDK_INCLUDE_NATIVESDK") == '1':
+generate_nativesdk_lockedsigs(d)
populate_sdk_common(d)
}
+def generate_nativesdk_lockedsigs(d):
+import oe.copy_buildsystem
+sigfile = d.getVar('WORKDIR') + '/locked-sigs_nativesdk.inc'
+oe.copy_buildsystem.generate_locked_sigs(sigfile, d)
+
def get_ext_sdk_depends(d):
# Note: the deps varflag is a list not a string, so we need to specify
expand=False
deps = d.getVarFlag('do_image_complete', 'deps', False)
diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py
index cb663b2..31a84f5 100644
--- a/meta/lib/oe/copy_buildsystem.py
+++ b/meta/lib/oe/copy_buildsystem.py
@@ -177,7 +177,7 @@ def generate_locked_sigs(sigfile, d):
tasks = ['%s:%s' % (v[2], v[1]) for v in depd.values()]
bb.parse.siggen.dump_lockedsigs(sigfile, tasks)
-def prune_lockedsigs(excluded_tasks, excluded_targets, lockedsigs,
pruned_output):
+def prune_lockedsigs(excluded_tasks, excluded_targets, lockedsigs, onlynative,
pruned_output):
with open(lockedsigs, 'r') as infile:
bb.utils.mkdirhier(os.path.dirname(pruned_output))
with open(pruned_output, 'w') as
[OE-core] [PATCH] classes/archiver: Fix WORKDIR for shared source
When archiving patched source, WORKDIR should only be changed to
${ARCHIVER_WORKDIR} if the recipe doesn't use a shared work directory.
This matches the behavior of do_unpack_and_patch for these recipes.
This fixes kernel recipes that set S = "${WORKDIR}/git"
Signed-off-by: Joshua Watt
---
meta/classes/archiver.bbclass | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 13b05bb5f2f..093e2d95af5 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -221,9 +221,10 @@ python do_ar_patched() {
# Get the ARCHIVER_OUTDIR before we reset the WORKDIR
ar_outdir = d.getVar('ARCHIVER_OUTDIR')
-ar_workdir = d.getVar('ARCHIVER_WORKDIR')
+if not is_work_shared(d):
+ar_workdir = d.getVar('ARCHIVER_WORKDIR')
+d.setVar('WORKDIR', ar_workdir)
bb.note('Archiving the patched source...')
-d.setVar('WORKDIR', ar_workdir)
create_tarball(d, d.getVar('S'), 'patched', ar_outdir)
}
--
2.21.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libmpc: Remove dead UPSTREAM_CHECK_URI
On 9/18/19 11:28 AM, Adrian Bunk wrote:
> Signed-off-by: Adrian Bunk
> ---
> meta/recipes-support/libmpc/libmpc_1.1.0.bb | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/meta/recipes-support/libmpc/libmpc_1.1.0.bb
> b/meta/recipes-support/libmpc/libmpc_1.1.0.bb
> index 1e48c576d4..bbc673ff38 100644
> --- a/meta/recipes-support/libmpc/libmpc_1.1.0.bb
> +++ b/meta/recipes-support/libmpc/libmpc_1.1.0.bb
> @@ -8,8 +8,6 @@ SRC_URI = "${GNU_MIRROR}/mpc/mpc-${PV}.tar.gz"
> SRC_URI[md5sum] = "4125404e41e482ec68282a2e687f6c73"
> SRC_URI[sha256sum] =
> "6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e"
>
> -UPSTREAM_CHECK_URI = "http://www.multiprecision.org/mpc/download.html;
> -
Does the updating check still work in devtool or AUH?
- armin
> S = "${WORKDIR}/mpc-${PV}"
> BBCLASSEXTEND = "native nativesdk"
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libmpc: Remove dead UPSTREAM_CHECK_URI
On Wed, Sep 18, 2019 at 12:00:28PM -0700, akuster808 wrote:
>
>
> On 9/18/19 11:28 AM, Adrian Bunk wrote:
> > Signed-off-by: Adrian Bunk
> > ---
> > meta/recipes-support/libmpc/libmpc_1.1.0.bb | 2 --
> > 1 file changed, 2 deletions(-)
> >
> > diff --git a/meta/recipes-support/libmpc/libmpc_1.1.0.bb
> > b/meta/recipes-support/libmpc/libmpc_1.1.0.bb
> > index 1e48c576d4..bbc673ff38 100644
> > --- a/meta/recipes-support/libmpc/libmpc_1.1.0.bb
> > +++ b/meta/recipes-support/libmpc/libmpc_1.1.0.bb
> > @@ -8,8 +8,6 @@ SRC_URI = "${GNU_MIRROR}/mpc/mpc-${PV}.tar.gz"
> > SRC_URI[md5sum] = "4125404e41e482ec68282a2e687f6c73"
> > SRC_URI[sha256sum] =
> > "6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e"
> >
> > -UPSTREAM_CHECK_URI = "http://www.multiprecision.org/mpc/download.html;
> > -
> Does the updating check still work in devtool or AUH?
>...
What "still work"? The website no longer exists.
SRC_URI is GNU_MIRROR, that check does actually start working after the
UPSTREAM_CHECK_URI removal.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libmpc: Remove dead UPSTREAM_CHECK_URI
Signed-off-by: Adrian Bunk
---
meta/recipes-support/libmpc/libmpc_1.1.0.bb | 2 --
1 file changed, 2 deletions(-)
diff --git a/meta/recipes-support/libmpc/libmpc_1.1.0.bb
b/meta/recipes-support/libmpc/libmpc_1.1.0.bb
index 1e48c576d4..bbc673ff38 100644
--- a/meta/recipes-support/libmpc/libmpc_1.1.0.bb
+++ b/meta/recipes-support/libmpc/libmpc_1.1.0.bb
@@ -8,8 +8,6 @@ SRC_URI = "${GNU_MIRROR}/mpc/mpc-${PV}.tar.gz"
SRC_URI[md5sum] = "4125404e41e482ec68282a2e687f6c73"
SRC_URI[sha256sum] =
"6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e"
-UPSTREAM_CHECK_URI = "http://www.multiprecision.org/mpc/download.html;
-
S = "${WORKDIR}/mpc-${PV}"
BBCLASSEXTEND = "native nativesdk"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] lttng-modules: Upgrade 2.10.10 -> 2.10.11
Signed-off-by: Adrian Bunk
---
.../{lttng-modules_2.10.10.bb => lttng-modules_2.10.11.bb}| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-kernel/lttng/{lttng-modules_2.10.10.bb =>
lttng-modules_2.10.11.bb} (93%)
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.10.10.bb
b/meta/recipes-kernel/lttng/lttng-modules_2.10.11.bb
similarity index 93%
rename from meta/recipes-kernel/lttng/lttng-modules_2.10.10.bb
rename to meta/recipes-kernel/lttng/lttng-modules_2.10.11.bb
index dccc4b9842..789a3be850 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.10.10.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.10.11.bb
@@ -16,8 +16,8 @@ SRC_URI =
"https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
file://BUILD_RUNTIME_BUG_ON-vs-gcc7.patch \
"
-SRC_URI[md5sum] = "07c0b1ea4c1dd9d3edba8dc980fd93dd"
-SRC_URI[sha256sum] =
"e0d031005eef337c62de530a3b5b3e8fb1c732846eefcb23b8978edd2091f6e4"
+SRC_URI[md5sum] = "c618fb646514dfc1bf910cfd7cda4256"
+SRC_URI[sha256sum] =
"7f91e39b2e8e46d8bbba2b4c8c1614f1fb380611cd1a1fccc1d1859be26112f1"
export INSTALL_MOD_DIR="kernel/lttng-modules"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] lttng-ust: Upgrade 2.10.4 -> 2.10.5
Remove patch for issue fixed upstream.
Signed-off-by: Adrian Bunk
---
...config-time-check-for-new-gettid-API.patch | 57 ---
...ttng-ust_2.10.4.bb => lttng-ust_2.10.5.bb} | 5 +-
2 files changed, 2 insertions(+), 60 deletions(-)
delete mode 100644
meta/recipes-kernel/lttng/lttng-ust/0001-Add-config-time-check-for-new-gettid-API.patch
rename meta/recipes-kernel/lttng/{lttng-ust_2.10.4.bb => lttng-ust_2.10.5.bb}
(89%)
diff --git
a/meta/recipes-kernel/lttng/lttng-ust/0001-Add-config-time-check-for-new-gettid-API.patch
b/meta/recipes-kernel/lttng/lttng-ust/0001-Add-config-time-check-for-new-gettid-API.patch
deleted file mode 100644
index 15db1d3af7..00
---
a/meta/recipes-kernel/lttng/lttng-ust/0001-Add-config-time-check-for-new-gettid-API.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 2bb3e259d0410f16a8b2058a05af434376a1583a Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Fri, 26 Jul 2019 09:57:32 -0700
-Subject: [lttng-ust][PATCH] Add config time check for new gettid API
-
-glibc 2.30 introdoced this function see [1]
-so its best to detect it
-and provide fallbacks only if its not present
-
-[1] https://sourceware.org/bugzilla/show_bug.cgi?id=6399
-
-Upstream-Status: Submitted
[https://lists.lttng.org/pipermail/lttng-dev/2019-July/029131.html]
-
-Signed-off-by: Khem Raj
- configure.ac| 1 +
- include/lttng/ust-tid.h | 7 +--
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7fa059a..b1099c1 100644
a/configure.ac
-+++ b/configure.ac
-@@ -137,6 +137,7 @@ AC_CHECK_FUNCS([ \
- clock_gettime \
- ftruncate \
- getpagesize \
-+ gettid \
- gettimeofday \
- localeconv \
- memchr \
-diff --git a/include/lttng/ust-tid.h b/include/lttng/ust-tid.h
-index e669d7e..7995c78 100644
a/include/lttng/ust-tid.h
-+++ b/include/lttng/ust-tid.h
-@@ -26,7 +26,10 @@
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE
- * SOFTWARE.
- */
--
-+#include
-+#if HAVE_GETTID
-+#include
-+#else
- #ifdef __linux__
- #include
- #endif
-@@ -49,5 +52,5 @@ static inline pid_t gettid(void)
- return getpid();
- }
- #endif
--
-+#endif /* HAVE_GETTID */
- #endif /* _LTTNG_UST_TID_H */
---
-2.22.0
-
diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.10.4.bb
b/meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb
similarity index 89%
rename from meta/recipes-kernel/lttng/lttng-ust_2.10.4.bb
rename to meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb
index 861a05e6a8..e8312afb26 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_2.10.4.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb
@@ -27,11 +27,10 @@ PE = "2"
SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \
file://lttng-ust-doc-examples-disable.patch \
- file://0001-Add-config-time-check-for-new-gettid-API.patch \
"
-SRC_URI[md5sum] = "19916ff0dec23c90f985586a8cbd1fd2"
-SRC_URI[sha256sum] =
"75d5b4bb205c444a343e1297e14cd3a2503fc645a26710531cbd319c72c1a967"
+SRC_URI[md5sum] = "f0c86a9fa7dcfd0205fb42584a310b1c"
+SRC_URI[sha256sum] =
"06f9ed9b2198855b1c7fcbf15fe57297ee259409ffa1b3bad87321412d98bc35"
CVE_PRODUCT = "ust"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] glib-2.0: Upgrade 2.60.6 -> 2.60.7
Signed-off-by: Adrian Bunk
---
.../glib-2.0/{glib-2.0_2.60.6.bb => glib-2.0_2.60.7.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-core/glib-2.0/{glib-2.0_2.60.6.bb => glib-2.0_2.60.7.bb}
(88%)
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.60.6.bb
b/meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
similarity index 88%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.60.6.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
index a3c5a09d41..740473719d 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.60.6.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.60.7.bb
@@ -21,5 +21,5 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz
\
SRC_URI_append_class-native = " file://relocate-modules.patch"
SRC_URI_append_class-target = " file://glib-meson.cross"
-SRC_URI[md5sum] = "cd6865d8ce40db5e4c12b7d180953de6"
-SRC_URI[sha256sum] =
"ff8fab8d8deaa4fd0536c90f90d9769a09071779c7e6183907f6855645bffb6c"
+SRC_URI[md5sum] = "f036f78a7fca330d9f7d939fcf794bde"
+SRC_URI[sha256sum] =
"8b12c0af569afd3b71200556ad751bad4cf4bf7bc4b5f880638459a42ca86310"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] squashfs-tools: Remove UPSTREAM_CHECK_COMMITS
Upstream is making releases again. Signed-off-by: Adrian Bunk --- meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb index ab2ff01b62..51e4a5939d 100644 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb @@ -10,7 +10,6 @@ SRCREV = "f95864afe8833fe3ad782d714b41378e860977b1" SRC_URI = "git://github.com/plougher/squashfs-tools.git;protocol=https \ file://squashfs-tools-4.3-sysmacros.patch;striplevel=2 \ " -UPSTREAM_CHECK_COMMITS = "1" SRC_URI[lzma.md5sum] = "29d5ffd03a5a3e51aef6a74e9eafb759" SRC_URI[lzma.sha256sum] = "c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e0880aa0fa1e" -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kernel.bbclass: fix installation of modules signing certificates
hi Armin,
On Sun, Jul 28, 2019 at 12:01 PM Dmitry Eremin-Solenikov
wrote:
>
> From: Dmitry Eremin-Solenikov
>
> If one has provided external key/certificate for modules signing, Kbuild
> will skip creating signing_key.pem and will write only signing_key.x509
> certificate. Thus we have to check for .x509 file existence rather than
> .pem one.
>
> Signed-off-by: Dmitry Eremin-Solenikov
This patch applies cleanly on warrior and thud, and it's a bug fix,
when the use provides its own private certificate to sign kernel
modules. I have spent quite a bit of time in this area this week,
sadly i was working with thud branch, fixed my issue and found out
that master didn't have the issue!
Any chance this can be pulled in thud and warrior? Feel free to add my
Signed-off tag , once again cherry-pick just works.
>
> ---
> meta/classes/kernel.bbclass | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index a60e15b57814..bf3674238f02 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -454,7 +454,7 @@ do_shared_workdir () {
> cp .config $kerneldir/
> mkdir -p $kerneldir/include/config
> cp include/config/kernel.release
> $kerneldir/include/config/kernel.release
> - if [ -e certs/signing_key.pem ]; then
> + if [ -e certs/signing_key.x509 ]; then
> # The signing_key.* files are stored in the certs/ dir in
> # newer Linux kernels
> mkdir -p $kerneldir/certs
> --
> 2.20.1
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] u-boot: add CVE patches for u-boot
From: Limeng
Add 9 patches to fix below CVE issues.
CVE-2019-13103
CVE-2019-13104
CVE-2019-13105
CVE-2019-13106
CVE-2019-14192
CVE-2019-14193
CVE-2019-14194
CVE-2019-14195
CVE-2019-14196
CVE-2019-14197
CVE-2019-14198
CVE-2019-14199
CVE-2019-14200
CVE-2019-14201
CVE-2019-14202
CVE-2019-14203
CVE-2019-14204
Signed-off-by: Meng Li
---
.../u-boot/files/0001-CVE-2019-13103.patch| 69 +++
.../u-boot/files/0002-CVE-2019-13104.patch| 49 +
.../u-boot/files/0003-CVE-2019-13105.patch| 37 ++
.../u-boot/files/0004-CVE-2019-13106.patch| 56 +++
.../0005-CVE-2019-14192-14193-14199.patch | 43
...-14197-14200-14201-14202-14203-14204.patch | 44
.../files/0007-CVE-2019-14194-14198.patch | 42 +++
.../u-boot/files/0008-CVE-2019-14195.patch| 42 +++
.../u-boot/files/0009-CVE-2019-14196.patch| 48 +
meta/recipes-bsp/u-boot/u-boot-common.inc | 12 +++-
10 files changed, 441 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-bsp/u-boot/files/0001-CVE-2019-13103.patch
create mode 100644 meta/recipes-bsp/u-boot/files/0002-CVE-2019-13104.patch
create mode 100644 meta/recipes-bsp/u-boot/files/0003-CVE-2019-13105.patch
create mode 100644 meta/recipes-bsp/u-boot/files/0004-CVE-2019-13106.patch
create mode 100644
meta/recipes-bsp/u-boot/files/0005-CVE-2019-14192-14193-14199.patch
create mode 100644
meta/recipes-bsp/u-boot/files/0006-CVE-2019-14197-14200-14201-14202-14203-14204.patch
create mode 100644
meta/recipes-bsp/u-boot/files/0007-CVE-2019-14194-14198.patch
create mode 100644 meta/recipes-bsp/u-boot/files/0008-CVE-2019-14195.patch
create mode 100644 meta/recipes-bsp/u-boot/files/0009-CVE-2019-14196.patch
diff --git a/meta/recipes-bsp/u-boot/files/0001-CVE-2019-13103.patch
b/meta/recipes-bsp/u-boot/files/0001-CVE-2019-13103.patch
new file mode 100644
index 00..1a5d1eb996
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/files/0001-CVE-2019-13103.patch
@@ -0,0 +1,69 @@
+From 39a759494f734c4cdc3e2b919671bfb3134b41ae Mon Sep 17 00:00:00 2001
+From: Paul Emge
+Date: Mon, 8 Jul 2019 16:37:03 -0700
+Subject: [PATCH 1/9] CVE-2019-13103: disk: stop infinite recursion in DOS
+ Partitions
+
+part_get_info_extended and print_partition_extended can recurse infinitely
+while parsing a self-referential filesystem or one with a silly number of
+extended partitions. This patch adds a limit to the number of recursive
+partitions.
+
+Signed-off-by: Paul Emge
+
+Upstream-Status: Backport[http://git.denx.de/?p=u-boot.git;a=commit;
+ h=232e2f4fd9a24bf08215ddc8c53ccadffc841fb5]
+
+CVE: CVE-2019-13103
+
+Signed-off-by: Meng Li
+---
+ disk/part_dos.c | 18 ++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/disk/part_dos.c b/disk/part_dos.c
+index 936cee0d36..aae9d95906 100644
+--- a/disk/part_dos.c
b/disk/part_dos.c
+@@ -23,6 +23,10 @@
+
+ #define DOS_PART_DEFAULT_SECTOR 512
+
++/* should this be configurable? It looks like it's not very common at all
++ * to use large numbers of partitions */
++#define MAX_EXT_PARTS 256
++
+ /* Convert char[4] in little endian format to the host format integer
+ */
+ static inline unsigned int le32_to_int(unsigned char *le32)
+@@ -126,6 +130,13 @@ static void print_partition_extended(struct blk_desc
*dev_desc,
+ dos_partition_t *pt;
+ int i;
+
++ /* set a maximum recursion level */
++ if (part_num > MAX_EXT_PARTS)
++ {
++ printf("** Nested DOS partitions detected, stopping **\n");
++ return;
++}
++
+ if (blk_dread(dev_desc, ext_part_sector, 1, (ulong *)buffer) != 1) {
+ printf ("** Can't read partition table on %d:" LBAFU " **\n",
+ dev_desc->devnum, ext_part_sector);
+@@ -191,6 +202,13 @@ static int part_get_info_extended(struct blk_desc
*dev_desc,
+ int i;
+ int dos_type;
+
++ /* set a maximum recursion level */
++ if (part_num > MAX_EXT_PARTS)
++ {
++ printf("** Nested DOS partitions detected, stopping **\n");
++ return -1;
++}
++
+ if (blk_dread(dev_desc, ext_part_sector, 1, (ulong *)buffer) != 1) {
+ printf ("** Can't read partition table on %d:" LBAFU " **\n",
+ dev_desc->devnum, ext_part_sector);
+--
+2.17.1
+
diff --git a/meta/recipes-bsp/u-boot/files/0002-CVE-2019-13104.patch
b/meta/recipes-bsp/u-boot/files/0002-CVE-2019-13104.patch
new file mode 100644
index 00..de122b27d0
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/files/0002-CVE-2019-13104.patch
@@ -0,0 +1,49 @@
+From 1d36545e43003f4b1bb3a303a3b468abd482fa2f Mon Sep 17 00:00:00 2001
+From: Paul Emge
+Date: Mon, 8 Jul 2019 16:37:05 -0700
+Subject: [PATCH 2/9] CVE-2019-13104: ext4: check for underflow in
+ ext4fs_read_file
+
+in ext4fs_read_file, it is possible for a broken/malicious file
+system to cause a memcpy of a negative number of
[OE-core] [yocto] : u-boot: add CVE patches for u-boot
From: Limeng Add 9 patches to fix below CVE issues. CVE-2019-13103 CVE-2019-13104 CVE-2019-13105 CVE-2019-13106 CVE-2019-14192 CVE-2019-14193 CVE-2019-14194 CVE-2019-14195 CVE-2019-14196 CVE-2019-14197 CVE-2019-14198 CVE-2019-14199 CVE-2019-14200 CVE-2019-14201 CVE-2019-14202 CVE-2019-14203 CVE-2019-14204 Detail patches as below: 0001-u-boot-add-CVE-patches-for-u-boot.patch files/0001-CVE-2019-13103.patch | 69 ++ files/0002-CVE-2019-13104.patch | 49 +++ files/0003-CVE-2019-13105.patch | 37 + files/0004-CVE-2019-13106.patch | 56 files/0005-CVE-2019-14192-14193-14199.patch | 43 ++ files/0006-CVE-2019-14197-14200-14201-14202-14203-14204.patch | 44 ++ files/0007-CVE-2019-14194-14198.patch | 42 ++ files/0008-CVE-2019-14195.patch | 42 ++ files/0009-CVE-2019-14196.patch | 48 ++ u-boot-common.inc | 12 + 10 files changed, 441 insertions(+), 1 deletion(-) thanks, Limeng -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] bison:upgrade 3.4.1 -> 3.4.2
Signed-off-by: Zang Ruochen
---
meta/recipes-devtools/bison/{bison_3.4.1.bb => bison_3.4.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/bison/{bison_3.4.1.bb => bison_3.4.2.bb} (90%)
diff --git a/meta/recipes-devtools/bison/bison_3.4.1.bb
b/meta/recipes-devtools/bison/bison_3.4.2.bb
similarity index 90%
rename from meta/recipes-devtools/bison/bison_3.4.1.bb
rename to meta/recipes-devtools/bison/bison_3.4.2.bb
index 7946e20..46f0f90 100644
--- a/meta/recipes-devtools/bison/bison_3.4.1.bb
+++ b/meta/recipes-devtools/bison/bison_3.4.2.bb
@@ -17,8 +17,8 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \
# No point in hardcoding path to m4, just use PATH
EXTRA_OECONF += "M4=m4"
-SRC_URI[md5sum] = "201286a573b12da109df96282fe4ff4a"
-SRC_URI[sha256sum] =
"27159ac5ebf736dffd5636fd2cd625767c9e437de65baa63cb0de83570bd820d"
+SRC_URI[md5sum] = "d1ceb9dfde2d03b24a4c1137f7f1b572"
+SRC_URI[sha256sum] =
"27d05534699735dc69e86add5b808d6cb35900ad3fd63fa82e3eb644336abfa0"
inherit autotools gettext texinfo
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
