Re: [OE-core] [PATCH v6] u-boot: Add mkenvimage tool
On Thu, Nov 22, 2018 at 10:47 AM Alexey Brodkin wrote: > > Hi Otavio, > > On Thu, 2018-11-22 at 07:30 -0200, Otavio Salvador wrote: > > Hello Alexey, > > > > On Thu, Nov 22, 2018 at 6:28 AM Alexey Brodkin > > wrote: > > > This utility is used for creation of images containing > > > usable in run-time U-Boot environment. > > > > > > As of today this utility is added per-board like here [1] > > > for Intel Edison board. > > > > > > [1] > > > https://urldefense.proofpoint.com/v2/url?u=http-3A__git.yoctoproject.org_cgit_cgit.cgi_meta-2Dintel-2Dedison_tree_meta-2Dintel-2Dedison-2Dbsp_recipes-2Dbsp_u-2Dboot_u-2Dboot-2Dtools-5F2014.04.bb&d=DwICAg&c=DPL6_X_6JkXFx7AXWqB0tg&r=lqdeeSSEes0GFDDl656eViXO7breS55ytWkhpk5R81I&m=0oSj04biS8fsfFjYHNTIfKozS-TUjseTTeyuKHHcljA&s=hpwGEnrX5gArYJHLxYhMZ4x6s3irTZyCMjjnFipip7k&e= > > > > > > Given there're quite some U-Boot tools that we may want to add later > > > this recipe name switch from "u-boot-mkimage" to generic "u-boot-tools" > > > still for compatibility we provide "u-boot-mkimage" with help > > > of PROVIDES as well as proposed "u-boot-mkenvimage". > > > > > > Signed-off-by: Alexey Brodkin > > > Cc: Richard Purdie > > > Cc: Otavio Salvador > > > Cc: Martin Jansa > > > Cc: Ross Burton > > > Cc: Marek Vasut > > > > Acked-by: Otavio Salvador > > > > I'd like to thank you to keep the pace until it was ready. I know it > > may be challenging to contribute to new projects and OpenEmbedded is > > no different. > > > > You were very welcoming to comments and change requests and I believe > > it was a great thread of changes which lead to a good patch. I look > > forward to the new patches you'll start submitting from now on :-) > > I'd like to thank you guys as well for being patient and providing > meaningful comments for my naive and sometime silly changes. > > And sure there will be more patches as now we start using OE > for quite some projects basically trying to get ARC up to speed > in OE as good as possible and given our architecture differs a bit > from others (as any other arch) we're not only adding features but > more fix issues that were not seen before due to pure luck... > like we typically have 8k MMU page a bit exotic int64_t alignment > by 32 bits etc so there'll be more stuff from us in the foreseeable > future :) Looking forward to show the iterations behind this series to contribution newbies. It's a good example of when things work well both sides! I had this little piece of u-boot-tools flying around in several projects, but never found the time to figure out a reasonable approach to reconcile it cleanly with the other u-boot components. Of course, I'm first of all showing myself that I'd have better contributed it at first to leverage all suggestions that came out of this discussion. Thanks Alexey for taking care of this all! -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] archiver.bbclass: Fix COPYLEFT_LICENSE_{IN, EX}CLUDE
Setting them to empty before inheriting copyleft_filter made them not getting their documented values there. Signed-off-by: Adrian Bunk --- meta/classes/archiver.bbclass | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 0a9fe4fd1d..e321a0e362 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -23,9 +23,6 @@ #COPYLEFT_RECIPE_TYPES = 'target' # -# Don't filter the license by default -COPYLEFT_LICENSE_INCLUDE ?= '' -COPYLEFT_LICENSE_EXCLUDE ?= '' # Create archive for all the recipe types COPYLEFT_RECIPE_TYPES ?= 'target native nativesdk cross crosssdk cross-canadian' inherit copyleft_filter -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH v2 0/1] systemd: fix PN-container package splitting
Changes from v1
RDEPENDS_${PN}-container += "${PN}-journal-upload...
to
RRECOMMENDS_${PN}-container += "${PN}-journal-upload...
to handle the case where journal-upload is not built
Tested with
local.conf:
DISTRO_FEATURES_append = ' systemd'
VIRTUAL-RUNTIME_init_manager = 'systemd'
TEST_SUITES_append = ' systemd'
command:
bitbake core-image-sato -c testimage
Adrian Freihofer (1):
systemd: fix PN-container package splitting
meta/recipes-core/systemd/systemd_239.bb | 61
1 file changed, 53 insertions(+), 8 deletions(-)
--
2.19.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH v2 1/1] systemd: fix PN-container package splitting
- Fix package splitting for services installed with
systemd-container. Some files have been installed with systemd
package instead of systemd-container package. (*.service,
*.socket, *.html...)
- Split journal-upload, journal-remote, journal-gatewayd into
separate packages. These services are not strictly related to
nspawn containers. Remote logging is now possible without
installing all the container stuff.
- systemd-container package rrecommends journal-upload, journal-
remote, journal-gatewayd packages.
Signed-off-by: Adrian Freihofer
---
meta/recipes-core/systemd/systemd_239.bb | 61
1 file changed, 53 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-core/systemd/systemd_239.bb
b/meta/recipes-core/systemd/systemd_239.bb
index e19a8babce..c53ce0d78e 100644
--- a/meta/recipes-core/systemd/systemd_239.bb
+++ b/meta/recipes-core/systemd/systemd_239.bb
@@ -240,6 +240,9 @@ do_install() {
# Delete journal README, as log can be symlinked inside volatile.
rm -f ${D}/${localstatedir}/log/README
+ # journal-remote creates this at start
+ rm -rf ${D}/${localstatedir}/log/journal/remote
+
install -d ${D}${systemd_unitdir}/system/graphical.target.wants
install -d ${D}${systemd_unitdir}/system/multi-user.target.wants
install -d ${D}${systemd_unitdir}/system/poweroff.target.wants
@@ -310,19 +313,35 @@ PACKAGES =+ "\
${PN}-zsh-completion \
${PN}-xorg-xinitrc \
${PN}-container \
+${PN}-journal-gatewayd \
+${PN}-journal-upload \
+${PN}-journal-remote \
${PN}-extra-utils \
"
SUMMARY_${PN}-container = "Tools for containers and VMs"
DESCRIPTION_${PN}-container = "Systemd tools to spawn and manage containers
and virtual machines."
-SYSTEMD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt',
'${PN}-binfmt', '', d)}"
+SUMMARY_${PN}-journal-gatewayd = "HTTP server for journal events"
+DESCRIPTION_${PN}-journal-gatewayd = "systemd-journal-gatewayd serves journal
events over the network. Clients must connect using HTTP. The server listens on
port 19531 by default."
+
+SUMMARY_${PN}-journal-upload = "Send journal messages over the network"
+DESCRIPTION_${PN}-journal-upload = "systemd-journal-upload uploads journal
entries to a specified URL."
+
+SUMMARY_${PN}-journal-remote = "Receive journal messages over the network"
+DESCRIPTION_${PN}-journal-remote = "systemd-journal-remote is a command to
receive serialized journal events and store them to journal files."
+
+SYSTEMD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt',
'${PN}-binfmt', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'microhttpd',
'${PN}-journal-gatewayd', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', 'journal-upload',
'${PN}-journal-upload', '', d)} \
+${@bb.utils.contains('PACKAGECONFIG', '',
'${PN}-journal-remote', '', d)} \
+"
SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service"
-USERADD_PACKAGES = "${PN} ${PN}-extra-utils"
-USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'microhttpd',
'--system -d / -M --shell /bin/nologin systemd-journal-gateway;', '', d)}"
-USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'microhttpd',
'--system -d / -M --shell /bin/nologin systemd-journal-remote;', '', d)}"
-USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG',
'journal-upload', '--system -d / -M --shell /bin/nologin
systemd-journal-upload;', '', d)}"
+USERADD_PACKAGES = "${PN} ${PN}-extra-utils ${PN}-journal-gateway
${PN}-journal-upload ${PN}-journal-remote"
+USERADD_PARAM_${PN}-journal-gateway += "${@bb.utils.contains('PACKAGECONFIG',
'microhttpd', '--system -d / -M --shell /bin/nologin systemd-journal-gateway;',
'', d)}"
+USERADD_PARAM_${PN}-journal-remote += "${@bb.utils.contains('PACKAGECONFIG',
'microhttpd', '--system -d / -M --shell /bin/nologin systemd-journal-remote;',
'', d)}"
+USERADD_PARAM_${PN}-journal-upload += "${@bb.utils.contains('PACKAGECONFIG',
'journal-upload', '--system -d / -M --shell /bin/nologin
systemd-journal-upload;', '', d)}"
USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'timesyncd',
'--system -d / -M --shell /bin/nologin systemd-timesync;', '', d)}"
USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd',
'--system -d / -M --shell /bin/nologin systemd-network;', '', d)}"
USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump',
'--system -d / -M --shell /bin/nologin systemd-coredump;', '', d)}"
@@ -363,6 +382,29 @@ RRECOMMENDS_${PN}-binfmt = "kernel-module-binfmt-misc"
RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps"
+
+FILES_${PN}-journal-gatewayd =
"${rootlibexecdir}/systemd/systemd-journal-gatewayd \
+
${systemd_system_unitdir}/systemd-journal-gatewayd.service \
+
${systemd_system_unitdir}/systemd-journal-gatewayd.so
Re: [OE-core] [PATCH] Revert "terminal.bbclass: use var-SHELL as the shebang of wrapper script"
On 2018/11/25 上午9:11, Peter Kjellerstedt wrote:
The $SHELL environment variable is used for the user's preferred
interactive shell. This shall not be used when executing shell scripts
that expect POSIX shell syntax as there is no guarantee that it is a
POSIX compatible shell.
There is a sanity check to `/bin/sh' to dash or bash
`eaa0dc2 sanity.bbclass: Only verify /bin/sh link if it's a link'
`ecdfdd7 sanity.bbclass: check /bin/sh is dash or bash'
This reverts commit 27e2ede65f1193e49f9483b08a55495d88740a65.
Signed-off-by: Peter Kjellerstedt
---
In my case, $SHELL is set to /bin/zsh, with the result that devshell
fails to start. If there is some problem with devshell related to
/bin/sh being linked to dash rather than bash (which the original
commit indicates), then that should be adressed instead.
Hongxu: Do you have any additional information related to why you made
the change in the first place?
If revert this patch, we will have the issue which this patch have fixed.
There is another patch in mailing list that fix the issue you report
[OE-core] [PATCH] devshell.bbclass/terminal.bbclass: add a shell check
at devshell
While var-SHELL is neither `bash' or `dash', such as
`csh', loading the wrapper script will fail at devshell,
because csh does not support syntax `export'.
Add a shell check at devshell, and use `/bin/sh' to replace
if shell is neither `bash' or `dash'. `/bin/sh' is safe to
use since `ecdfdd7 sanity.bbclass: check /bin/sh is dash
or bash'
Signed-off-by: Hongxu Jia
---
meta/classes/devshell.bbclass | 4
meta/classes/terminal.bbclass | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass
index fdf7dc1..c4765db 100644
--- a/meta/classes/devshell.bbclass
+++ b/meta/classes/devshell.bbclass
@@ -3,6 +3,10 @@ inherit terminal
DEVSHELL = "${SHELL}"
python do_devshell () {
+ devshell = d.getVar('DEVSHELL')
+ devshell = devshell if devshell.endswith("bash") or
devshell.endswith("dash") else '/bin/sh'
+ d.setVar('DEVSHELL', devshell)
+
if d.getVarFlag("do_devshell", "manualfakeroot"):
d.prependVar("DEVSHELL", "pseudo ")
fakeenv = d.getVar("FAKEROOTENV").split()
diff --git a/meta/classes/terminal.bbclass b/meta/classes/terminal.bbclass
index 73e765d..f427538 100644
--- a/meta/classes/terminal.bbclass
+++ b/meta/classes/terminal.bbclass
@@ -25,7 +25,9 @@ def emit_terminal_func(command, envdata, d):
bb.utils.mkdirhier(os.path.dirname(runfile))
with open(runfile, 'w') as script:
- script.write('#!/usr/bin/env %s\n' % d.getVar('SHELL'))
+ shell = d.getVar('SHELL')
+ shell = shell if shell.endswith("bash") or
shell.endswith("dash") else '/bin/sh'
+ script.write('#!/usr/bin/env %s\n' % shell)
script.write('set -e\n')
bb.data.emit_func(cmd_func, script, envdata)
script.write(cmd_func)
//Hongxu
meta/classes/terminal.bbclass | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta/classes/terminal.bbclass b/meta/classes/terminal.bbclass
index 73e765d57a..a27e10c6ec 100644
--- a/meta/classes/terminal.bbclass
+++ b/meta/classes/terminal.bbclass
@@ -25,8 +25,7 @@ def emit_terminal_func(command, envdata, d):
bb.utils.mkdirhier(os.path.dirname(runfile))
with open(runfile, 'w') as script:
-script.write('#!/usr/bin/env %s\n' % d.getVar('SHELL'))
-script.write('set -e\n')
+script.write('#!/bin/sh -e\n')
bb.data.emit_func(cmd_func, script, envdata)
script.write(cmd_func)
script.write("\n")
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] nspr: improve reproducibility
Ping.
Thanks,
On 2018年11月16日 15:09, mingli...@windriver.com wrote:
From: Mingli Yu
Remove _BUILD_STRING and _BUILD_TIME in _pl_bld.h
to avoid introducing timestamp in the .so library
such as libnspr4.so as below:
$ readelf --wide --decompress --hex-dump=.rodata libnspr4.so
[snip]
0x4000 32303138 2d31312d 31352030 353a3439 2018-11-15 05:49
[snip]
[YOCTO #12639]
Signed-off-by: Mingli Yu
---
...remove-_BUILD_STRING-and-_BUILD_TIME.patch | 103 ++
meta/recipes-support/nspr/nspr_4.20.bb| 1 +
2 files changed, 104 insertions(+)
create mode 100644
meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch
diff --git
a/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch
b/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch
new file mode 100644
index 00..90fe45f34d
--- /dev/null
+++
b/meta/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch
@@ -0,0 +1,103 @@
+From 8a592e4ead4ed6befe6044da3dd2dc7523c33905 Mon Sep 17 00:00:00 2001
+From: Mingli Yu
+Date: Fri, 16 Nov 2018 13:52:49 +0800
+Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME
+
+Remove _BUILD_STRING and _BUILD_TIME to avoid
+adding timestamp to _pl_bld.h which can result
+in adding timestamp in library file such as
+libnspr4.so.
+ $ readelf --wide --decompress --hex-dump=.rodata libnspr4.so
+ [snip]
+ 0x4000 32303138 2d31312d 31352030 353a3439 2018-11-15 05:49
+ [snip]
+
+Upstream-Status: Pending
+
+Signed-off-by: Mingli Yu
+---
+ lib/ds/Makefile.in| 8 +---
+ lib/libc/src/Makefile.in | 8 +---
+ lib/prstreams/Makefile.in | 8 +---
+ pr/src/Makefile.in| 8 +---
+ 4 files changed, 4 insertions(+), 28 deletions(-)
+
+diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in
+index e737791..b578476 100644
+--- a/lib/ds/Makefile.in
b/lib/ds/Makefile.in
+@@ -114,13 +114,7 @@ GARBAGE += $(TINC)
+
+ $(TINC):
+ @$(MAKE_OBJDIR)
+- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
+- @if test ! -z "$(SH_NOW)"; then \
+- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
+- else \
+- true; \
+- fi
+- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC)
+
+
+ $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
+diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in
+index e8a6d9f..978ed28 100644
+--- a/lib/libc/src/Makefile.in
b/lib/libc/src/Makefile.in
+@@ -116,13 +116,7 @@ GARBAGE += $(TINC)
+
+ $(TINC):
+ @$(MAKE_OBJDIR)
+- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
+- @if test ! -z "$(SH_NOW)"; then \
+- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
+- else \
+- true; \
+- fi
+- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC)
+
+
+ $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
+diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in
+index aeb2944..f318097 100644
+--- a/lib/prstreams/Makefile.in
b/lib/prstreams/Makefile.in
+@@ -116,13 +116,7 @@ endif
+
+ $(TINC):
+ @$(MAKE_OBJDIR)
+- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
+- @if test ! -z "$(SH_NOW)"; then \
+- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
+- else \
+- true; \
+- fi
+- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC)
+
+
+ $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
+diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in
+index 19c5a69..b4ac31c 100644
+--- a/pr/src/Makefile.in
b/pr/src/Makefile.in
+@@ -326,13 +326,7 @@ GARBAGE += $(TINC)
+
+ $(TINC):
+ @$(MAKE_OBJDIR)
+- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
+- @if test ! -z "$(SH_NOW)"; then \
+- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
+- else \
+- true; \
+- fi
+- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
++ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC)
+
+
+ $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC)
+--
+2.7.4
+
diff --git a/meta/recipes-support/nspr/nspr_4.20.bb
b/meta/recipes-support/nspr/nspr_4.20.bb
index fe3b4bd2ed..98ca909631 100644
--- a/meta/recipes-support/nspr/nspr_4.20.bb
+++ b/meta/recipes-support/nspr/nspr_4.20.bb
@@ -12,6 +12,7 @@ SRC_URI =
"http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz
file://0002-Add-nios2-support.patch \
file://0001-md-Fix-build-with-musl.patch \
file://0004-Add-ARC-support.patch \
+ file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \
file://nspr.pc.in \
"
--
___
O
Re: [OE-core] [PATCH] devshell.bbclass/terminal.bbclass: add a shell check at devshell
Ping, any comments?
//Hongxu
On 2018/9/3 下午3:09, Hongxu Jia wrote:
While var-SHELL is neither `bash' or `dash', such as
`csh', loading the wrapper script will fail at devshell,
because csh does not support syntax `export'.
Add a shell check at devshell, and use `/bin/sh' to replace
if shell is neither `bash' or `dash'. `/bin/sh' is safe to
use since `ecdfdd7 sanity.bbclass: check /bin/sh is dash
or bash'
Signed-off-by: Hongxu Jia
---
meta/classes/devshell.bbclass | 4
meta/classes/terminal.bbclass | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass
index fdf7dc1..c4765db 100644
--- a/meta/classes/devshell.bbclass
+++ b/meta/classes/devshell.bbclass
@@ -3,6 +3,10 @@ inherit terminal
DEVSHELL = "${SHELL}"
python do_devshell () {
+devshell = d.getVar('DEVSHELL')
+devshell = devshell if devshell.endswith("bash") or
devshell.endswith("dash") else '/bin/sh'
+d.setVar('DEVSHELL', devshell)
+
if d.getVarFlag("do_devshell", "manualfakeroot"):
d.prependVar("DEVSHELL", "pseudo ")
fakeenv = d.getVar("FAKEROOTENV").split()
diff --git a/meta/classes/terminal.bbclass b/meta/classes/terminal.bbclass
index 73e765d..f427538 100644
--- a/meta/classes/terminal.bbclass
+++ b/meta/classes/terminal.bbclass
@@ -25,7 +25,9 @@ def emit_terminal_func(command, envdata, d):
bb.utils.mkdirhier(os.path.dirname(runfile))
with open(runfile, 'w') as script:
-script.write('#!/usr/bin/env %s\n' % d.getVar('SHELL'))
+shell = d.getVar('SHELL')
+shell = shell if shell.endswith("bash") or shell.endswith("dash") else
'/bin/sh'
+script.write('#!/usr/bin/env %s\n' % shell)
script.write('set -e\n')
bb.data.emit_func(cmd_func, script, envdata)
script.write(cmd_func)
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] multilib_script: fix packages split
From: Kai Kang The following changes since commit 6bf94ad3b6a3f1202e86b500bfce205d0bda977e: u-boot: Upgrade 2018.07 -> 2018.11 (2018-11-23 23:35:20 +) are available in the Git repository at: git://git.pokylinux.org/poky-contrib kangkai/ml_script http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/ml_script Kai Kang (1): multilib_script: fix packages split meta/classes/multilib_script.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.19.0.rc2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] multilib_script: fix packages split
From: Kai Kang
In multilib_script.bbclass it renames script file which listed in
MULTILIB_SCRIPTS. It may mix up packages split. Take package curl as
example, ${bindir}/curl-config is packaged to curl-dev originally. But
it is renamed to curl-config-${MULTILIB_SUFFIX} and packaged to curl
when multilib is enabled.
And expand 'pkg' to fix QA warning:
| WARNING: Variable key FILES_${PN}-dev (
| ${bindir}/curl-config-${MULTILIB_SUFFIX}) replaces original key
| FILES_curl-dev (${includedir} ${FILES_SOLIBSDEV} ... ${bindir}/*-config)
Insert a necessary space to the argument 'value' of d.appendVar() as well.
Signed-off-by: Kai Kang
---
meta/classes/multilib_script.bbclass | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/classes/multilib_script.bbclass
b/meta/classes/multilib_script.bbclass
index 51c9fcc12c..dc166d06c1 100644
--- a/meta/classes/multilib_script.bbclass
+++ b/meta/classes/multilib_script.bbclass
@@ -24,9 +24,11 @@ python () {
for entry in (d.getVar("MULTILIB_SCRIPTS", False) or "").split():
pkg, script = entry.split(":")
+ epkg = d.expand(pkg)
scriptname = os.path.basename(script)
- d.appendVar("ALTERNATIVE_" + pkg, scriptname + " ")
+ d.appendVar("ALTERNATIVE_" + epkg, " " + scriptname + " ")
d.setVarFlag("ALTERNATIVE_LINK_NAME", scriptname, script)
d.setVarFlag("ALTERNATIVE_TARGET", scriptname, script +
"-${MULTILIB_SUFFIX}")
d.appendVar("multilibscript_rename", "\n mv ${PKGD}" + script +
" ${PKGD}" + script + "-${MULTILIB_SUFFIX}")
+ d.appendVar("FILES_" + epkg, " " + script + "-${MULTILIB_SUFFIX}")
}
--
2.19.0.rc2
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] netbase: add entry to /etc/hosts according to /etc/hostname
We default hostname to ${MACHINE}, but it's not in /etc/hosts,
resulting in commands like `hostname -f' failing due to lack
of entry.
So add entry to /etc/hosts according to /etc/hostname. We do
this via pkg_postinst because hostname is set in base-files
recipe.
Signed-off-by: Chen Qi
---
meta/recipes-core/netbase/netbase_5.4.bb | 9 +
1 file changed, 9 insertions(+)
diff --git a/meta/recipes-core/netbase/netbase_5.4.bb
b/meta/recipes-core/netbase/netbase_5.4.bb
index 5ab0c58..384c430 100644
--- a/meta/recipes-core/netbase/netbase_5.4.bb
+++ b/meta/recipes-core/netbase/netbase_5.4.bb
@@ -23,3 +23,12 @@ do_install () {
}
CONFFILES_${PN} = "${sysconfdir}/hosts"
+
+RDEPENDS_${PN} += "base-files"
+
+pkg_postinst_${PN} () {
+ if [ -s $D/etc/hostname ]; then
+ hostname=`cat $D/etc/hostname`
+ echo "127.0.1.1 $hostname" >> $D/etc/hosts
+ fi
+}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] netbase: add entry to /etc/hosts according to /etc/hostname
The following changes since commit 6bf94ad3b6a3f1202e86b500bfce205d0bda977e: u-boot: Upgrade 2018.07 -> 2018.11 (2018-11-23 23:35:20 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib ChenQi/netbase-hosts http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/netbase-hosts Chen Qi (1): netbase: add entry to /etc/hosts according to /etc/hostname meta/recipes-core/netbase/netbase_5.4.bb | 9 + 1 file changed, 9 insertions(+) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
