* [OE-core][dunfell 0/7] Patch review
@ 2020-09-18 16:15 Steve Sakoman
2020-09-18 16:15 ` [OE-core][dunfell 1/7] systemd-serialgetty: Fix sed expression quoting Steve Sakoman
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Steve Sakoman @ 2020-09-18 16:15 UTC (permalink / raw)
To: openembedded-core
Please review this next set of patches for dunfell and have comments back
by end of day Monday.
The following changes since commit b98e50f08b2bcf61fbc75ea1b0ad83a17c0a736a:
cve-check: avoid FileNotFoundError if no do_cve_check task has run (2020-09-14 04:26:37 -1000)
are available in the Git repository at:
git://git.openembedded.org/openembedded-core-contrib stable/dunfell-nut
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/dunfell-nut
Christophe GUIBOUT (1):
initramfs-framework: support kernel cmdline with double quotes
Geoff Parker (1):
systemd-serialgetty: Replace sed quoting using ' with " to allow var
expansion
Khem Raj (1):
populate_sdk_ext: Do not assume local.conf will always exist
Michael Gloff (1):
sysvinit: Remove ${B} assignment
Pierre-Jean Texier (1):
libubootenv: upgrade 0.3 -> 0.3.1
Rahul Kumar (1):
systemd-serialgetty: Fix sed expression quoting
Steve Sakoman (1):
Revert "kernel.bbclass: run do_symlink_kernsrc before do_patch"
meta/classes/kernel.bbclass | 2 +-
meta/classes/populate_sdk_ext.bbclass | 5 +++--
.../{libubootenv_0.3.bb => libubootenv_0.3.1.bb} | 2 +-
.../initrdscripts/initramfs-framework/init | 13 +++++++++++++
meta/recipes-core/systemd/systemd-serialgetty.bb | 4 ++--
meta/recipes-core/sysvinit/sysvinit_2.96.bb | 1 -
6 files changed, 20 insertions(+), 7 deletions(-)
rename meta/recipes-bsp/u-boot/{libubootenv_0.3.bb => libubootenv_0.3.1.bb} (94%)
--
2.17.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [OE-core][dunfell 1/7] systemd-serialgetty: Fix sed expression quoting
2020-09-18 16:15 [OE-core][dunfell 0/7] Patch review Steve Sakoman
@ 2020-09-18 16:15 ` Steve Sakoman
2020-09-18 16:15 ` [OE-core][dunfell 2/7] systemd-serialgetty: Replace sed quoting using ' with " to allow var expansion Steve Sakoman
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Steve Sakoman @ 2020-09-18 16:15 UTC (permalink / raw)
To: openembedded-core
From: Rahul Kumar <rahulk@mvista.com>
Fix sed: -e expression #1, char 13: unterminated `s' command
Error Message:
| NOTE: Installed into sysroot: []
| NOTE: Skipping as already exists in sysroot: ['pseudo-native', 'glibc', 'patch-native', 'quilt-native', 'gcc-cross-arm', 'gcc-runtime', 'linux-libc-headers', 'libgcc', 'flex-native', 'xz-native', 'libtool-native', 'automake-native', 'binutils-cross-arm', 'zlib-native', 'mpfr-native', 'texinfo-dummy-native', 'autoconf-native', 'libmpc-native', 'gnu-config-native', 'gmp-native', 'attr-native', 'm4-native', 'gettext-minimal-native']
| DEBUG: Python function extend_recipe_sysroot finished
| DEBUG: Executing shell function do_install
| sed: -e expression #1, char 13: unterminated `s' command
| WARNING: exit code 1 from a shell command.
| ERROR: Execution of '/opt/Projects/poky/build/tmp/work/qemux86_64-poky-linux/systemd-serialgetty/1.0-r5/temp/run.do_install.11228' failed with exit code 1:
| sed: -e expression #1, char 13: unterminated `s' command
| WARNING: exit code 1 from a shell command.
|
To Fix this Issue using the strong (single quote) character in sed command.
It is recommend to use quotes. If we have meta-characters in the command, quotes are necessary.
Signed-off-by: Rahul Kumar <rahulk@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e2fea05e150dcfec4b7dfbd8edddb53897026bf9)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-core/systemd/systemd-serialgetty.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb b/meta/recipes-core/systemd/systemd-serialgetty.bb
index 044c6c5b67..059fccc2b6 100644
--- a/meta/recipes-core/systemd/systemd-serialgetty.bb
+++ b/meta/recipes-core/systemd/systemd-serialgetty.bb
@@ -21,7 +21,7 @@ do_install() {
install -d ${D}${systemd_unitdir}/system/
install -d ${D}${sysconfdir}/systemd/system/getty.target.wants/
install -m 0644 ${WORKDIR}/serial-getty@.service ${D}${systemd_unitdir}/system/
- sed -i -e s/\@BAUDRATE\@/$default_baudrate/g ${D}${systemd_unitdir}/system/serial-getty@.service
+ sed -i -e 's/\@BAUDRATE\@/$default_baudrate/g' ${D}${systemd_unitdir}/system/serial-getty@.service
tmp="${SERIAL_CONSOLES}"
for entry in $tmp ; do
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [OE-core][dunfell 2/7] systemd-serialgetty: Replace sed quoting using ' with " to allow var expansion
2020-09-18 16:15 [OE-core][dunfell 0/7] Patch review Steve Sakoman
2020-09-18 16:15 ` [OE-core][dunfell 1/7] systemd-serialgetty: Fix sed expression quoting Steve Sakoman
@ 2020-09-18 16:15 ` Steve Sakoman
2020-09-18 16:15 ` [OE-core][dunfell 3/7] initramfs-framework: support kernel cmdline with double quotes Steve Sakoman
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Steve Sakoman @ 2020-09-18 16:15 UTC (permalink / raw)
To: openembedded-core
From: Geoff Parker <geoffhp@gmail.com>
A recent commit added single quotes around the sed regex's. This prevented the
expansion of $default_baudrate in do_install(), and ended up with systemd's'
serial-getty@.service file having a literal $default_baudrate.
This broke the serial console getty service.
serial-getty@.service was getting a line which looked like this:
ExecStart=-/sbin/agetty -8 -L %I $default_baudrate $TERM
Rather than:
ExecStart=-/sbin/agetty -8 -L %I 115200 $TERM
Fixed by repacing the single quotes with double quotes in the sed expressions.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 80b721bfa4fe300a2f52f233f44fa2835426d304)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-core/systemd/systemd-serialgetty.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb b/meta/recipes-core/systemd/systemd-serialgetty.bb
index 059fccc2b6..0cc0dc8c79 100644
--- a/meta/recipes-core/systemd/systemd-serialgetty.bb
+++ b/meta/recipes-core/systemd/systemd-serialgetty.bb
@@ -21,7 +21,7 @@ do_install() {
install -d ${D}${systemd_unitdir}/system/
install -d ${D}${sysconfdir}/systemd/system/getty.target.wants/
install -m 0644 ${WORKDIR}/serial-getty@.service ${D}${systemd_unitdir}/system/
- sed -i -e 's/\@BAUDRATE\@/$default_baudrate/g' ${D}${systemd_unitdir}/system/serial-getty@.service
+ sed -i -e "s/\@BAUDRATE\@/$default_baudrate/g" ${D}${systemd_unitdir}/system/serial-getty@.service
tmp="${SERIAL_CONSOLES}"
for entry in $tmp ; do
@@ -34,7 +34,7 @@ do_install() {
else
# install custom service file for the non-default baudrate
install -m 0644 ${WORKDIR}/serial-getty@.service ${D}${systemd_unitdir}/system/serial-getty$baudrate@.service
- sed -i -e s/\@BAUDRATE\@/$baudrate/g ${D}${systemd_unitdir}/system/serial-getty$baudrate@.service
+ sed -i -e "s/\@BAUDRATE\@/$baudrate/g" ${D}${systemd_unitdir}/system/serial-getty$baudrate@.service
# enable the service
ln -sf ${systemd_unitdir}/system/serial-getty$baudrate@.service \
${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty$baudrate@$ttydev.service
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [OE-core][dunfell 3/7] initramfs-framework: support kernel cmdline with double quotes
2020-09-18 16:15 [OE-core][dunfell 0/7] Patch review Steve Sakoman
2020-09-18 16:15 ` [OE-core][dunfell 1/7] systemd-serialgetty: Fix sed expression quoting Steve Sakoman
2020-09-18 16:15 ` [OE-core][dunfell 2/7] systemd-serialgetty: Replace sed quoting using ' with " to allow var expansion Steve Sakoman
@ 2020-09-18 16:15 ` Steve Sakoman
2020-09-18 16:15 ` [OE-core][dunfell 4/7] libubootenv: upgrade 0.3 -> 0.3.1 Steve Sakoman
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Steve Sakoman @ 2020-09-18 16:15 UTC (permalink / raw)
To: openembedded-core
From: Christophe GUIBOUT <christophe.guibout@st.com>
It avoids init to crash when kernel cmdline contains a string with
spaces inside, like that:
dyndbg="file drivers/usb/core/hub.c +pltf"
Signed-off-by: Christophe Guibout <christophe.guibout@st.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 88b8b94bd2d052bca29d27bd5cd00eddb0f5999d)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../initrdscripts/initramfs-framework/init | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/init b/meta/recipes-core/initrdscripts/initramfs-framework/init
index c71ce0ce8c..567694aff7 100755
--- a/meta/recipes-core/initrdscripts/initramfs-framework/init
+++ b/meta/recipes-core/initrdscripts/initramfs-framework/init
@@ -88,12 +88,25 @@ fi
# populate bootparam environment
for p in `cat /proc/cmdline`; do
+ if [ -n "$quoted" ]; then
+ value="$value $p"
+ if [ "`echo $p | sed -e 's/\"$//'`" != "$p" ]; then
+ eval "bootparam_${quoted}=${value}"
+ unset quoted
+ fi
+ continue
+ fi
+
opt=`echo $p | cut -d'=' -f1`
opt=`echo $opt | sed -e 'y/.-/__/'`
if [ "`echo $p | cut -d'=' -f1`" = "$p" ]; then
eval "bootparam_${opt}=true"
else
value="`echo $p | cut -d'=' -f2-`"
+ if [ "`echo $value | sed -e 's/^\"//'`" != "$value" ]; then
+ quoted=${opt}
+ continue
+ fi
eval "bootparam_${opt}=\"${value}\""
fi
done
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [OE-core][dunfell 4/7] libubootenv: upgrade 0.3 -> 0.3.1
2020-09-18 16:15 [OE-core][dunfell 0/7] Patch review Steve Sakoman
` (2 preceding siblings ...)
2020-09-18 16:15 ` [OE-core][dunfell 3/7] initramfs-framework: support kernel cmdline with double quotes Steve Sakoman
@ 2020-09-18 16:15 ` Steve Sakoman
2020-09-18 16:15 ` [OE-core][dunfell 5/7] sysvinit: Remove ${B} assignment Steve Sakoman
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Steve Sakoman @ 2020-09-18 16:15 UTC (permalink / raw)
To: openembedded-core
From: Pierre-Jean Texier <pjtexier@koncepto.io>
This is a bugfix release which includes the following changes:
824551a Prepare 0.3.1
ca6aaa1 Fix file reading/writing when the environment is in EEPROM
a031dea Fix regression in UBI volume support
c91c150 Define SOVERSION to indicate API version
Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 447eb941ef43cd5af19aed650fb7da718cedda61)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../u-boot/{libubootenv_0.3.bb => libubootenv_0.3.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-bsp/u-boot/{libubootenv_0.3.bb => libubootenv_0.3.1.bb} (94%)
diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.3.bb b/meta/recipes-bsp/u-boot/libubootenv_0.3.1.bb
similarity index 94%
rename from meta/recipes-bsp/u-boot/libubootenv_0.3.bb
rename to meta/recipes-bsp/u-boot/libubootenv_0.3.1.bb
index 07711484ac..613e3161fb 100644
--- a/meta/recipes-bsp/u-boot/libubootenv_0.3.bb
+++ b/meta/recipes-bsp/u-boot/libubootenv_0.3.1.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b36
SECTION = "libs"
SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https"
-SRCREV = "ad253cfdb07c8492f2ee46a52fbc607ad0b96414"
+SRCREV = "824551ac77bab1d0f7ae34d7a7c77b155240e754"
S = "${WORKDIR}/git"
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [OE-core][dunfell 5/7] sysvinit: Remove ${B} assignment
2020-09-18 16:15 [OE-core][dunfell 0/7] Patch review Steve Sakoman
` (3 preceding siblings ...)
2020-09-18 16:15 ` [OE-core][dunfell 4/7] libubootenv: upgrade 0.3 -> 0.3.1 Steve Sakoman
@ 2020-09-18 16:15 ` Steve Sakoman
2020-09-18 16:15 ` [OE-core][dunfell 6/7] populate_sdk_ext: Do not assume local.conf will always exist Steve Sakoman
2020-09-18 16:15 ` [OE-core][dunfell 7/7] Revert "kernel.bbclass: run do_symlink_kernsrc before do_patch" Steve Sakoman
6 siblings, 0 replies; 8+ messages in thread
From: Steve Sakoman @ 2020-09-18 16:15 UTC (permalink / raw)
To: openembedded-core
From: Michael Gloff <mgloff@emacinc.com>
The VERSION variable is not set unless the
top level Makefile is used as the version is
derived from the Changelog.
If VERSION is not set, none of the binaries built
in the sysvinit recipe will have a valid version
output.
Before:
INIT: version booting
After:
INIT: version 2.96 booting
Using the top level Makefile does not cause any
additional builds to occur.
Signed-off-by: Michael Gloff <mgloff@emacinc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 10992ad4f343d0f92d9d6246cc2e58effd3f3eeb)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-core/sysvinit/sysvinit_2.96.bb | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta/recipes-core/sysvinit/sysvinit_2.96.bb b/meta/recipes-core/sysvinit/sysvinit_2.96.bb
index d2b85ed9c0..7358f02385 100644
--- a/meta/recipes-core/sysvinit/sysvinit_2.96.bb
+++ b/meta/recipes-core/sysvinit/sysvinit_2.96.bb
@@ -25,7 +25,6 @@ SRC_URI[md5sum] = "48cebffebf2a96ab09bec14bf9976016"
SRC_URI[sha256sum] = "2a2e26b72aa235a23ab1c8471005f890309ce1196c83fbc9413c57b9ab62b587"
S = "${WORKDIR}/sysvinit-${PV}"
-B = "${S}/src"
inherit update-alternatives features_check
DEPENDS_append = " update-rc.d-native base-passwd virtual/crypt"
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [OE-core][dunfell 6/7] populate_sdk_ext: Do not assume local.conf will always exist
2020-09-18 16:15 [OE-core][dunfell 0/7] Patch review Steve Sakoman
` (4 preceding siblings ...)
2020-09-18 16:15 ` [OE-core][dunfell 5/7] sysvinit: Remove ${B} assignment Steve Sakoman
@ 2020-09-18 16:15 ` Steve Sakoman
2020-09-18 16:15 ` [OE-core][dunfell 7/7] Revert "kernel.bbclass: run do_symlink_kernsrc before do_patch" Steve Sakoman
6 siblings, 0 replies; 8+ messages in thread
From: Steve Sakoman @ 2020-09-18 16:15 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Some distros may not have local.conf, and use auto.conf or site.conf
alone to describe distro config metadata, therefore make code robust
to not fail eSDK builds for such setups
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 6379f951ba92b2b86a55de5fc267bacf8c6095d2)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/classes/populate_sdk_ext.bbclass | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index fd0da16e7e..71686bc993 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -310,8 +310,9 @@ python copy_buildsystem () {
if os.path.exists(builddir + '/conf/auto.conf'):
with open(builddir + '/conf/auto.conf', 'r') as f:
oldlines += f.readlines()
- with open(builddir + '/conf/local.conf', 'r') as f:
- oldlines += f.readlines()
+ if os.path.exists(builddir + '/conf/local.conf'):
+ with open(builddir + '/conf/local.conf', 'r') as f:
+ oldlines += f.readlines()
(updated, newlines) = bb.utils.edit_metadata(oldlines, varlist, handle_var)
with open(baseoutpath + '/conf/local.conf', 'w') as f:
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [OE-core][dunfell 7/7] Revert "kernel.bbclass: run do_symlink_kernsrc before do_patch"
2020-09-18 16:15 [OE-core][dunfell 0/7] Patch review Steve Sakoman
` (5 preceding siblings ...)
2020-09-18 16:15 ` [OE-core][dunfell 6/7] populate_sdk_ext: Do not assume local.conf will always exist Steve Sakoman
@ 2020-09-18 16:15 ` Steve Sakoman
6 siblings, 0 replies; 8+ messages in thread
From: Steve Sakoman @ 2020-09-18 16:15 UTC (permalink / raw)
To: openembedded-core
This reverts commit 914d8a00e34a8edf75a349da6f5978e4ed60e6d5.
Due to bug introduced for externalsrc
https://bugzilla.yoctoproject.org/show_bug.cgi?id=14044
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
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 9eb9bd2844..9e3c34ad48 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -152,7 +152,7 @@ python do_symlink_kernsrc () {
shutil.move(s, kernsrc)
os.symlink(kernsrc, s)
}
-addtask symlink_kernsrc before do_patch after do_unpack
+addtask symlink_kernsrc before do_configure after do_unpack
inherit kernel-arch deploy
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-09-18 16:15 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-18 16:15 [OE-core][dunfell 0/7] Patch review Steve Sakoman
2020-09-18 16:15 ` [OE-core][dunfell 1/7] systemd-serialgetty: Fix sed expression quoting Steve Sakoman
2020-09-18 16:15 ` [OE-core][dunfell 2/7] systemd-serialgetty: Replace sed quoting using ' with " to allow var expansion Steve Sakoman
2020-09-18 16:15 ` [OE-core][dunfell 3/7] initramfs-framework: support kernel cmdline with double quotes Steve Sakoman
2020-09-18 16:15 ` [OE-core][dunfell 4/7] libubootenv: upgrade 0.3 -> 0.3.1 Steve Sakoman
2020-09-18 16:15 ` [OE-core][dunfell 5/7] sysvinit: Remove ${B} assignment Steve Sakoman
2020-09-18 16:15 ` [OE-core][dunfell 6/7] populate_sdk_ext: Do not assume local.conf will always exist Steve Sakoman
2020-09-18 16:15 ` [OE-core][dunfell 7/7] Revert "kernel.bbclass: run do_symlink_kernsrc before do_patch" Steve Sakoman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.