Re: [OE-core][kirkstone][PATCH] openssh: fix CVE-2023-28531
On Tue, Jun 13, 2023 at 12:08 AM Steve Sakoman wrote: > > On Mon, Jun 12, 2023 at 4:00 PM Ricardo Salveti wrote: > > > > Hi, > > > > Was looking if CVE-2023-28531 was backported to kirkstone already and > > noticed this patch was already proposed before, but not > > merged/accepted. > > Sigh, it looks like I somehow missed this one and no one followed up on it :-( > > I've got it in my test queue now. > > Thanks for letting me know! Awesome, thanks! -- Ricardo Salveti -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#182718): https://lists.openembedded.org/g/openembedded-core/message/182718 Mute This Topic: https://lists.openembedded.org/mt/97901027/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core][kirkstone][PATCH] openssh: fix CVE-2023-28531
Hi,
Was looking if CVE-2023-28531 was backported to kirkstone already and
noticed this patch was already proposed before, but not
merged/accepted.
Since it showed up once in the metrics report, was it decided to be
ignored in the end (but then I wasn't able to find it defined in
CVE_CHECK_IGNORE)?
Thanks,
Ricardo
On Tue, Mar 28, 2023 at 5:42 AM Chen Qi wrote:
>
> Backport patch to fix CVE-2023-28531.
>
> Signed-off-by: Chen Qi
> ---
> ...-destination-constraints-for-smartca.patch | 35 +++
> .../openssh/openssh_8.9p1.bb | 1 +
> 2 files changed, 36 insertions(+)
> create mode 100644
> meta/recipes-connectivity/openssh/openssh/0001-upstream-include-destination-constraints-for-smartca.patch
>
> diff --git
> a/meta/recipes-connectivity/openssh/openssh/0001-upstream-include-destination-constraints-for-smartca.patch
>
> b/meta/recipes-connectivity/openssh/openssh/0001-upstream-include-destination-constraints-for-smartca.patch
> new file mode 100644
> index 00..b4e7ce7ef6
> --- /dev/null
> +++
> b/meta/recipes-connectivity/openssh/openssh/0001-upstream-include-destination-constraints-for-smartca.patch
> @@ -0,0 +1,35 @@
> +From 91889b5a3e7554af474a21ce8e1ffd3eb1542f06 Mon Sep 17 00:00:00 2001
> +From: "d...@openbsd.org"
> +Date: Thu, 9 Mar 2023 06:58:26 +
> +Subject: [PATCH] upstream: include destination constraints for smartcard keys
> + too.
> +
> +Spotted by Luci Stanescu; ok deraadt@ markus@
> +
> +OpenBSD-Commit-ID: add879fac6903a1cb1d1e42c4309e5359c3d870f
> +
> +CVE: CVE-2023-28531
> +
> +Upstream-Status: Backport [54ac4ab2b53ce9fcb66b8250dee91c070e4167ed]
> +
> +Signed-off-by: Chen Qi
> +---
> + authfd.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/authfd.c b/authfd.c
> +index 76e48aab..dca8e55b 100644
> +--- a/authfd.c
> b/authfd.c
> +@@ -665,7 +665,7 @@ ssh_update_card(int sock, int add, const char
> *reader_id, const char *pin,
> + struct dest_constraint **dest_constraints, size_t ndest_constraints)
> + {
> + struct sshbuf *msg;
> +- int r, constrained = (life || confirm);
> ++ int r, constrained = (life || confirm || dest_constraints);
> + u_char type;
> +
> + if (add) {
> +--
> +2.37.1
> +
> diff --git a/meta/recipes-connectivity/openssh/openssh_8.9p1.bb
> b/meta/recipes-connectivity/openssh/openssh_8.9p1.bb
> index 6057d055f4..d81072537c 100644
> --- a/meta/recipes-connectivity/openssh/openssh_8.9p1.bb
> +++ b/meta/recipes-connectivity/openssh/openssh_8.9p1.bb
> @@ -26,6 +26,7 @@ SRC_URI =
> "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
> file://add-test-support-for-busybox.patch \
> file://f107467179428a0e3ea9e4aa9738ac12ff02822d.patch \
>
> file://0001-Default-to-not-using-sandbox-when-cross-compiling.patch \
> +
> file://0001-upstream-include-destination-constraints-for-smartca.patch \
> "
> SRC_URI[sha256sum] =
> "fd497654b7ab1686dac672fb83dfb4ba4096e8b5ffcdaccd262380ae58bec5e7"
>
> --
> 2.37.1
>
>
>
>
--
Ricardo Salveti
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#182689):
https://lists.openembedded.org/g/openembedded-core/message/182689
Mute This Topic: https://lists.openembedded.org/mt/97901027/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] gnu-efi: enable for riscv64
The 3.0.14 release already includes support for riscv64.
Signed-off-by: Ricardo Salveti
---
meta/recipes-bsp/gnu-efi/gnu-efi_3.0.14.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.14.bb
b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.14.bb
index c746c2a1b8..36d10354ed 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.14.bb
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.14.bb
@@ -20,7 +20,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/files/${BP}.tar.bz2 \
SRC_URI[sha256sum] =
"b73b643a0d5697d1f396d7431448e886dd805668789578e3e1a28277c9528435"
-COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
+COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*|riscv64.*)-linux"
COMPATIBLE_HOST:armv4 = 'null'
do_configure:linux-gnux32:prepend() {
--
2.36.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#166809):
https://lists.openembedded.org/g/openembedded-core/message/166809
Mute This Topic: https://lists.openembedded.org/mt/91670140/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] bitbake: fetch2: crate: fix logger.debug line
logger.debug was giving an integer value (2) as event message, causing
knotty to crash when running with debug enabled.
bitbake/lib/bb/ui/knotty.py", line 685, in main
event.msg = taskinfo['title'] + ': ' + event.msg
TypeError: can only concatenate str (not "int") to str
Same issue also happens in the original code that was taken from
oe-core (openembedded-core/meta/lib/crate.py honister) / meta-rust.
Signed-off-by: Ricardo Salveti
---
lib/bb/fetch2/crate.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/bb/fetch2/crate.py b/lib/bb/fetch2/crate.py
index f7e2354a..aac1221c 100644
--- a/lib/bb/fetch2/crate.py
+++ b/lib/bb/fetch2/crate.py
@@ -72,7 +72,7 @@ class Crate(Wget):
ud.parm['downloadfilename'] = "%s-%s.crate" % (name, version)
ud.parm['name'] = name
-logger.debug(2, "Fetching %s to %s" % (ud.url,
ud.parm['downloadfilename']))
+logger.debug("Fetching %s to %s" % (ud.url,
ud.parm['downloadfilename']))
def unpack(self, ud, rootdir, d):
"""
--
2.35.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#164412):
https://lists.openembedded.org/g/openembedded-core/message/164412
Mute This Topic: https://lists.openembedded.org/mt/90472691/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH v2] libpam: use /run instead of /var/run in systemd tmpfiles
/var/run in deprecated by systemd, use /run instead, as suggested by systemd. This fixes the following systemd boot warning: systemd-tmpfiles[340]: /etc/tmpfiles.d/pam.conf:1: Line references path below legacy directory /var/run/, updating /var/run/sepermit → /run/sepermit; please update the tmpfiles.d/ drop-in file accordingly. Signed-off-by: Ricardo Salveti --- Change in v2: - Extended commit message to include the systemd boot warning when using /var/run meta/recipes-extended/pam/libpam/pam-volatiles.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/pam/libpam/pam-volatiles.conf b/meta/recipes-extended/pam/libpam/pam-volatiles.conf index d8b8259a93..1263feb03d 100644 --- a/meta/recipes-extended/pam/libpam/pam-volatiles.conf +++ b/meta/recipes-extended/pam/libpam/pam-volatiles.conf @@ -1 +1 @@ -d /var/run/sepermit 0755 root root - - +d /run/sepermit 0755 root root - - -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#163421): https://lists.openembedded.org/g/openembedded-core/message/163421 Mute This Topic: https://lists.openembedded.org/mt/89847622/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] libpam: use /run instead of /var/run in systemd tmpfiles
On Thu, Mar 17, 2022 at 3:53 AM Alexander Kanavin wrote: > > A link to back up the claim would be helpful. Also, what makes this file and > setting systemd specific? This file is installed under tmpfiles.d, which is only used when systemd is enabled, which is why it is specific to it. When using /var/run with systemd you will see the following message, which I can add to the commit message: systemd-tmpfiles[340]: /etc/tmpfiles.d/pam.conf:1: Line references path below legacy directory /var/run/, updating /var/run/sepermit → /run/sepermit; please update the tmpfiles.d/ drop-in file accordingly. Thanks, -- Ricardo Salveti -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#163415): https://lists.openembedded.org/g/openembedded-core/message/163415 Mute This Topic: https://lists.openembedded.org/mt/89838112/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] libpam: use /run instead of /var/run in systemd tmpfiles
/var/run in deprecated by systemd, use /run instead, as suggested by systemd. Signed-off-by: Ricardo Salveti --- meta/recipes-extended/pam/libpam/pam-volatiles.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/pam/libpam/pam-volatiles.conf b/meta/recipes-extended/pam/libpam/pam-volatiles.conf index d8b8259a93..1263feb03d 100644 --- a/meta/recipes-extended/pam/libpam/pam-volatiles.conf +++ b/meta/recipes-extended/pam/libpam/pam-volatiles.conf @@ -1 +1 @@ -d /var/run/sepermit 0755 root root - - +d /run/sepermit 0755 root root - - -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#163371): https://lists.openembedded.org/g/openembedded-core/message/163371 Mute This Topic: https://lists.openembedded.org/mt/89838112/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] dhcpcd: add --dbdir and --disable-privesp to EXTRA_OECONF
On Tue, Sep 15, 2020 at 6:15 AM Yi Zhao wrote:
>
> * Disable service start at boot time. This may conflict with connman.
> * Set --dbdir to /var/lib/dhcpcd rather than /var/db/dhcpcd to satisfy
> FHS compliance.
> * Pass --disable-privsep to configure to eliminate dhcpcd start warning:
> no such user dhcpcd.
Isn't it better to just create the missing user at the system level?
You could leverage systemd sysusers.d as done by arch at
https://github.com/archlinux/svntogit-packages/blob/packages/dhcpcd/trunk/dhcpcd.sysusers
(in case systemd is enabled).
> Signed-off-by: Yi Zhao
> ---
> meta/recipes-connectivity/dhcpcd/dhcpcd_9.2.0.bb | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.2.0.bb
> b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.2.0.bb
> index 292cb5b008..4b5f4d7766 100644
> --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.2.0.bb
> +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.2.0.bb
> @@ -22,13 +22,14 @@ SRC_URI[sha256sum] =
> "fcb2d19672d445bbfd38678fdee4f556ef967a3ea6bd81092d10545df2
> inherit pkgconfig autotools-brokensep systemd
>
> SYSTEMD_SERVICE_${PN} = "dhcpcd.service"
> +SYSTEMD_AUTO_ENABLE_${PN} = "disable"
>
> PACKAGECONFIG ?= "udev ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
>
> PACKAGECONFIG[udev] = "--with-udev,--without-udev,udev,udev"
> PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6"
>
> -EXTRA_OECONF = "--enable-ipv4"
> +EXTRA_OECONF = "--enable-ipv4 --disable-privsep
> --dbdir=${localstatedir}/lib/${BPN}"
>
> do_install_append () {
> # install systemd unit files
> --
> 2.17.1
>
>
Cheers,
--
Ricardo Salveti
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#142639):
https://lists.openembedded.org/g/openembedded-core/message/142639
Mute This Topic: https://lists.openembedded.org/mt/76861136/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] sudo: set with-rundir to /run/sudo
Set with-rundir to a known path instead of letting configure decide
which is the best folder to store the timestamp files. This is required
otherwise it might end up at /sudo, which will cause errors on a ro
filesystem.
Signed-off-by: Ricardo Salveti
---
meta/recipes-extended/sudo/sudo_1.9.1.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/sudo/sudo_1.9.1.bb
b/meta/recipes-extended/sudo/sudo_1.9.1.bb
index aac505af60..d6bc1a9c3a 100644
--- a/meta/recipes-extended/sudo/sudo_1.9.1.bb
+++ b/meta/recipes-extended/sudo/sudo_1.9.1.bb
@@ -22,6 +22,7 @@ CACHED_CONFIGUREVARS = " \
EXTRA_OECONF += " \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam',
'--without-pam', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd',
'--enable-tmpfiles.d=${nonarch_libdir}/tmpfiles.d', '--disable-tmpfiles.d', d)}
\
+ --with-rundir=/run/sudo \
--with-vardir=/var/lib/sudo \
"
@@ -38,7 +39,7 @@ do_install_append () {
chmod 0440 ${D}${sysconfdir}/sudoers
# Explicitly remove the /sudo directory to avoid QA error
- rmdir -p --ignore-fail-on-non-empty ${D}/sudo
+ rmdir -p --ignore-fail-on-non-empty ${D}/run/sudo
}
FILES_${PN} += "${nonarch_libdir}/tmpfiles.d"
--
2.27.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#140824):
https://lists.openembedded.org/g/openembedded-core/message/140824
Mute This Topic: https://lists.openembedded.org/mt/75697244/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] kernel-fitimage: include overlays with external dtb
As done with the default dtb provider, create fit image sections for
normal device-tree files and device-tree overlays (.dtbo).
Signed-off-by: Ricardo Salveti
---
meta/classes/kernel-fitimage.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/kernel-fitimage.bbclass
b/meta/classes/kernel-fitimage.bbclass
index b51882dce4..17d4d85658 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -406,7 +406,7 @@ fitimage_assemble() {
if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then
dtbcount=1
- for DTBFILE in ${EXTERNAL_KERNEL_DEVICETREE}/*.dtb; do
+ for DTBFILE in ${EXTERNAL_KERNEL_DEVICETREE}/*.dtb*; do
DTB=`basename ${DTBFILE}`
DTB=$(echo "${DTB}" | tr '/' '_')
DTBS="${DTBS} ${DTB}"
--
2.22.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gcc-9.1: add back GLIBC_DYNAMIC_LINKER riscv changes
The riscv GLIBC_DYNAMIC_LINKER changes were dropped during the gcc 9.1
update, breaking usrmerge support.
Signed-off-by: Ricardo Salveti
---
...AMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 28 ++-
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git
a/meta/recipes-devtools/gcc/gcc-9.1/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
b/meta/recipes-devtools/gcc/gcc-9.1/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
index f23a314c13..1ff85c8073 100644
---
a/meta/recipes-devtools/gcc/gcc-9.1/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
+++
b/meta/recipes-devtools/gcc/gcc-9.1/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
@@ -1,4 +1,4 @@
-From 492f008dce784749e39e1c396aeea6fa1d977374 Mon Sep 17 00:00:00 2001
+From 0e13b09ae400d8c8755e2869c72a158ed0dbc0b6 Mon Sep 17 00:00:00 2001
From: Khem Raj
Date: Fri, 29 Mar 2013 09:24:50 +0400
Subject: [PATCH 12/37] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER
@@ -23,11 +23,12 @@ Upstream-Status: Inappropriate [OE configuration]
gcc/config/i386/linux64.h| 6 +++---
gcc/config/linux.h | 8
gcc/config/mips/linux.h | 12 ++--
+ gcc/config/riscv/linux.h | 2 +-
gcc/config/rs6000/linux64.h | 15 +--
gcc/config/sh/linux.h| 2 +-
gcc/config/sparc/linux.h | 2 +-
gcc/config/sparc/linux64.h | 4 ++--
- 11 files changed, 28 insertions(+), 33 deletions(-)
+ 12 files changed, 29 insertions(+), 34 deletions(-)
diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
index 824861befec..6afacce3292 100644
@@ -152,11 +153,24 @@ index 6f79ac9c01a..25de96f9561 100644
#undef MUSL_DYNAMIC_LINKER32
#define MUSL_DYNAMIC_LINKER32 \
+diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
+index 58dd18b89f3..112ba9cd764 100644
+--- a/gcc/config/riscv/linux.h
b/gcc/config/riscv/linux.h
+@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see
+ GNU_USER_TARGET_OS_CPP_BUILTINS();\
+ } while (0)
+
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-riscv" XLEN_SPEC "-" ABI_SPEC
".so.1"
++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-riscv" XLEN_SPEC "-"
ABI_SPEC ".so.1"
+
+ #define MUSL_ABI_SUFFIX \
+ "%{mabi=ilp32:-sf}" \
diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
-index bcc540b5ff2..982ca274621 100644
+index 5380f6a6a6f..c0f2dc1f43e 100644
--- a/gcc/config/rs6000/linux64.h
+++ b/gcc/config/rs6000/linux64.h
-@@ -428,24 +428,19 @@ extern int dot_symbols;
+@@ -435,24 +435,19 @@ extern int dot_symbols;
#undefLINK_OS_DEFAULT_SPEC
#define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
@@ -200,10 +214,10 @@ index c9897b7aca5..82f275319cc 100644
#undef SUBTARGET_LINK_EMUL_SUFFIX
#define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}"
diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
-index 2db9ea2172e..1979cfff5d3 100644
+index 08476f1d94d..80440e712ad 100644
--- a/gcc/config/sparc/linux.h
+++ b/gcc/config/sparc/linux.h
-@@ -83,7 +83,7 @@ extern const char *host_detect_local_cpu (int argc, const
char **argv);
+@@ -84,7 +84,7 @@ extern const char *host_detect_local_cpu (int argc, const
char **argv);
When the -shared link option is used a final link is not being
done. */
@@ -213,7 +227,7 @@ index 2db9ea2172e..1979cfff5d3 100644
#undef LINK_SPEC
#define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h
-index 21e13001951..d39c38a531f 100644
+index 789d1df4bd5..b920c680fb1 100644
--- a/gcc/config/sparc/linux64.h
+++ b/gcc/config/sparc/linux64.h
@@ -84,8 +84,8 @@ along with GCC; see the file COPYING3. If not see
--
2.22.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gcc-8.3: add back GLIBC_DYNAMIC_LINKER riscv changes
On Tue, Mar 26, 2019 at 3:15 PM Khem Raj wrote: > On Tue, Mar 26, 2019 at 11:07 AM Ricardo Salveti wrote: > > > > The riscv GLIBC_DYNAMIC_LINKER changes were dropped during the gcc 8.3 > > update, breaking usrmerge support. > > ah thanks for noticing that, this should be fine to apply Looks like the same change was dropped with gcc 9.1, will send it again :-) Cheers, -- Ricardo Salveti -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gcc-8.3: add back GLIBC_DYNAMIC_LINKER riscv changes
The riscv GLIBC_DYNAMIC_LINKER changes were dropped during the gcc 8.3
update, breaking usrmerge support.
Signed-off-by: Ricardo Salveti
---
...NAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 18 --
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git
a/meta/recipes-devtools/gcc/gcc-8.3/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
b/meta/recipes-devtools/gcc/gcc-8.3/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
index 91a55c556f..d3be10f207 100644
---
a/meta/recipes-devtools/gcc/gcc-8.3/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
+++
b/meta/recipes-devtools/gcc/gcc-8.3/0012-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
@@ -1,4 +1,4 @@
-From 4a697387eeab14ece2796c01382cca30e8467ffa Mon Sep 17 00:00:00 2001
+From 6f8649936df3677109b8396f563c716ae8b237fe Mon Sep 17 00:00:00 2001
From: Khem Raj
Date: Fri, 29 Mar 2013 09:24:50 +0400
Subject: [PATCH 12/40] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER
@@ -23,11 +23,12 @@ Upstream-Status: Inappropriate [OE configuration]
gcc/config/i386/linux64.h| 6 +++---
gcc/config/linux.h | 8
gcc/config/mips/linux.h | 12 ++--
+ gcc/config/riscv/linux.h | 2 +-
gcc/config/rs6000/linux64.h | 16 ++--
gcc/config/sh/linux.h| 2 +-
gcc/config/sparc/linux.h | 2 +-
gcc/config/sparc/linux64.h | 4 ++--
- 11 files changed, 29 insertions(+), 33 deletions(-)
+ 12 files changed, 30 insertions(+), 34 deletions(-)
diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
index 36b74dc1993..02373578af8 100644
@@ -152,6 +153,19 @@ index 2dfd0c18b90..12057c51b5e 100644
#undef MUSL_DYNAMIC_LINKER32
#define MUSL_DYNAMIC_LINKER32 \
+diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
+index aa8a28d5d31..ebf9551c955 100644
+--- a/gcc/config/riscv/linux.h
b/gcc/config/riscv/linux.h
+@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see
+ GNU_USER_TARGET_OS_CPP_BUILTINS();\
+ } while (0)
+
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-riscv" XLEN_SPEC "-" ABI_SPEC
".so.1"
++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-riscv" XLEN_SPEC "-"
ABI_SPEC ".so.1"
+
+ #define MUSL_ABI_SUFFIX \
+ "%{mabi=ilp32:-sf}" \
diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
index 44eab40a234..54aa8d957e7 100644
--- a/gcc/config/rs6000/linux64.h
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] systemd: upgrade to 239
On Thu, Jul 26, 2018 at 9:30 AM, Peter Kjellerstedt
wrote:
>> -Original Message-
>> From: openembedded-core-boun...@lists.openembedded.org > core-boun...@lists.openembedded.org> On Behalf Of ChenQi
>> Sent: den 26 juli 2018 07:51
>> To: Ricardo Salveti
>> Cc: openembedded-core@lists.openembedded.org
>> Subject: Re: [OE-core] [PATCH 1/2] systemd: upgrade to 239
>>
>> On 07/26/2018 07:05 AM, Ricardo Salveti wrote:
>> > On Mon, Jul 16, 2018 at 11:05 PM, Chen Qi wrote:
>> >> Upgrade systemd to 239.
>
> [cut]
>
>> >> 3. update-alternatives changes
>> >>The utilities like shutdown, poweroff, etc. are now created as symlinks
>> >>at do_install. So there's no need to use update-alternatives mechanism
>> >>anymore to create the symlinks now. In addtion, I don't think we> now
>> >>support multiple init systems at one running system, so there's really
>> >>no need to use update-alternatives mechanism here.
>> >
>> > I noticed that reboot stopped working locally as I had busybox
>> > installed together with systemd, and the busybox version ended up
>> > being used as it was provided via update-alternatives.
>> >
>> > Looking for possible similar broken links, I found that
>> > update-alternatives ended up pointing reboot, halt and poweroff to the
>> > busybox binary instead of systemctl. Should we revert the changes and
>> > bring back update-alternatives for them?
>> >
>> > Thanks,
>>
>> I think the correct direction to fix this problem is to make busybox
>> only provide init utilities (reboot, halt, etc) when init manager is
>> set to busybox.
>>
>> We current have in busybox recipe's SRC_URI:
>> ${@["",
>> "file://init.cfg"][(d.getVar('VIRTUAL-RUNTIME_init_manager') ==
>> 'busybox')]} \
>>
>> I think the init utilities should be moved to init.cfg.
>>
>> Please check my logic to see if you can agree with it.
>> We have two facts here.
>> 1. Init utilities (reboot, halt, etc.) are tightly bond to the specific
>> implementation of PID 1.
>> 2. We only allow one PID 1 in our image. (VIRTUAL-RUNTIME_init_manager).
>> So we can conclude from the above two facts that it does not make much
>> sense to have multiple providers of init utilities while we only allow
>> one PID 1 provider on image.
>>
>> After all, we are using update-*alternatives*, things that this
>> mechanism manages are supposed to generally serve as alternatives to
>> each other.
>>
>> Best Regards,
>> Chen Qi
>
> For what it is worth, we have a package that installs wrappers for init and
> reboot, which is now causing image creation to fail due to the change to
> systemd since both packages now try to install init and reboot. I can of
> course add a systemd_%.bbappend to remove init and reboot, but that means
> the systemd package is broken unless the package with the wrappers is
> always installed.
Curious to why you need such wrappers, but wasn't it a problem before
even when we had update-alternatives for such utilities (e.g.
update-alternatives failing to link init/reboot because of your
wrappers when creating the rootfs)?
Cheers,
--
Ricardo Salveti de Araujo
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] systemd: upgrade to 239
On Thu, Jul 26, 2018 at 2:50 AM, ChenQi wrote:
> On 07/26/2018 07:05 AM, Ricardo Salveti wrote:
>> I noticed that reboot stopped working locally as I had busybox
>> installed together with systemd, and the busybox version ended up
>> being used as it was provided via update-alternatives.
>>
>> Looking for possible similar broken links, I found that
>> update-alternatives ended up pointing reboot, halt and poweroff to the
>> busybox binary instead of systemctl. Should we revert the changes and
>> bring back update-alternatives for them?
>
> I think the correct direction to fix this problem is to make busybox only
> provide init utilities (reboot, halt, etc) when init manager is set to
> busybox.
>
> We current have in busybox recipe's SRC_URI:
>${@["",
> "file://init.cfg"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]}
> \
>
> I think the init utilities should be moved to init.cfg.
>
> Please check my logic to see if you can agree with it.
> We have two facts here.
> 1. Init utilities (reboot, halt, etc.) are tightly bond to the specific
> implementation of PID 1.
> 2. We only allow one PID 1 in our image. (VIRTUAL-RUNTIME_init_manager).
> So we can conclude from the above two facts that it does not make much sense
> to have multiple providers of init utilities while we only allow one PID 1
> provider on image.
Seems correct to move the init utilities to init.cfg even without the
update-alternatives change then.
> After all, we are using update-*alternatives*, things that this mechanism
> manages are supposed to generally serve as alternatives to each other.
>
> Best Regards,
> Chen Qi
Cheers,
--
Ricardo Salveti de Araujo
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] systemd: upgrade to 239
is not installed into /usr/bin yet. > """ > > * Change 'kmod' from a hard dependency to a PACKAGECONFIG item. Default > to enable it. > > * Change 'acl' from a hard dependency to a PACKAGECONFIG item. Default > to enable it. > > * Remove 'readline' from DEPENDS. systemd does not need it. > > * Remove 'libcgroup' from DEPENDS. The dependency on libcgroup has been > removed from systemd a long time ago. We now remove this unnecessary > dependency from DEPENDS. > > 3. update-alternatives changes > The utilities like shutdown, poweroff, etc. are now created as symlinks > at do_install. So there's no need to use update-alternatives mechanism > anymore to create the symlinks now. In addtion, I don't think we now > support multiple init systems at one running system, so there's really > no need to use update-alternatives mechanism here. I noticed that reboot stopped working locally as I had busybox installed together with systemd, and the busybox version ended up being used as it was provided via update-alternatives. Looking for possible similar broken links, I found that update-alternatives ended up pointing reboot, halt and poweroff to the busybox binary instead of systemctl. Should we revert the changes and bring back update-alternatives for them? Thanks, -- Ricardo Salveti de Araujo -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gcc-8: define GLIBC_DYNAMIC_LINKER relative to SYSTEMLIBS_DIR on riscv
Refresh 0014-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
to also define GLIBC_DYNAMIC_LINKER relative to SYSTEMLIBS_DIR on riscv.
Signed-off-by: Ricardo Salveti
---
...e-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 16 +++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git
a/meta/recipes-devtools/gcc/gcc-8.1/0014-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
b/meta/recipes-devtools/gcc/gcc-8.1/0014-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
index 8913c87..043bb9d 100644
---
a/meta/recipes-devtools/gcc/gcc-8.1/0014-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
+++
b/meta/recipes-devtools/gcc/gcc-8.1/0014-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
@@ -23,11 +23,12 @@ Upstream-Status: Inappropriate [OE configuration]
gcc/config/i386/linux64.h| 6 +++---
gcc/config/linux.h | 8
gcc/config/mips/linux.h | 12 ++--
+ gcc/config/riscv/linux.h | 2 +-
gcc/config/rs6000/linux64.h | 16 ++--
gcc/config/sh/linux.h| 2 +-
gcc/config/sparc/linux.h | 2 +-
gcc/config/sparc/linux64.h | 4 ++--
- 11 files changed, 29 insertions(+), 33 deletions(-)
+ 12 files changed, 30 insertions(+), 34 deletions(-)
diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
index 36b74dc1993..02373578af8 100644
@@ -152,6 +153,19 @@ index 2dfd0c18b90..12057c51b5e 100644
#undef MUSL_DYNAMIC_LINKER32
#define MUSL_DYNAMIC_LINKER32 \
+diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
+index aa8a28d5d..ebf9551c9 100644
+--- a/gcc/config/riscv/linux.h
b/gcc/config/riscv/linux.h
+@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3.
+ GNU_USER_TARGET_OS_CPP_BUILTINS();\
+ } while (0)
+
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-riscv" XLEN_SPEC "-" ABI_SPEC
".so.1"
++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-riscv" XLEN_SPEC "-"
ABI_SPEC ".so.1"
+
+ #define MUSL_ABI_SUFFIX \
+ "%{mabi=ilp32:-sf}" \
diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
index 90fe6566255..55695dadd91 100644
--- a/gcc/config/rs6000/linux64.h
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 2/4] libcap: fix (base_)libdir usage
On Mon, Apr 16, 2018 at 10:00 AM, Koen Kooi <k...@dominion.thruhere.net> wrote:
> The recipe wants to install libs into base_libdir, but uses "basename
> $libdir" to derive that. That breaks in a multiarch setup. Use the proper
> variable and remove the inline python usage.
>
> Signed-off-by: Koen Kooi <koen.k...@linaro.org>
> ---
> meta/recipes-support/libcap/libcap_2.25.bb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-support/libcap/libcap_2.25.bb
> b/meta/recipes-support/libcap/libcap_2.25.bb
> index d619a2e..47ecf34 100644
> --- a/meta/recipes-support/libcap/libcap_2.25.bb
> +++ b/meta/recipes-support/libcap/libcap_2.25.bb
> @@ -32,7 +32,7 @@ PACKAGECONFIG[pam] = "PAM_CAP=yes,PAM_CAP=no,libpam"
>
> EXTRA_OEMAKE = " \
>INDENT= \
> - lib=${@os.path.basename('${libdir}')} \
> + lib='${base_libdir}' \
>RAISE_SETFCAP=no \
>DYNAMIC=yes \
>BUILD_GPERF=yes \
This creates a build failure when usrmerge is used, as libcap expects
only the lib folder name and not the lib path (and when usrmerge is
enabled base_libdir gets set to /usr/lib instead of /lib).
Since base_libdir and libdir are all based out baselib, can you
provide more details about how that broke your multiarch setup?
The failure when usrmerge is used:
WARNING: libcap-2.25-r0 do_package: QA Issue: libcap:
Files/directories were installed but not shipped in any package:
/usr/lib
/usr/usr/lib/libcap.so
/usr/usr/lib/libcap.so.2
/usr/usr/lib/libcap.so.2.25
/usr/usr/lib/libcap.a
/usr/usr/lib/pkgconfig
/usr/usr/lib/pkgconfig/libcap.pc
/usr/usr/lib/security/pam_cap.so
Thanks,
--
Ricardo Salveti de Araujo
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] grub-efi: add grub target and image for aarch64
Add missing target and image for aarch64, as the current revision is
already fully compatible with ARMv8.
Signed-off-by: Ricardo Salveti <rica...@opensourcefoundries.com>
---
meta/recipes-bsp/grub/grub-efi_2.02.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-bsp/grub/grub-efi_2.02.bb
b/meta/recipes-bsp/grub/grub-efi_2.02.bb
index ed27b90..7bfc8ee 100644
--- a/meta/recipes-bsp/grub/grub-efi_2.02.bb
+++ b/meta/recipes-bsp/grub/grub-efi_2.02.bb
@@ -22,6 +22,9 @@ python __anonymous () {
elif re.match('i.86', target):
grubtarget = 'i386'
grubimage = prefix + "bootia32.efi"
+elif re.match('aarch64', target):
+grubtarget = 'arm64'
+grubimage = prefix + "bootaa64.efi"
else:
raise bb.parse.SkipRecipe("grub-efi is incompatible with target %s" %
target)
d.setVar("GRUB_TARGET", grubtarget)
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] usbutils: use update-alternatives for lsusb
lsusb can also be provided by busybox (CONFIG_LSUSB), so use
update-alternatives to handle the conflict.
Signed-off-by: Ricardo Salveti <rica...@opensourcefoundries.com>
---
meta/recipes-bsp/usbutils/usbutils_009.bb | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-bsp/usbutils/usbutils_009.bb
b/meta/recipes-bsp/usbutils/usbutils_009.bb
index 88c24bd..3ffc0dd 100644
--- a/meta/recipes-bsp/usbutils/usbutils_009.bb
+++ b/meta/recipes-bsp/usbutils/usbutils_009.bb
@@ -15,7 +15,10 @@ SRC_URI =
"${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \
SRC_URI[md5sum] = "b5dbc498b2eb5058f7a57fc6532d0aad"
SRC_URI[sha256sum] =
"e73543293a17c7803994eac97a49e58b377e08e6299ba11aad09794b91340e8b"
-inherit autotools pkgconfig distro_features_check
+inherit autotools pkgconfig distro_features_check update-alternatives
+
+ALTERNATIVE_${PN} = "lsusb"
+ALTERNATIVE_PRIORITY = "100"
FILES_${PN}-dev += "${datadir}/pkgconfig"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] initramfs-framework: rootfs: add support for LABEL
The rootfs can also be found via the partition label.
Signed-off-by: Ricardo Salveti <rica...@opensourcefoundries.com>
---
meta/recipes-core/initrdscripts/initramfs-framework/rootfs | 5 +
1 file changed, 5 insertions(+)
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/rootfs
b/meta/recipes-core/initrdscripts/initramfs-framework/rootfs
index 14768f1..76fa84d 100644
--- a/meta/recipes-core/initrdscripts/initramfs-framework/rootfs
+++ b/meta/recipes-core/initrdscripts/initramfs-framework/rootfs
@@ -31,6 +31,11 @@ rootfs_run() {
bootparam_root="/dev/disk/by-partuuid/$root_uuid"
fi
+ if [ "`echo ${bootparam_root} | cut -c1-6`" = "LABEL="
]; then
+ root_label=`echo $bootparam_root | cut -c7-`
+ bootparam_root="/dev/disk/by-label/$root_label"
+ fi
+
if [ -e "$bootparam_root" ]; then
flags=""
if [ -n "$bootparam_ro" ] && ! echo
"$bootparam_rootflags" | grep -w -q "ro"; then
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] grub-efi: add grub target and image for aarch64
Add missing target and image for aarch64, as the current revision is
already fully compatible with ARMv8.
Signed-off-by: Ricardo Salveti <rica...@opensourcefoundries.com>
---
meta/recipes-bsp/grub/grub-efi_2.02.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-bsp/grub/grub-efi_2.02.bb
b/meta/recipes-bsp/grub/grub-efi_2.02.bb
index a72b189..a5235a1 100644
--- a/meta/recipes-bsp/grub/grub-efi_2.02.bb
+++ b/meta/recipes-bsp/grub/grub-efi_2.02.bb
@@ -21,6 +21,9 @@ python __anonymous () {
elif re.match('i.86', target):
grubtarget = 'i386'
grubimage = "grub-efi-bootia32.efi"
+elif re.match('aarch64', target):
+grubtarget = 'arm64'
+grubimage = "grub-efi-bootaa64.efi"
else:
raise bb.parse.SkipRecipe("grub-efi is incompatible with target %s" %
target)
d.setVar("GRUB_TARGET", grubtarget)
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] grub-efi: allow default config to be customized by the distro
The default grub config produced by grub-efi can't be easily customized
by the distro (without replacing the standard cfg file), so create an
extra variable GRUB_CFG to allow customizing the config file that is
consumed by grub-mkimage.
Signed-off-by: Ricardo Salveti <rica...@opensourcefoundries.com>
---
meta/recipes-bsp/grub/grub-efi_2.02.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-bsp/grub/grub-efi_2.02.bb
b/meta/recipes-bsp/grub/grub-efi_2.02.bb
index a72b189..6530d92 100644
--- a/meta/recipes-bsp/grub/grub-efi_2.02.bb
+++ b/meta/recipes-bsp/grub/grub-efi_2.02.bb
@@ -53,13 +53,14 @@ do_install_class-target() {
{} +
}
+GRUB_CFG ?= "cfg"
GRUB_BUILDIN ?= "boot linux ext2 fat serial part_msdos part_gpt normal \
efi_gop iso9660 search loadenv test"
do_deploy() {
# 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 ../${GRUB_CFG} -p /EFI/BOOT -d ./grub-core/ \
-O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE} \
${GRUB_BUILDIN}
install -m 644 ${B}/${GRUB_IMAGE} ${DEPLOYDIR}
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libacpi: update libacpi_fix_for_x32.patch to use libdir
Prefix plus base_libdir generates an invalid path when building with
usrmerge, so change libacpi_fix_for_x32.patch to use libdir instead as
it provides the right path in both cases.
Signed-off-by: Ricardo Salveti <rica...@opensourcefoundries.com>
---
.../libacpi/files/libacpi_fix_for_x32.patch| 30 --
meta/recipes-bsp/libacpi/libacpi_0.2.bb| 2 +-
2 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch
b/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch
index 86a16c2..06f20e5 100644
--- a/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch
+++ b/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch
@@ -3,9 +3,10 @@ Upstream-Status: Pending
Fix libacpi for x32
libacpi doesn't use base_libdir for install. This patch adds
-base_libdir support so that x32 libraries are installed properly.
+libdir support so that x32 libraries are installed properly.
Patch Received from: H.J. Lu <hjl.to...@gmail.com>
+Updated by: Ricardo Salveti <rica...@opensourcefoundries.com> 2018/02/03
Signed-off-by: Nitin A Kamble <nitin.a.kam...@intel.com> 2011/12/05
@@ -13,18 +14,7 @@ Index: libacpi-0.2/Makefile
===
--- libacpi-0.2.orig/Makefile
+++ libacpi-0.2/Makefile
-@@ -8,6 +8,10 @@ SRC_test = test-libacpi.c libacpi.c list
- OBJ = ${SRC:.c=.o}
- OBJ_test = ${SRC_test:.c=.o}
-
-+ifndef base_libdir
-+base_libdir=/lib
-+endif
-+
- all: options libacpi.a libacpi.so test-libacpi
-
- options:
-@@ -42,13 +46,13 @@ install: all
+@@ -42,13 +42,13 @@ install: all
@mkdir -p ${DESTDIR}${PREFIX}/include
@cp -f libacpi.h ${DESTDIR}${PREFIX}/include
@chmod 644 ${DESTDIR}${PREFIX}/include/libacpi.h
@@ -35,13 +25,13 @@ Index: libacpi-0.2/Makefile
- @cp -f ${SONAME} ${DESTDIR}${PREFIX}/lib/
- @chmod 644 ${DESTDIR}${PREFIX}/lib/${SONAME}
- @ln -s ${SONAME} ${DESTDIR}${PREFIX}/lib/libacpi.so
-+ @echo installing library to ${DESTDIR}${PREFIX}${base_libdir}
-+ @mkdir -p ${DESTDIR}${PREFIX}${base_libdir}
-+ @cp -f libacpi.a ${DESTDIR}${PREFIX}${base_libdir}
-+ @chmod 644 ${DESTDIR}${PREFIX}${base_libdir}/libacpi.a
-+ @cp -f ${SONAME} ${DESTDIR}${PREFIX}${base_libdir}/
-+ @chmod 644 ${DESTDIR}${PREFIX}${base_libdir}/${SONAME}
-+ @ln -s ${SONAME} ${DESTDIR}${PREFIX}${base_libdir}/libacpi.so
++ @echo installing library to ${DESTDIR}${LIBDIR}
++ @mkdir -p ${DESTDIR}${LIBDIR}
++ @cp -f libacpi.a ${DESTDIR}${LIBDIR}
++ @chmod 644 ${DESTDIR}${LIBDIR}/libacpi.a
++ @cp -f ${SONAME} ${DESTDIR}${LIBDIR}/
++ @chmod 644 ${DESTDIR}${LIBDIR}/${SONAME}
++ @ln -s ${SONAME} ${DESTDIR}${LIBDIR}/libacpi.so
@echo installing test-libacpi to ${DESTDIR}${PREFIX}/bin
@mkdir -p ${DESTDIR}${PREFIX}/bin
@cp -f test-libacpi ${DESTDIR}${PREFIX}/bin
diff --git a/meta/recipes-bsp/libacpi/libacpi_0.2.bb
b/meta/recipes-bsp/libacpi/libacpi_0.2.bb
index 6dc66ea..5e7f7fa 100644
--- a/meta/recipes-bsp/libacpi/libacpi_0.2.bb
+++ b/meta/recipes-bsp/libacpi/libacpi_0.2.bb
@@ -28,5 +28,5 @@ EXTRA_OEMAKE = '-e MAKEFLAGS= STRIP="echo"'
TARGET_CC_ARCH += "${LDFLAGS}"
do_install() {
- oe_runmake install DESTDIR=${D} PREFIX=${exec_prefix}
+ oe_runmake install DESTDIR=${D} PREFIX=${exec_prefix} LIBDIR=${libdir}
}
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] grub-efi: add configfile as default built-in
The module configfile allows loading a custom grub configuration file
from block devices, which can be used to customize the default grub
menu when creating images with wic (via configfile argument).
Signed-off-by: Ricardo Salveti <rica...@opensourcefoundries.com>
---
meta/recipes-bsp/grub/grub-efi_2.02.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-bsp/grub/grub-efi_2.02.bb
b/meta/recipes-bsp/grub/grub-efi_2.02.bb
index a72b189..d5aa64c 100644
--- a/meta/recipes-bsp/grub/grub-efi_2.02.bb
+++ b/meta/recipes-bsp/grub/grub-efi_2.02.bb
@@ -54,7 +54,7 @@ do_install_class-target() {
}
GRUB_BUILDIN ?= "boot linux ext2 fat serial part_msdos part_gpt normal \
- efi_gop iso9660 search loadenv test"
+ efi_gop iso9660 configfile search loadenv test"
do_deploy() {
# Search for the grub.cfg on the local boot media by using the
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kernel.bbclass: remove bashism in kernel_do_install
possible bashism in run.do_install line 163 (should be 'b = a'):
if [ "kernel" == "kernel" ]; then
Fixes "[: kernel: unexpected operator" when not using bash by default,
which causes the default kernel image link to not be created.
Signed-off-by: Ricardo Salveti <rica...@opensourcefoundries.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 f7b612f..c42f85c 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -363,7 +363,7 @@ kernel_do_install() {
install -d ${D}/boot
for type in ${KERNEL_IMAGETYPES} ; do
install -m 0644 ${KERNEL_OUTPUT_DIR}/${type}
${D}/${KERNEL_IMAGEDEST}/${type}-${KERNEL_VERSION}
- if [ "${KERNEL_PACKAGE_NAME}" == "kernel" ]; then
+ if [ "${KERNEL_PACKAGE_NAME}" = "kernel" ]; then
ln -sf ${type}-${KERNEL_VERSION}
${D}/${KERNEL_IMAGEDEST}/${type}
fi
done
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] linux-firmware: package Qualcomm QCA firmware
On Fri, May 5, 2017 at 6:33 PM, Khem Raj <raj.k...@gmail.com> wrote:
>
> On Fri, May 5, 2017 at 4:03 PM Ricardo Salveti <rsalv...@rsalveti.net>
> wrote:
>>
>> Firmware files for the QCA61x4 ROME BT family chips. Firmware shares the
>> same license as used by ath10k.
>>
>> Signed-off-by: Ricardo Salveti <rsalv...@rsalveti.net>
>> ---
>> meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 8 +++-
>> 1 file changed, 7 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
>> b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
>> index be5bdbd..143e8dd 100644
>> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
>> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
>> @@ -231,7 +231,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \
>> ${PN}-broadcom-license ${PN}-bcm4329 ${PN}-bcm4330
>> ${PN}-bcm4334 ${PN}-bcm43340 ${PN}-bcm4339 ${PN}-bcm43430 ${PN}-bcm4354 \
>> ${PN}-atheros-license ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k \
>> ${PN}-gplv2-license ${PN}-carl9170 \
>> - ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license
>> ${PN}-ath10k \
>> + ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license
>> ${PN}-ath10k ${PN}-qca \
>> \
>> ${PN}-iwlwifi-license ${PN}-iwlwifi \
>> ${PN}-iwlwifi-135-6 \
>> @@ -292,6 +292,7 @@ LICENSE_${PN}-ar3k = "Firmware-qualcommAthos_ar3k"
>> LICENSE_${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k"
>> LICENSE_${PN}-ath10k = "Firmware-qualcommAthos_ath10k"
>> LICENSE_${PN}-ath10k-license = "Firmware-qualcommAthos_ath10k"
>> +LICENSE_${PN}-qca = "Firmware-qualcommAthos_ath10k"
>
> It seems you are not using this so may be it can be removed ?
It's used just to define the license of the package itself, otherwise
it will use the entire list of licenses available in the recipe itself, like:
diff -Naur a/linux-firmware-qca b/linux-firmware-qca
--- a/linux-firmware-qca2017-05-05 14:19:25.0 -0300
+++ b/linux-firmware-qca 2017-05-06 15:41:31.293203659 -0300
@@ -5,7 +5,7 @@
PKGE: 1
PKGV: 0.0+git0+b14134583c
PKGR: r0
-LICENSE_linux-firmware-qca: Firmware-qualcommAthos_ath10k
+LICENSE: Firmware-Abilis & Firmware-adsp_sst &
Firmware-agere & Firmware-amdgpu & Firmware-amd-ucode &
Firmware-atheros_firmware & Firmware-atmel &
Firmware-broadcom_bcm43xx & Firmware-ca0132 & Firmware-cavium
& Firmware-chelsio_firmware & Firmware-cw1200 &
Firmware-dib0700 & Firmware-e100 & Firmware-ene_firmware &
Firmware-fw_sst_0f28 & Firmware-go7007 & Firmware-GPLv2 &
Firmware-hfi1_firmware & Firmware-i2400m & Firmware-i915 &
Firmware-ibt_firmware & Firmware-it913x &
Firmware-iwlwifi_firmware & Firmware-IntcSST2 &
Firmware-kaweth & Firmware-Marvell & Firmware-moxa &
Firmware-myri10ge_firmware & Firmware-nvidia & Firmware-OLPC
& Firmware-ath9k-htc & Firmware-phanfw & Firmware-qat &
Firmware-qla1280 & Firmware-qla2xxx &
Firmware-qualcommAthos_ar3k & Firmware-qualcommAthos_ath10k &
Firmware-r8a779x_usb3 & Firmware-radeon &
Firmware-ralink_a_mediatek_company_firmware &
Firmware-ralink-firmware & Firmware-rtlwifi_firmware &
Firmware-siano & Firmware-tda7706-firmware &
Firmware-ti-connectivity & Firmware-ti-keystone &
Firmware-ueagle-atm4-firmware & Firmware-via_vt6656 &
Firmware-wl1251 & Firmware-xc4000 & Firmware-xc5000 &
Firmware-xc5000c & WHENCE
DESCRIPTION: Firmware files for use with Linux kernel.
SUMMARY: Firmware files for use with Linux kernel
RDEPENDS_linux-firmware-qca: linux-firmware-ath10k-license
Thanks,
--
Ricardo Salveti de Araujo
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] linux-firmware: package Qualcomm QCA firmware
Firmware files for the QCA61x4 ROME BT family chips. Firmware shares the
same license as used by ath10k.
Signed-off-by: Ricardo Salveti <rsalv...@rsalveti.net>
---
meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index be5bdbd..143e8dd 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -231,7 +231,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \
${PN}-broadcom-license ${PN}-bcm4329 ${PN}-bcm4330 ${PN}-bcm4334
${PN}-bcm43340 ${PN}-bcm4339 ${PN}-bcm43430 ${PN}-bcm4354 \
${PN}-atheros-license ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k \
${PN}-gplv2-license ${PN}-carl9170 \
- ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license
${PN}-ath10k \
+ ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k
${PN}-qca \
\
${PN}-iwlwifi-license ${PN}-iwlwifi \
${PN}-iwlwifi-135-6 \
@@ -292,6 +292,7 @@ LICENSE_${PN}-ar3k = "Firmware-qualcommAthos_ar3k"
LICENSE_${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k"
LICENSE_${PN}-ath10k = "Firmware-qualcommAthos_ath10k"
LICENSE_${PN}-ath10k-license = "Firmware-qualcommAthos_ath10k"
+LICENSE_${PN}-qca = "Firmware-qualcommAthos_ath10k"
FILES_${PN}-ar3k-license =
"${nonarch_base_libdir}/firmware/LICENSE.QualcommAtheros_ar3k"
FILES_${PN}-ar3k = " \
@@ -303,8 +304,13 @@ FILES_${PN}-ath10k = " \
${nonarch_base_libdir}/firmware/ath10k \
"
+FILES_${PN}-qca = " \
+ ${nonarch_base_libdir}/firmware/qca \
+"
+
RDEPENDS_${PN}-ar3k += "${PN}-ar3k-license"
RDEPENDS_${PN}-ath10k += "${PN}-ath10k-license"
+RDEPENDS_${PN}-qca += "${PN}-ath10k-license"
# For ralink
LICENSE_${PN}-ralink = "Firmware-ralink-firmware"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
