[OE-core] [PATCH] core-image-minimal-initramfs: add libgcc into the initramfs image
Add the libgcc package into the initramfs image to avoid multithread
function error in the userspace(eg: pthread_cancel).
Signed-off-by: Zhixiong Chi
---
meta/recipes-core/images/core-image-minimal-initramfs.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb
b/meta/recipes-core/images/core-image-minimal-initramfs.bb
index 7df8ab1ebd..3cf2c7b01f 100644
--- a/meta/recipes-core/images/core-image-minimal-initramfs.bb
+++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb
@@ -11,7 +11,7 @@ INITRAMFS_SCRIPTS ?= "\
initramfs-module-install-efi \
"
-PACKAGE_INSTALL = "${INITRAMFS_SCRIPTS} ${VIRTUAL-RUNTIME_base-utils} udev
base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}"
+PACKAGE_INSTALL = "${INITRAMFS_SCRIPTS} ${VIRTUAL-RUNTIME_base-utils} udev
base-passwd libgcc ${ROOTFS_BOOTSTRAP_INSTALL}"
# Do not pollute the initrd image with rootfs features
IMAGE_FEATURES = ""
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] sqlite3: Upgrade 3.26.0 -> 3.27.2
Signed-off-by: Adrian Bunk
---
meta/recipes-support/sqlite/sqlite3_3.26.0.bb | 10 --
meta/recipes-support/sqlite/sqlite3_3.27.2.bb | 11 +++
2 files changed, 11 insertions(+), 10 deletions(-)
delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.26.0.bb
create mode 100644 meta/recipes-support/sqlite/sqlite3_3.27.2.bb
diff --git a/meta/recipes-support/sqlite/sqlite3_3.26.0.bb
b/meta/recipes-support/sqlite/sqlite3_3.26.0.bb
deleted file mode 100644
index a0d615bac1..00
--- a/meta/recipes-support/sqlite/sqlite3_3.26.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require sqlite3.inc
-
-LICENSE = "PD"
-LIC_FILES_CHKSUM =
"file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66"
-
-SRC_URI = "\
- http://www.sqlite.org/2018/sqlite-autoconf-${SQLITE_PV}.tar.gz \
- "
-SRC_URI[md5sum] = "ac2b3b8cd3a97600e36fb8e756e8dda1"
-SRC_URI[sha256sum] =
"5daa6a3fb7d1e8c767cd59c4ded8da6e4b00c61d3b466d0685e35c4dd6d7bf5d"
diff --git a/meta/recipes-support/sqlite/sqlite3_3.27.2.bb
b/meta/recipes-support/sqlite/sqlite3_3.27.2.bb
new file mode 100644
index 00..22fec21454
--- /dev/null
+++ b/meta/recipes-support/sqlite/sqlite3_3.27.2.bb
@@ -0,0 +1,11 @@
+require sqlite3.inc
+
+LICENSE = "PD"
+LIC_FILES_CHKSUM =
"file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66"
+
+SRC_URI = "\
+ http://www.sqlite.org/2019/sqlite-autoconf-${SQLITE_PV}.tar.gz \
+ "
+
+SRC_URI[md5sum] = "1f72631ce6e8efa5b4a6e55a43b3bdc0"
+SRC_URI[sha256sum] =
"50c39e85ea28b5ecfdb3f9e860afe9ba606381e21836b2849efca6a0bfe6ef6e"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] scripts/resulttool: Enable manual result store and regression
To enable store for testresults.json file from manualexecution,
add layers metadata to configuration and add "manual" map to
resultutils.store_map.
To enable regression for manual, add "manual" map to
resultutils.regression_map. Also added compulsory configurations
('MACHINE', 'IMAGE_BASENAME') to manualexecution.
Signed-off-by: Yeoh Ee Peng
---
scripts/lib/resulttool/manualexecution.py | 36 +--
scripts/lib/resulttool/resultutils.py | 9 +---
2 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/scripts/lib/resulttool/manualexecution.py
b/scripts/lib/resulttool/manualexecution.py
index ecdc4e7..a44cc86 100755
--- a/scripts/lib/resulttool/manualexecution.py
+++ b/scripts/lib/resulttool/manualexecution.py
@@ -19,6 +19,7 @@ import datetime
import re
from oeqa.core.runner import OETestResultJSONHelper
+
def load_json_file(file):
with open(file, "r") as f:
return json.load(f)
@@ -46,31 +47,34 @@ class ManualTestRunner(object):
def _get_input(self, config):
while True:
output = input('{} = '.format(config))
-if re.match('^[a-zA-Z0-9_]+$', output):
+if re.match('^[a-zA-Z0-9_-]+$', output):
break
-print('Only alphanumeric and underscore are allowed. Please try
again')
+print('Only alphanumeric and underscore/hyphen are allowed. Please
try again')
return output
def _create_config(self):
+from oeqa.utils.metadata import get_layers
+from oeqa.utils.commands import get_bb_var
+from resulttool.resultutils import store_map
+
+layers = get_layers(get_bb_var('BBLAYERS'))
self.configuration = {}
-while True:
-try:
-conf_total = int(input('\nPlease provide how many
configuration you want to save \n'))
-break
-except ValueError:
-print('Invalid input. Please provide input as a number not
character.')
-for i in range(conf_total):
+self.configuration['LAYERS'] = layers
+current_datetime = datetime.datetime.now()
+self.starttime = current_datetime.strftime('%Y%m%d%H%M%S')
+self.configuration['STARTTIME'] = self.starttime
+self.configuration['TEST_TYPE'] = 'manual'
+self.configuration['TEST_MODULE'] = self.test_module
+
+extra_config = set(store_map['manual']) - set(self.configuration)
+for config in sorted(extra_config):
print('-')
-print('This is configuration #%s ' % (i + 1) + '. Please provide
configuration name and its value')
+print('This is configuration #%s. Please provide configuration
value(use "None" if not applicable).'
+ % config)
print('-')
-name_conf = self._get_input('Configuration Name')
value_conf = self._get_input('Configuration Value')
print('-\n')
-self.configuration[name_conf.upper()] = value_conf
-current_datetime = datetime.datetime.now()
-self.starttime = current_datetime.strftime('%Y%m%d%H%M%S')
-self.configuration['STARTTIME'] = self.starttime
-self.configuration['TEST_TYPE'] = self.test_module
+self.configuration[config] = value_conf
def _create_result_id(self):
self.result_id = 'manual_' + self.test_module + '_' + self.starttime
diff --git a/scripts/lib/resulttool/resultutils.py
b/scripts/lib/resulttool/resultutils.py
index c8ccf1b..153f2b8 100644
--- a/scripts/lib/resulttool/resultutils.py
+++ b/scripts/lib/resulttool/resultutils.py
@@ -21,19 +21,22 @@ flatten_map = {
"oeselftest": [],
"runtime": [],
"sdk": [],
-"sdkext": []
+"sdkext": [],
+"manual": []
}
regression_map = {
"oeselftest": ['TEST_TYPE', 'MACHINE'],
"runtime": ['TESTSERIES', 'TEST_TYPE', 'IMAGE_BASENAME', 'MACHINE',
'IMAGE_PKGTYPE', 'DISTRO'],
"sdk": ['TESTSERIES', 'TEST_TYPE', 'IMAGE_BASENAME', 'MACHINE',
'SDKMACHINE'],
-"sdkext": ['TESTSERIES', 'TEST_TYPE', 'IMAGE_BASENAME', 'MACHINE',
'SDKMACHINE']
+"sdkext": ['TESTSERIES', 'TEST_TYPE', 'IMAGE_BASENAME', 'MACHINE',
'SDKMACHINE'],
+"manual": ['TEST_TYPE', 'TEST_MODULE', 'IMAGE_BASENAME', 'MACHINE']
}
store_map = {
"oeselftest": ['TEST_TYPE'],
"runtime": ['TEST_TYPE', 'DISTRO', 'MACHINE', 'IMAGE_BASENAME'],
"sdk": ['TEST_TYPE', 'MACHINE', 'SDKMACHINE', 'IMAGE_BASENAME'],
-"sdkext": ['TEST_TYPE', 'MACHINE', 'SDKMACHINE', 'IMAGE_BASENAME']
+"sdkext": ['TEST_TYPE', 'MACHINE', 'SDKMACHINE', 'IMAGE_BASENAME'],
+"manual": ['TEST_TYPE', 'TEST_MODULE', 'MACHINE', 'IMAGE_BASENAME']
}
#
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
[OE-core] [PATCH 3/3] kernel-devsrc: add files required for on-target build with 5.x
From: Bruce Ashfield
Both powerpc and mips require a few new files for the scripts
and prepare targets to work with a 5.0 kernel. We add the required
files to the architecture specific blocks, with appropriate
backwards compatibility considerations.
Signed-off-by: Bruce Ashfield
---
meta/recipes-kernel/linux/kernel-devsrc.bb | 10 ++
1 file changed, 10 insertions(+)
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb
b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 8fc0ffdbb3..cf2b476051 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -150,6 +150,13 @@ do_install() {
cp -a --parents arch/arm64/kernel/module.lds $kerneldir/build/
fi
+ if [ "${ARCH}" = "powerpc" ]; then
+ # 5.0 needs these files, but don't error if they aren't present in
the source
+ cp -a --parents arch/${ARCH}/kernel/syscalls/syscall.tbl
$kerneldir/build/ 2>/dev/null || :
+ cp -a --parents arch/${ARCH}/kernel/syscalls/syscalltbl.sh
$kerneldir/build/ 2>/dev/null || :
+ cp -a --parents arch/${ARCH}/kernel/syscalls/syscallhdr.sh
$kerneldir/build/ 2>/dev/null || :
+ fi
+
# include the machine specific headers for ARM variants, if available.
if [ "${ARCH}" = "arm" ]; then
cp -a --parents arch/${ARCH}/mach-*/include $kerneldir/build/
@@ -214,6 +221,9 @@ do_install() {
cp -a --parents kernel/time/timeconst.bc $kerneldir/build
cp -a --parents kernel/bounds.c $kerneldir/build
cp -a --parents Kbuild $kerneldir/build
+ cp -a --parents arch/mips/kernel/syscalls/*.sh $kerneldir/build
+ cp -a --parents arch/mips/kernel/syscalls/*.tbl $kerneldir/build
+ cp -a --parents arch/mips/tools/elf-entry.c $kerneldir/build
2>/dev/null || :
fi
# required to build scripts/selinux/genheaders/genheaders
--
2.19.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] core-image-kernel-dev: add systemtap and dependencies
From: Bruce Ashfield
To allow the kernel-dev image to test systemtap, we add the userspace
and required image configuration.
Signed-off-by: Bruce Ashfield
---
meta/recipes-extended/images/core-image-kernel-dev.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-extended/images/core-image-kernel-dev.bb
b/meta/recipes-extended/images/core-image-kernel-dev.bb
index a40b3aa955..4d16da1ea8 100644
--- a/meta/recipes-extended/images/core-image-kernel-dev.bb
+++ b/meta/recipes-extended/images/core-image-kernel-dev.bb
@@ -11,6 +11,7 @@ KERNEL_DEV_MODULE ?= "kernel-modules"
CORE_IMAGE_EXTRA_INSTALL += "${KERNEL_DEV_MODULE} \
${KERNEL_DEV_UTILS} \
${KERNEL_DEV_TOOLS} \
+ systemtap \
"
# We need extra space for things like kernel builds, etc.
@@ -18,3 +19,5 @@ IMAGE_ROOTFS_EXTRA_SPACE_append = " + 300"
# Let's define our own subset to test, we can later add a on-target kernel
build even!
DEFAULT_TEST_SUITES = "ping ssh df connman syslog scp date parselogs"
+
+IMAGE_FEATURES += "tools-profile"
--
2.19.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] systemtap: update to enable 5.0 kernel capabilities
From: Bruce Ashfield
Updating the systemtap 4.0 SRCREV to pick up changes that have been
made to support newer kernels (and in particular 5.0).
root@qemux86-64:~# stap --disable-cache -DSTP_NO_VERREL_CHECK ./hello.stp
[ 246.303263] stap_4843: loading out-of-tree module taints kernel.
hello world
root@qemux86-64:~#
The following commits are included in this update:
90ff34ac0 If available, use kernel's save_stack_trace_regs() for fallback
stack unwind
a9b0aa4db testsuite/systemtap.bpf :: tests should return, not exit 0
83f229abb cachestat.stp: workaround the current limitations of trace_printk
f912d520f Newer kernels tapsets may use the kprobe.function("*") adjust
alias_tapset.exp.
fe569f964 Handle name change of do_brk to do_brk_flags in the newer kernels
71dbdc9f9 Newer kernels tapsets may use the kprobe.function("*") adjust
pp.exp check.
20d23f97a Correct at_register.stp test arch name for arm64.
e0bcc2f92 cachestat.stp: new example based on a bpftrace script by David
Valin
18d1baceb session.cxx diagnostics: don't dump kernel_functions below
verbose=6
25b181ae4 Add __NR_chmod for missing defines on aarch64
2276b109e Add more __NR_* for missing defines on aarch64 (and ppc64)
e34d66dee PR24239: avoid symbol/type resolution of unused globals/functions
49d74d4fa Correct the at_register.exp test
c77884dcd Turn on guru mode for at_deref1.stp use of @kderef
a9a15a3f8 RHBZ1689180: correct group name typos in staprun.8
e7146dbfe Regenerate syscall_num.stp grouped by syscall name.
6bcf09813 Group initialization using the same string literal together in
syscall_num.stp
3752574dc Regenerate the syscall mapping information to add aarch32 to
aarch64 syscalls
af74da7b7 Update dump-syscalls.sh to generate 32-bit syscalls for aarch64
60144c0fa Match arm64 non-dwarf syscall probe points
d36f6fee8 PR24199: don't use exceptions to signal type-resolution failures
5e50524ff PR24199: at pass-2 verbosity > 3, trace $var error-chaining events
40f855fd5 PR24199: loc2stap: propagate dwarf DIE() source locations better
af9ef3369 Adjust noptrace.stp to avoid modifying ptrace syscall arguments
ca3946e62 Update pfiles.stp to work with Linux 4.17 and newer
9d3a1cd66 PR24217: stap -p2 speedup, condition-expression processing
ba7b83ec1 Conditionally define __NR_bdflush in systemtap runtime.
cdf77a210 testsuite/systemtap.bpf :: couple of bpf_tests clarifications
d6b529c43 fix embedded-c tag memoization thinko
d81a001ad pass-2 optimization: embedded-c code pragma searching
1832b8f51 Set up a BPF related testcase blacklist for regression testsing
purposes.
4e7686951 linux api update: compat_time* structs
1ac5a4499 linux api update: FAN_ALL_CLASS_BITS
17c2d352a unwinder: increase MAX_CFI to 8192 after a census of CFI sizes on
Fedora 29
2e373d294 runtime: adapt to uapi/linux/mount.h changes
6b0430b6b dummy commit to force buildbot rebuilds
d3964067f buildrun.cxx: older g++ compatibility: no std::string.back()
6b2838df5 Handle installation without stapusr group
f90ca3096 Simplify creation of groups during installation
38184abcd Fix get_user_pages() autoconf test for 4.4.y kernel
e2e13220f lkm-runtime time.c: prefer 4.15+ ktime_get_real_fast_ns
eb8c8de94 linux 5.0-rc3 adaptations
de5061899 parser: allow larger arrays
0fc1a5019 stap man page: document histogram per-bucket access/iteration
905865da1 PR16406 fixup :: correct comparison in _stp_module_check
c8084763b PR10280 initial fix: force vermagic for guru-mode scripts
3a29a2eef Make testcase at_var.exp work with stap-4.1+ and kernel-4.17+
53ff2b5df stap-prep: switch typo ($NEEDED => $package)
68bd23fd0 PR16596: add support for DW_OP_GNU_entry_value in location
expressions
aacee6563 Make sysc_bdflush.stp compatible with 4.17+ kernels.
891810c24 configury: tolerate dyninst10's need for -lboost_system
ec3b46eb9 RHBZ1655631: systemtap.spec: use Recommends: for kernel-*-devel
eef17e743 runtime/unwind: Allow to increase MAX_CFI
47ce37a14 systemtap.spec: merge unbotch - missing %changelog
f082df49d systemtap.spec: importing fedora rawhide changes
c9a393275 staprun/mainloop.c :: fix for loop initial decls
266c72bd0 PR23866 part: expose raw syscall tracepoint to bpf
ab368ac2a PR23891: Make sure stap and staprun respond to SIGTERM when
stderr/stdout are blocked
0a0595509 Fix segfaults in dwarf array pointer subscripting when -vvv is
specified
4a8652800 Make opeartor @var() no longer assume @entry() in return probes.
f5c19712c Add the ucalls.stp to the systemtap examples.
7d82f1bdc Adjust tcp_trace.stp example to work with newer Linux kernel's
timers
f6d683666 Adjust the vfs_open to provide cred variable with 4.18 kernels
008a0cbfd Userspace_probing.xml: change '-ldd' to '--ldd' command line
option.
e6227e5df bpf-translate.cxx: don't clobber any earlier value of c
cbf3b6e6a
Re: [OE-core] [PATCH 0/6] linux-yocto: consolidated pull request (5.0 kernel intro)
On Wed, Mar 6, 2019 at 11:21 PM Bruce Ashfield wrote: > > On Wed, Mar 6, 2019 at 6:05 PM Richard Purdie > wrote: > > > > On Wed, 2019-03-06 at 11:37 -0500, bruce.ashfi...@gmail.com wrote: > > > The -rc8 of the kernel pushed this out a week longer than I would > > > have liked, but luckily the -dev kernel has been running 5.0 for > > > quite a while, so most of the issues had been worked out already. > > > > > > In this series we have the bump of the libc-headers to 5.0, I've > > > built all arches for both musl and glibc, with no issues popping > > > up due to the headers bump. A few patches were dropped, since they > > > are now upstream. > > > > > > I've also introduce the 5.0 versioned recipe in this series and > > > adjusted the two machines that still have a preferred version to > > > use it. Again, this was built and booted on all arches and over > > > several image types (minimal, sato, kernel-dev). > > > > > > As usual lttng was tweaked to work with 5.0, but I was able to > > > keep it on the same 2.10 stable branch and only pull in a few > > > pending patches that haven't been formally released yet. > > > > > > Once we get the h/w reference boards, and reference distros moved > > > to 4.19 and 5.0, I'll send a follow up patch to remove 4.18 > > > from master. > > > > > > I'll send follow up patches to the yocto-bsps and poky as > > > appropriate, but until the last few issues are resolved, they can > > > stay out of tree. > > > > > > I captured as many details as possible in the commit messages of > > > the individual patches. > > > > Thanks Bruce! > > > > Just to summarise where we're at: > > > > a) The runtime stap tests fail everywhere, we probably need systemtap > >patches. > > Fixes. Patches out shortly. > > > b) Issue with KMACHINE_qemuarm = "qemuarma15" not working, blocks > >qemuarm armv7 switch > > I can have a look at this on Thursday. > > > c) qemumips and qemuppc: > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/60/builds/365/steps/7/logs/step1c > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/63/builds/365/steps/7/logs/step1c > >RESULTS - kernelmodule.KernelModuleTest.test_kernel_module - Testcase > > 1541: FAILED > > Fixed, patches out shortly. > > > d) perf do_compile race seen on qemuarm64 (didn't reproduce locally): > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/366/steps/7/logs/step1b > > I can't reproduce this one either. I did notice that the AB log seems to show 4.19 being built for this, is that just a red herring ? NOTE: recipe iptables-1.6.2-r0: task do_package_write_rpm: Succeeded NOTE: recipe iptables-1.6.2-r0: task do_package_qa: Succeeded NOTE: recipe ofono-1.25-r0: task do_package_write_rpm: Succeeded NOTE: recipe linux-yocto-4.19.19+gitAUTOINC+41fe45f7c5_11e0e616ed-r0: task do_package_write_deb: Succeeded NOTE: recipe ofono-1.25-r0: task do_package_write_deb: Succeeded NOTE: recipe linux-yocto-4.19.19+gitAUTOINC+41fe45f7c5_11e0e616ed-r0: task do_package_write_rpm: Succeeded Bruce > > > e) qemuarm64 graphics startup issue > > > > Not sure on this one. > > Bruce > > > Cheers, > > > > Richard > > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/6] linux-yocto: consolidated pull request (5.0 kernel intro)
On Wed, Mar 6, 2019 at 6:05 PM Richard Purdie wrote: > > On Wed, 2019-03-06 at 11:37 -0500, bruce.ashfi...@gmail.com wrote: > > The -rc8 of the kernel pushed this out a week longer than I would > > have liked, but luckily the -dev kernel has been running 5.0 for > > quite a while, so most of the issues had been worked out already. > > > > In this series we have the bump of the libc-headers to 5.0, I've > > built all arches for both musl and glibc, with no issues popping > > up due to the headers bump. A few patches were dropped, since they > > are now upstream. > > > > I've also introduce the 5.0 versioned recipe in this series and > > adjusted the two machines that still have a preferred version to > > use it. Again, this was built and booted on all arches and over > > several image types (minimal, sato, kernel-dev). > > > > As usual lttng was tweaked to work with 5.0, but I was able to > > keep it on the same 2.10 stable branch and only pull in a few > > pending patches that haven't been formally released yet. > > > > Once we get the h/w reference boards, and reference distros moved > > to 4.19 and 5.0, I'll send a follow up patch to remove 4.18 > > from master. > > > > I'll send follow up patches to the yocto-bsps and poky as > > appropriate, but until the last few issues are resolved, they can > > stay out of tree. > > > > I captured as many details as possible in the commit messages of > > the individual patches. > > Thanks Bruce! > > Just to summarise where we're at: > > a) The runtime stap tests fail everywhere, we probably need systemtap >patches. Fixes. Patches out shortly. > b) Issue with KMACHINE_qemuarm = "qemuarma15" not working, blocks >qemuarm armv7 switch I can have a look at this on Thursday. > c) qemumips and qemuppc: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/60/builds/365/steps/7/logs/step1c > > https://autobuilder.yoctoproject.org/typhoon/#/builders/63/builds/365/steps/7/logs/step1c >RESULTS - kernelmodule.KernelModuleTest.test_kernel_module - Testcase > 1541: FAILED Fixed, patches out shortly. > d) perf do_compile race seen on qemuarm64 (didn't reproduce locally): > > https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/366/steps/7/logs/step1b I can't reproduce this one either. > e) qemuarm64 graphics startup issue > Not sure on this one. Bruce > Cheers, > > Richard > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] insane.bbclass: Make INSANE_SKIP work for qa pkgconfig and la
On Wed, Mar 6, 2019 at 7:22 PM Robert Yang wrote:
>
> The INSANE_SKIP = "pkgconfig" or "la" didn't work, this patch fixes the
> problem.
>
> [YOCTO #13087]
>
> Signed-off-by: Robert Yang
> ---
> meta/classes/insane.bbclass | 20 +++-
> 1 file changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
> index 6411884..fd9c5f0 100644
> --- a/meta/classes/insane.bbclass
> +++ b/meta/classes/insane.bbclass
> @@ -570,7 +570,7 @@ python populate_lic_qa_checksum() {
> bb.fatal("Fatal QA errors found, failing task.")
> }
>
> -def package_qa_check_staged(path,d):
> +def qa_check_staged(path,d):
> """
> Check staged la and pc files for common problems like references to the
> work
> directory.
> @@ -589,20 +589,31 @@ def package_qa_check_staged(path,d):
> else:
> pkgconfigcheck = tmpdir
>
> +skip = (d.getVar('INSANE_SKIP') or "").split()
> +skip_la = False
> +if 'la' in skip:
> +bb.note("Recipe %s skipping qa chekcing: la" % d.getVar('PN'))
Typo (copied and pasted in various other places too).
> +skip_la = True
> +
> +skip_pkgconfig = False
> +if 'pkgconfig' in skip:
> +bb.note("Recipe %s skipping qa chekcing: pkgconfig" % d.getVar('PN'))
> +skip_pkgconfig = True
> +
> # find all .la and .pc files
> # read the content
> # and check for stuff that looks wrong
> for root, dirs, files in os.walk(path):
> for file in files:
> path = os.path.join(root,file)
> -if file.endswith(".la"):
> +if file.endswith(".la") and not skip_la:
> with open(path) as f:
> file_content = f.read()
> file_content = file_content.replace(recipesysroot, "")
> if workdir in file_content:
> error_msg = "%s failed sanity test (workdir) in path
> %s" % (file,root)
> sane &= package_qa_handle_error("la", error_msg, d)
> -elif file.endswith(".pc"):
> +elif file.endswith(".pc") and not skip_pkgconfig:
> with open(path) as f:
> file_content = f.read()
> file_content = file_content.replace(recipesysroot, "")
> @@ -1034,8 +1045,7 @@ addtask do_package_qa_setscene
>
> python do_qa_staging() {
> bb.note("QA checking staging")
> -
> -if not package_qa_check_staged(d.expand('${SYSROOT_DESTDIR}${libdir}'),
> d):
> +if not qa_check_staged(d.expand('${SYSROOT_DESTDIR}${libdir}'), d):
> bb.fatal("QA staging was broken by the package built above")
> }
>
> --
> 2.7.4
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] insane.bbclass: Make INSANE_SKIP work for qa pkgconfig and la
The INSANE_SKIP = "pkgconfig" or "la" didn't work, this patch fixes the problem.
[YOCTO #13087]
Signed-off-by: Robert Yang
---
meta/classes/insane.bbclass | 20 +++-
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 6411884..fd9c5f0 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -570,7 +570,7 @@ python populate_lic_qa_checksum() {
bb.fatal("Fatal QA errors found, failing task.")
}
-def package_qa_check_staged(path,d):
+def qa_check_staged(path,d):
"""
Check staged la and pc files for common problems like references to the
work
directory.
@@ -589,20 +589,31 @@ def package_qa_check_staged(path,d):
else:
pkgconfigcheck = tmpdir
+skip = (d.getVar('INSANE_SKIP') or "").split()
+skip_la = False
+if 'la' in skip:
+bb.note("Recipe %s skipping qa chekcing: la" % d.getVar('PN'))
+skip_la = True
+
+skip_pkgconfig = False
+if 'pkgconfig' in skip:
+bb.note("Recipe %s skipping qa chekcing: pkgconfig" % d.getVar('PN'))
+skip_pkgconfig = True
+
# find all .la and .pc files
# read the content
# and check for stuff that looks wrong
for root, dirs, files in os.walk(path):
for file in files:
path = os.path.join(root,file)
-if file.endswith(".la"):
+if file.endswith(".la") and not skip_la:
with open(path) as f:
file_content = f.read()
file_content = file_content.replace(recipesysroot, "")
if workdir in file_content:
error_msg = "%s failed sanity test (workdir) in path
%s" % (file,root)
sane &= package_qa_handle_error("la", error_msg, d)
-elif file.endswith(".pc"):
+elif file.endswith(".pc") and not skip_pkgconfig:
with open(path) as f:
file_content = f.read()
file_content = file_content.replace(recipesysroot, "")
@@ -1034,8 +1045,7 @@ addtask do_package_qa_setscene
python do_qa_staging() {
bb.note("QA checking staging")
-
-if not package_qa_check_staged(d.expand('${SYSROOT_DESTDIR}${libdir}'), d):
+if not qa_check_staged(d.expand('${SYSROOT_DESTDIR}${libdir}'), d):
bb.fatal("QA staging was broken by the package built above")
}
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] insane.bbclass: Add configure-unsafe and configure-gettext
So that the errors can be controlled by ERROR_QA or WARN_QA, and make them work
with INSANE_SKIP.
Signed-off-by: Robert Yang
---
meta/classes/insane.bbclass | 28 +---
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index fd9c5f0..fedf2c9 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -33,7 +33,8 @@ ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch
pkgconfig la \
perms dep-cmp pkgvarcheck perm-config perm-line perm-link \
split-strip packages-list pkgv-undefined var-undefined \
version-going-backwards expanded-d invalid-chars \
-license-checksum dev-elf file-rdeps \
+license-checksum dev-elf file-rdeps configure-unsafe \
+configure-gettext \
"
# Add usrmerge QA check based on distro feature
ERROR_QA_append = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '
usrmerge', '', d)}"
@@ -1059,15 +1060,22 @@ python do_qa_configure() {
configs = []
workdir = d.getVar('WORKDIR')
-if bb.data.inherits_class('autotools', d):
+skip = (d.getVar('INSANE_SKIP') or "").split()
+skip_configure_unsafe = False
+if 'configure-unsafe' in skip:
+bb.note("Recipe %s skipping qa chekcing: configure-unsafe" %
d.getVar('PN'))
+skip_configure_unsafe = True
+
+if bb.data.inherits_class('autotools', d) and not skip_configure_unsafe:
bb.note("Checking autotools environment for common misconfiguration")
for root, dirs, files in os.walk(workdir):
statement = "grep -q -F -e 'CROSS COMPILE Badness:' -e 'is unsafe
for cross-compilation' %s" % \
os.path.join(root,"config.log")
if "config.log" in files:
if subprocess.call(statement, shell=True) == 0:
-bb.fatal("""This autoconf log indicates errors, it looked
at host include and/or library paths while determining system capabilities.
-Rerun configure task after fixing this.""")
+error_msg = """This autoconf log indicates errors, it
looked at host include and/or library paths while determining system
capabilities.
+Rerun configure task after fixing this."""
+package_qa_handle_error("configure-unsafe", error_msg, d)
if "configure.ac" in files:
configs.append(os.path.join(root,"configure.ac"))
@@ -1078,8 +1086,14 @@ Rerun configure task after fixing this.""")
# Check gettext configuration and dependencies are correct
###
+skip_configure_gettext = False
+if 'configure-gettext' in skip:
+bb.note("Recipe %s skipping qa chekcing: configure-gettext" %
d.getVar('PN'))
+skip_configure_gettext = True
+
cnf = d.getVar('EXTRA_OECONF') or ""
-if "gettext" not in d.getVar('P') and "gcc-runtime" not in d.getVar('P')
and "--disable-nls" not in cnf:
+if not ("gettext" in d.getVar('P') or "gcc-runtime" in d.getVar('P') or \
+"--disable-nls" in cnf or skip_configure_gettext):
ml = d.getVar("MLPREFIX") or ""
if bb.data.inherits_class('cross-canadian', d):
gt = "nativesdk-gettext"
@@ -1090,8 +1104,8 @@ Rerun configure task after fixing this.""")
for config in configs:
gnu = "grep \"^[[:space:]]*AM_GNU_GETTEXT\" %s >/dev/null" %
config
if subprocess.call(gnu, shell=True) == 0:
-bb.fatal("""%s required but not in DEPENDS for file %s.
-Missing inherit gettext?""" % (gt, config))
+error_msg = "%s required but not in DEPENDS for file %s.
Missing inherit gettext?"
+package_qa_handle_error("configure-gettext", error_msg, d)
###
# Check unrecognised configure options (with a white list)
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] insane.bbclass: Fixes for do_qa_configure and qa_check_staged.
The following changes since commit 0a306d4f706b55f64228c7a0a14ff1ad127d7df9: scripts: Add oe-pylint (2019-03-06 23:12:06 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/qa http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/qa Robert Yang (2): insane.bbclass: Make INSANE_SKIP work for qa pkgconfig and la insane.bbclass: Add configure-unsafe and configure-gettext meta/classes/insane.bbclass | 48 + 1 file changed, 36 insertions(+), 12 deletions(-) -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] systemd: backport patch to fix parallel build failure
*** BLURB HERE *** The following changes since commit 525c5e516323ff584f65bed3320626b1d056260d: README.poky: Add pointers to key contributions wiki guides (2019-03-06 23:12:27 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib ChenQi/systemd-parallel http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/systemd-parallel Chen Qi (1): systemd: backport patch to fix parallel build failure ...re-version.h-as-dep-for-various-targets-t.patch | 118 + meta/recipes-core/systemd/systemd_241.bb | 1 + 2 files changed, 119 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/0001-meson-declare-version.h-as-dep-for-various-targets-t.patch -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] systemd: backport patch to fix parallel build failure
Backport patch to fix parallel build failure like below.
In file included from ../git/src/core/dbus-manager.c:10:
../git/src/basic/build.h:4:10: fatal error: version.h: No such file or
directory
#include "version.h"
^~~
compilation terminated.
Signed-off-by: Chen Qi
---
...re-version.h-as-dep-for-various-targets-t.patch | 118 +
meta/recipes-core/systemd/systemd_241.bb | 1 +
2 files changed, 119 insertions(+)
create mode 100644
meta/recipes-core/systemd/systemd/0001-meson-declare-version.h-as-dep-for-various-targets-t.patch
diff --git
a/meta/recipes-core/systemd/systemd/0001-meson-declare-version.h-as-dep-for-various-targets-t.patch
b/meta/recipes-core/systemd/systemd/0001-meson-declare-version.h-as-dep-for-various-targets-t.patch
new file mode 100644
index 000..01936f2
--- /dev/null
+++
b/meta/recipes-core/systemd/systemd/0001-meson-declare-version.h-as-dep-for-various-targets-t.patch
@@ -0,0 +1,118 @@
+From 9f86d8769ab830a724c84f849975b5595e26b47c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
+Date: Sun, 24 Feb 2019 22:49:38 +0100
+Subject: [PATCH] meson: declare version.h as dep for various targets that
+ include build.h
+
+Should fix #11565.
+
+Upstream-Status: Backport
+
+Signed-off-by: Chen Qi
+---
+ meson.build | 19 +--
+ src/core/meson.build | 3 ++-
+ src/udev/meson.build | 1 +
+ 3 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 30df834..232f3e1 100644
+--- a/meson.build
b/meson.build
+@@ -1637,7 +1637,8 @@ exe = executable('systemd-analyze',
+ include_directories : includes,
+ link_with : [libcore,
+ libshared],
+- dependencies : [threads,
++ dependencies : [versiondep,
++ threads,
+ librt,
+ libseccomp,
+ libselinux,
+@@ -2183,7 +2184,8 @@ if conf.get('ENABLE_IMPORTD') == 1
+ systemd_pull_sources,
+ include_directories : includes,
+ link_with : [libshared],
+- dependencies : [libcurl,
++ dependencies : [versiondep,
++ libcurl,
+ libz,
+ libbzip2,
+ libxz,
+@@ -2232,7 +2234,8 @@ if conf.get('ENABLE_REMOTE') == 1 and
conf.get('HAVE_LIBCURL') == 1
+ systemd_journal_upload_sources,
+ include_directories : includes,
+ link_with : [libshared],
+- dependencies : [threads,
++ dependencies : [versiondep,
++ threads,
+ libcurl,
+ libgnutls,
+ libxz,
+@@ -2558,6 +2561,7 @@ exe = executable('systemd-stdio-bridge',
+ 'src/stdio-bridge/stdio-bridge.c',
+ include_directories : includes,
+ link_with : [libshared],
++ dependencies : [versiondep],
+ install_rpath : rootlibexecdir,
+ install : true)
+ public_programs += exe
+@@ -2641,7 +2645,8 @@ exe = executable('systemd-udevd',
+ link_with : [libudev_core,
+ libsystemd_network,
+ libudev_static],
+- dependencies : [threads,
++ dependencies : [versiondep,
++ threads,
+ libkmod,
+ libidn,
+ libacl,
+@@ -2658,7 +2663,8 @@ exe = executable('udevadm',
+ link_with : [libudev_core,
+ libsystemd_network,
+ libudev_static],
+- dependencies : [threads,
++ dependencies : [versiondep,
++ threads,
+ libkmod,
+ libidn,
+ libacl,
+@@ -2798,7 +2804,8 @@ foreach tuple : tests
+ sources,
+ include_directories : incs,
+ link_with : link_with,
+-dependencies : dependencies,
++dependencies : [versiondep,
++dependencies],
+ c_args : defs,
+
[OE-core] [PATCH 1/1] systemd: update efi PACKAGECONFIG to depend on coreutils-native
For now, if 'efi' is enabled, we get the following error: | src/boot/efi/meson.build:63:24: ERROR: Program or command 'realpath' not found or not executable So update the PACKAGECONFIG setting to depend on coreutils-native. Signed-off-by: Chen Qi --- meta/recipes-core/systemd/systemd_241.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd_241.bb b/meta/recipes-core/systemd/systemd_241.bb index 44a132a..7478fdd 100644 --- a/meta/recipes-core/systemd/systemd_241.bb +++ b/meta/recipes-core/systemd/systemd_241.bb @@ -119,7 +119,7 @@ PACKAGECONFIG[bzip2] = "-Dbzip2=true,-Dbzip2=false,bzip2" PACKAGECONFIG[coredump] = "-Dcoredump=true,-Dcoredump=false" PACKAGECONFIG[cryptsetup] = "-Dlibcryptsetup=true,-Dlibcryptsetup=false,cryptsetup" PACKAGECONFIG[dbus] = "-Ddbus=true,-Ddbus=false,dbus" -PACKAGECONFIG[efi] = "-Defi=true,-Defi=false" +PACKAGECONFIG[efi] = "-Defi=true,-Defi=false,coreutils-native" PACKAGECONFIG[elfutils] = "-Delfutils=true,-Delfutils=false,elfutils" PACKAGECONFIG[firstboot] = "-Dfirstboot=true,-Dfirstboot=false" # Sign the journal for anti-tampering -- 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] systemd: update efi PACKAGECONFIG to depend on coreutils-native
*** BLURB HERE *** The following changes since commit 525c5e516323ff584f65bed3320626b1d056260d: README.poky: Add pointers to key contributions wiki guides (2019-03-06 23:12:27 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib ChenQi/efi-realpath http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/efi-realpath Chen Qi (1): systemd: update efi PACKAGECONFIG to depend on coreutils-native meta/recipes-core/systemd/systemd_241.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [poky][meta][sumo][PATCH] lighttpd: added ptest
On Mon, 2019-03-04 at 18:21 +, Aditya Tayade wrote: > Reused lighttpd internal tests and did minimal patching to fix paths. > > Upstream-Status: Pending > > Signed-off-by: Aditya Tayade > --- > ...-use-standard-sbin-and-lib-path-for-ptest.patch | 37 > meta/recipes-extended/lighttpd/lighttpd/run-ptest | 4 ++ > meta/recipes-extended/lighttpd/lighttpd_1.4.48.bb | 66 > +- > 3 files changed, 106 insertions(+), 1 deletion(-) > create mode 100644 meta/recipes-extended/lighttpd/lighttpd/0002-use- > standard-sbin-and-lib-path-for-ptest.patch > create mode 100644 meta/recipes-extended/lighttpd/lighttpd/run-ptest I like the idea of adding these ptests but we need to do this against master before we can do this in older releases like thud or sumo. Would you be able to provide a version for master (which has a different newer version of lighttpd? Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/6] linux-yocto: consolidated pull request (5.0 kernel intro)
On Wed, 2019-03-06 at 11:37 -0500, bruce.ashfi...@gmail.com wrote: > The -rc8 of the kernel pushed this out a week longer than I would > have liked, but luckily the -dev kernel has been running 5.0 for > quite a while, so most of the issues had been worked out already. > > In this series we have the bump of the libc-headers to 5.0, I've > built all arches for both musl and glibc, with no issues popping > up due to the headers bump. A few patches were dropped, since they > are now upstream. > > I've also introduce the 5.0 versioned recipe in this series and > adjusted the two machines that still have a preferred version to > use it. Again, this was built and booted on all arches and over > several image types (minimal, sato, kernel-dev). > > As usual lttng was tweaked to work with 5.0, but I was able to > keep it on the same 2.10 stable branch and only pull in a few > pending patches that haven't been formally released yet. > > Once we get the h/w reference boards, and reference distros moved > to 4.19 and 5.0, I'll send a follow up patch to remove 4.18 > from master. > > I'll send follow up patches to the yocto-bsps and poky as > appropriate, but until the last few issues are resolved, they can > stay out of tree. > > I captured as many details as possible in the commit messages of > the individual patches. Thanks Bruce! Just to summarise where we're at: a) The runtime stap tests fail everywhere, we probably need systemtap patches. b) Issue with KMACHINE_qemuarm = "qemuarma15" not working, blocks qemuarm armv7 switch c) qemumips and qemuppc: https://autobuilder.yoctoproject.org/typhoon/#/builders/60/builds/365/steps/7/logs/step1c https://autobuilder.yoctoproject.org/typhoon/#/builders/63/builds/365/steps/7/logs/step1c RESULTS - kernelmodule.KernelModuleTest.test_kernel_module - Testcase 1541: FAILED d) perf do_compile race seen on qemuarm64 (didn't reproduce locally): https://autobuilder.yoctoproject.org/typhoon/#/builders/42/builds/366/steps/7/logs/step1b e) qemuarm64 graphics startup issue Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libpcre2: fix CVE-2017-7186
Signed-off-by: Ross Burton
---
.../libpcre/libpcre2/CVE-2017-7186.patch | 83 ++
meta/recipes-support/libpcre/libpcre2_10.32.bb | 1 +
2 files changed, 84 insertions(+)
create mode 100644 meta/recipes-support/libpcre/libpcre2/CVE-2017-7186.patch
diff --git a/meta/recipes-support/libpcre/libpcre2/CVE-2017-7186.patch
b/meta/recipes-support/libpcre/libpcre2/CVE-2017-7186.patch
new file mode 100644
index 000..7cd7c27c6c0
--- /dev/null
+++ b/meta/recipes-support/libpcre/libpcre2/CVE-2017-7186.patch
@@ -0,0 +1,83 @@
+libpcre1 in PCRE 8.40 and libpcre2 in PCRE2 10.23 allow remote attackers to
+cause a denial of service (segmentation violation for read access, and
+application crash) by triggering an invalid Unicode property lookup.
+
+CVE: CVE-2017-7186
+Upstream-Status: Backport
+Signed-off-by: Ross Burton
+
+---
+ src/pcre2_internal.h | 15 ++-
+ src/pcre2_ucd.c | 14 ++
+ 2 files changed, 28 insertions(+), 1 deletion(-)
+
+diff --git a/src/pcre2_internal.h b/src/pcre2_internal.h
+index 6a8774c..720bbc9 100644
+--- a/src/pcre2_internal.h
b/src/pcre2_internal.h
+@@ -1774,10 +1774,17 @@ typedef struct {
+ /* UCD access macros */
+
+ #define UCD_BLOCK_SIZE 128
+-#define GET_UCD(ch) (PRIV(ucd_records) + \
++#define REAL_GET_UCD(ch) (PRIV(ucd_records) + \
+ PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \
+ UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE])
+
++#if PCRE2_CODE_UNIT_WIDTH == 32
++#define GET_UCD(ch) ((ch > MAX_UTF_CODE_POINT)? \
++ PRIV(dummy_ucd_record) : REAL_GET_UCD(ch))
++#else
++#define GET_UCD(ch) REAL_GET_UCD(ch)
++#endif
++
+ #define UCD_CHARTYPE(ch)GET_UCD(ch)->chartype
+ #define UCD_SCRIPT(ch) GET_UCD(ch)->script
+ #define UCD_CATEGORY(ch)PRIV(ucp_gentype)[UCD_CHARTYPE(ch)]
+@@ -1834,6 +1841,9 @@ extern const uint8_t PRIV(utf8_table4)[];
+ #define _pcre2_default_compile_context
PCRE2_SUFFIX(_pcre2_default_compile_context_)
+ #define _pcre2_default_match_context
PCRE2_SUFFIX(_pcre2_default_match_context_)
+ #define _pcre2_default_tables PCRE2_SUFFIX(_pcre2_default_tables_)
++#if PCRE2_CODE_UNIT_WIDTH == 32
++#define _pcre2_dummy_ucd_recordPCRE2_SUFFIX(_pcre2_dummy_ucd_record_)
++#endif
+ #define _pcre2_hspace_list PCRE2_SUFFIX(_pcre2_hspace_list_)
+ #define _pcre2_vspace_list PCRE2_SUFFIX(_pcre2_vspace_list_)
+ #define _pcre2_ucd_caseless_sets PCRE2_SUFFIX(_pcre2_ucd_caseless_sets_)
+@@ -1858,6 +1868,9 @@ extern const uint32_t
PRIV(hspace_list)[];
+ extern const uint32_t PRIV(vspace_list)[];
+ extern const uint32_t PRIV(ucd_caseless_sets)[];
+ extern const ucd_recordPRIV(ucd_records)[];
++#if PCRE2_CODE_UNIT_WIDTH == 32
++extern const ucd_recordPRIV(dummy_ucd_record)[];
++#endif
+ extern const uint8_t PRIV(ucd_stage1)[];
+ extern const uint16_t PRIV(ucd_stage2)[];
+ extern const uint32_t PRIV(ucp_gbtable)[];
+diff --git a/src/pcre2_ucd.c b/src/pcre2_ucd.c
+index 116f537..56aa29d 100644
+--- a/src/pcre2_ucd.c
b/src/pcre2_ucd.c
+@@ -41,6 +41,20 @@ const uint32_t PRIV(ucd_caseless_sets)[] = {0};
+
+ const char *PRIV(unicode_version) = "8.0.0";
+
++/* If the 32-bit library is run in non-32-bit mode, character values
++greater than 0x10 may be encountered. For these we set up a
++special record. */
++
++#if PCRE2_CODE_UNIT_WIDTH == 32
++const ucd_record PRIV(dummy_ucd_record)[] = {{
++ ucp_Common,/* script */
++ ucp_Cn,/* type unassigned */
++ ucp_gbOther, /* grapheme break property */
++ 0, /* case set */
++ 0, /* other case */
++ }};
++#endif
++
+ /* When recompiling tables with a new Unicode version, please check the
+ types in this structure definition from pcre2_internal.h (the actual
+ field names will be different):
+--
+2.12.1
diff --git a/meta/recipes-support/libpcre/libpcre2_10.32.bb
b/meta/recipes-support/libpcre/libpcre2_10.32.bb
index 3a0aa53029f..59953626c74 100644
--- a/meta/recipes-support/libpcre/libpcre2_10.32.bb
+++ b/meta/recipes-support/libpcre/libpcre2_10.32.bb
@@ -12,6 +12,7 @@ LIC_FILES_CHKSUM =
"file://LICENCE;md5=cf66d307bf03bae65d413eb7a8e603a0"
SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2 \
file://pcre-cross.patch \
+ file://CVE-2017-7186.patch \
"
SRC_URI[md5sum] = "8a096287153fb994970df3570e90fcb5"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] wpa-supplicant: Remove no longer required hack for libnl
> On Mar 6, 2019, at 02:46, Adrian Bunk wrote:
>
> Upstream already fixed this properly by using pkg-config.
>
> Signed-off-by: Adrian Bunk
Reviewed-by: Jean-Francois Dagenais
> ---
> meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.7.bb | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.7.bb
> b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.7.bb
> index 6fc5cf5db7..fe5fa2b82e 100644
> --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.7.bb
> +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.7.bb
> @@ -42,8 +42,6 @@ CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf"
> do_configure () {
> ${MAKE} -C wpa_supplicant clean
> install -m 0755 ${WORKDIR}/defconfig wpa_supplicant/.config
> - echo "CFLAGS +=\"-I${STAGING_INCDIR}/libnl3\"" >> wpa_supplicant/.config
> - echo "DRV_CFLAGS +=\"-I${STAGING_INCDIR}/libnl3\"" >>
> wpa_supplicant/.config
>
> if echo "${PACKAGECONFIG}" | grep -qw "openssl"; then
> ssl=openssl
> --
> 2.17.1
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 2/4] inetutils: Import version 1.9.4
In order to have more robust stand-alone network tools in oe-core, bring
in inetutils from meta-openembedded/meta-networking. This imports the
recipes as of git commit:
commit 408204073e6bdcd8ac586e05d5b75213417673f2
Author: Martin Jansa
Date: Thu Aug 16 20:39:15 2018 +
inetutils: fix build with glibc-2.28
Signed-off-by: Tom Rini
---
Changes in v2:
- Fix wording (thanks André!)
- Add self as maintainer
---
meta/conf/distro/include/maintainers.inc | 1 +
.../0001-rcp-fix-to-work-with-large-files.patch| 31
.../inetutils/inetutils/fix-disable-ipv6.patch | 83 +
...tf-parse-pull-in-features.h-for-__GLIBC__.patch | 29 +++
.../inetutils/inetutils-1.8-0003-wchar.patch | 14 ++
.../inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch | 26 +++
...ls-only-check-pam_appl.h-when-pam-enabled.patch | 40
.../inetutils/inetutils/rexec.xinetd.inetutils | 20 ++
.../inetutils/inetutils/rlogin.xinetd.inetutils| 23 +++
.../inetutils/inetutils/rsh.xinetd.inetutils | 21 +++
.../inetutils/inetutils/telnet.xinetd.inetutils| 13 ++
.../inetutils/inetutils/tftpd.xinetd.inetutils | 19 ++
.../inetutils/inetutils/version.patch | 17 ++
.../inetutils/inetutils_1.9.4.bb | 206 +
14 files changed, 543 insertions(+)
create mode 100644
meta/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch
create mode 100644
meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch
create mode 100644
meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch
create mode 100644
meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch
create mode 100644
meta/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch
create mode 100644
meta/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch
create mode 100644
meta/recipes-connectivity/inetutils/inetutils/rexec.xinetd.inetutils
create mode 100644
meta/recipes-connectivity/inetutils/inetutils/rlogin.xinetd.inetutils
create mode 100644
meta/recipes-connectivity/inetutils/inetutils/rsh.xinetd.inetutils
create mode 100644
meta/recipes-connectivity/inetutils/inetutils/telnet.xinetd.inetutils
create mode 100644
meta/recipes-connectivity/inetutils/inetutils/tftpd.xinetd.inetutils
create mode 100644 meta/recipes-connectivity/inetutils/inetutils/version.patch
create mode 100644 meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index 34e578abd73e..950b8e8951ee 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -269,6 +269,7 @@ RECIPE_MAINTAINER_pn-i2c-tools = "Anuj Mittal
"
RECIPE_MAINTAINER_pn-icecc-create-env = "Joshua Watt "
RECIPE_MAINTAINER_pn-icu = "Alexander Kanavin "
RECIPE_MAINTAINER_pn-ifupdown = "Anuj Mittal "
+RECIPE_MAINTAINER_pn-inetutils = "Tom Rini "
RECIPE_MAINTAINER_pn-init-ifupdown = "Anuj Mittal "
RECIPE_MAINTAINER_pn-initramfs-boot = "Otavio Salvador
"
RECIPE_MAINTAINER_pn-initramfs-framework = "Otavio Salvador
"
diff --git
a/meta/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch
b/meta/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch
new file mode 100644
index ..d4764f586736
--- /dev/null
+++
b/meta/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch
@@ -0,0 +1,31 @@
+Upstream-Status: Pending
+
+Subject: rcp: fix to work with large files
+
+When we copy file by rcp command, if the file > 2GB, it will fail.
+The cause is that it used incorrect data type on file size in sink() of rcp.
+
+Signed-off-by: Chen Qi
+---
+ src/rcp.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/rcp.c b/src/rcp.c
+index 21f55b6..bafa35f 100644
+--- a/src/rcp.c
b/src/rcp.c
+@@ -876,9 +876,9 @@ sink (int argc, char *argv[])
+ enum
+ { YES, NO, DISPLAYED } wrerr;
+ BUF *bp;
+- off_t i, j;
++ off_t i, j, size;
+ int amt, count, exists, first, mask, mode, ofd, omode;
+- int setimes, size, targisdir, wrerrno;
++ int setimes, targisdir, wrerrno;
+ char ch, *cp, *np, *targ, *vect[1], buf[BUFSIZ];
+ const char *why;
+
+--
+1.9.1
+
diff --git
a/meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch
b/meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch
new file mode 100644
index ..24c134fcac8d
--- /dev/null
+++ b/meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch
@@ -0,0 +1,83 @@
+Upstream: http://www.mail-archive.com/bug-inetutils@gnu.org/msg02103.html
+
+Upstream-Status: Pending
+
+Signed-off-by: Jackie Huang
+---
+ ping/ping_common.h | 20
+ 1 file changed, 20
[OE-core] [PATCH v3 4/4] imagefeatures: Add test to blacklist building busybox
Now that we have a packagegroup that can be used to replace the overall
functionality of busybox as base-utils, add a test that we can continue
to build a fairly complex image without busybox being available. This
also doubles as documentation-by-test of how to do this.
Signed-off-by: Tom Rini
---
meta/lib/oeqa/selftest/cases/imagefeatures.py | 26 ++
1 file changed, 26 insertions(+)
diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py
b/meta/lib/oeqa/selftest/cases/imagefeatures.py
index 8c95432e00b3..aed63e5476a7 100644
--- a/meta/lib/oeqa/selftest/cases/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py
@@ -236,3 +236,29 @@ USERADD_GID_TABLES += "files/static-group"
"""
self.write_config(config)
bitbake("core-image-base")
+
+def test_no_busybox_base_utils(self):
+config = """
+# Enable x11
+DISTRO_FEATURES_append += "x11"
+
+# Switch to systemd
+DISTRO_FEATURES += "systemd"
+VIRTUAL-RUNTIME_init_manager = "systemd"
+VIRTUAL-RUNTIME_initscripts = ""
+VIRTUAL-RUNTIME_syslog = ""
+VIRTUAL-RUNTIME_login_manager = "shadow-base"
+DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
+
+# Replace busybox
+PREFERRED_PROVIDER_virtual/base-utils = "packagegroup-core-base-utils"
+VIRTUAL-RUNTIME_base-utils = "packagegroup-core-base-utils"
+VIRTUAL-RUNTIME_base-utils-hwclock = "util-linux-hwclock"
+VIRTUAL-RUNTIME_base-utils-syslog = ""
+
+# Blacklist busybox
+PNBLACKLIST[busybox] = "Don't build this"
+"""
+self.write_config(config)
+
+bitbake("--graphviz core-image-sato")
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 3/4] packagegroup-core-base-utils: Introduce new base-utils packagegroup
This packagegroup is intended to provide all of the functionality found
in other VIRTUAL-RUNTIME_base-utils providers through full packages
rather than an all-on-one package. Document how to make use of this
in local.conf.sample.extended. Introduce VIRTUAL-RUNTIME-vim and
default this to vim-tiny to allow for a differently features vim to be
used instead.
Signed-off-by: Tom Rini
---
Changes in v2:
- Add a few more inetutils packages
- List kbd, add a few more packages specifically for non-systemd
systems, thanks Mark!
---
meta/conf/local.conf.sample.extended | 8 +++
.../packagegroups/packagegroup-core-base-utils.bb | 58 ++
2 files changed, 66 insertions(+)
create mode 100644
meta/recipes-extended/packagegroups/packagegroup-core-base-utils.bb
diff --git a/meta/conf/local.conf.sample.extended
b/meta/conf/local.conf.sample.extended
index 8062e4c5721b..d00221893ad9 100644
--- a/meta/conf/local.conf.sample.extended
+++ b/meta/conf/local.conf.sample.extended
@@ -384,3 +384,11 @@
#VIRTUAL-RUNTIME_login_manager = "shadow-base"
#VIRTUAL-RUNTIME_init_manager = "systemd"
#VIRTUAL-RUNTIME_initscripts = "systemd-compat-units"
+
+#
+# Use a full set of packages instead of busybox for base utils
+#
+#PREFERRED_PROVIDER_base-utils = "packagegroup-core-base-utils"
+#VIRTUAL-RUNTIME_base-utils = "packagegroup-core-base-utils"
+#VIRTUAL-RUNTIME_base-utils-hwclock = "util-linux-hwclock"
+#VIRTUAL-RUNTIME_base-utils-syslog = "syslog"
diff --git
a/meta/recipes-extended/packagegroups/packagegroup-core-base-utils.bb
b/meta/recipes-extended/packagegroups/packagegroup-core-base-utils.bb
new file mode 100644
index ..431dbb092615
--- /dev/null
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-base-utils.bb
@@ -0,0 +1,58 @@
+#
+# Copyright (C) 2019 Konsulko Group
+#
+
+SUMMARY = "Full-featured set of base utils"
+DESCRIPTION = "Package group bringing in packages needed to provide much of
the base utils type functionality found in busybox"
+
+inherit packagegroup
+
+VIRTUAL-RUNTIME_vim ?= "vim-tiny"
+
+RDEPENDS_${PN} = "\
+base-passwd \
+bash \
+bind-utils \
+bzip2 \
+coreutils \
+cpio \
+${@bb.utils.contains("DISTRO_FEATURES", "systemd", "",
"debianutils-run-parts", d)} \
+dhcp-client \
+${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "dhcp-server", d)} \
+diffutils \
+${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "dpkg-start-stop",
d)} \
+e2fsprogs \
+ed \
+file \
+findutils \
+gawk \
+grep \
+gzip \
+${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "ifupdown", d)} \
+inetutils \
+inetutils-ping \
+inetutils-telnet \
+inetutils-tftp \
+inetutils-traceroute \
+iproute2 \
+${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "kbd", "", d)} \
+kmod \
+less \
+lzip \
+ncurses-tools \
+net-tools \
+parted \
+patch \
+procps \
+psmisc \
+sed \
+shadow-base \
+tar \
+time \
+unzip \
+util-linux \
+${VIRTUAL-RUNTIME_vim} \
+wget \
+which \
+xz \
+"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 1/4] vim: Import version 8.1.0347
In order to have a stand-alone editor in oe-core, bring in vim from meta-openembedded/meta-oe. This imports the recipes as of git commit: commit 41f3f8165bde3eb4f8bcf6dddbaca0d3b760c70b Author: Mark Hatle Date: Thu Feb 28 09:39:19 2019 +0800 vim: remove xfce vim bbappend Changing the behavior of a recipe by including a layer is not allowed by the yocto-check-layer script. Signed-off-by: Tom Rini -- Changes in v3: - Catch vim-tiny too (thanks Richard!) Changes in v2: - List self as maintainer --- meta/conf/distro/include/maintainers.inc | 2 + meta/files/common-licenses/vim | 81 + ...0001-src-Makefile-improve-reproducibility.patch | 46 .../vim/files/disable_acl_header_check.patch | 39 +++ .../vim-add-knob-whether-elf.h-are-checked.patch | 42 +++ meta/recipes-support/vim/vim-tiny_8.1.0347.bb | 15 +++ meta/recipes-support/vim/vim_8.1.0347.bb | 129 + 7 files changed, 354 insertions(+) create mode 100644 meta/files/common-licenses/vim create mode 100644 meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch create mode 100644 meta/recipes-support/vim/files/disable_acl_header_check.patch create mode 100644 meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch create mode 100644 meta/recipes-support/vim/vim-tiny_8.1.0347.bb create mode 100644 meta/recipes-support/vim/vim_8.1.0347.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index e6a2f736caa3..34e578abd73e 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -702,6 +702,8 @@ RECIPE_MAINTAINER_pn-util-macros = "Armin Kuster " RECIPE_MAINTAINER_pn-v86d = "Alexander Kanavin " RECIPE_MAINTAINER_pn-vala = "Alexander Kanavin " RECIPE_MAINTAINER_pn-valgrind = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-vim = "Tom Rini " +RECIPE_MAINTAINER_pn-vim-tiny = "Tom Rini " RECIPE_MAINTAINER_pn-virglrenderer = "Alexander Kanavin " RECIPE_MAINTAINER_pn-volatile-binds = "Chen Qi " RECIPE_MAINTAINER_pn-vte = "Anuj Mittal " diff --git a/meta/files/common-licenses/vim b/meta/files/common-licenses/vim new file mode 100644 index ..4aa818eb248e --- /dev/null +++ b/meta/files/common-licenses/vim @@ -0,0 +1,81 @@ +VIM LICENSE + +I) There are no restrictions on distributing unmodified copies of Vim except +that they must include this license text. You can also distribute +unmodified parts of Vim, likewise unrestricted except that they must +include this license text. You are also allowed to include executables +that you made from the unmodified Vim sources, plus your own usage +examples and Vim scripts. + +II) It is allowed to distribute a modified (or extended) version of Vim, +including executables and/or source code, when the following four +conditions are met: +1) This license text must be included unmodified. +2) The modified Vim must be distributed in one of the following five ways: + a) If you make changes to Vim yourself, you must clearly describe in + the distribution how to contact you. When the maintainer asks you + (in any way) for a copy of the modified Vim you distributed, you + must make your changes, including source code, available to the + maintainer without fee. The maintainer reserves the right to + include your changes in the official version of Vim. What the + maintainer will do with your changes and under what license they + will be distributed is negotiable. If there has been no negotiation + then this license, or a later version, also applies to your changes. + The current maintainer is Bram Moolenaar . If this + changes it will be announced in appropriate places (most likely + vim.sf.net, www.vim.org and/or comp.editors). When it is completely + impossible to contact the maintainer, the obligation to send him + your changes ceases. Once the maintainer has confirmed that he has + received your changes they will not have to be sent again. + b) If you have received a modified Vim that was distributed as + mentioned under a) you are allowed to further distribute it + unmodified, as mentioned at I). If you make additional changes the + text under a) applies to those changes. + c) Provide all the changes, including source code, with every copy of + the modified Vim you distribute. This may be done in the form of a + context diff. You can choose what license to use for new code you + add. The changes and their license must not restrict others from + making their own changes to the official version of Vim. + d) When you have a modified Vim which includes changes as mentioned + under c), you can distribute it
Re: [OE-core] [PATCH] gdb: Upgrade 8.2 -> 8.2.1
On Wed, Mar 6, 2019 at 11:23 AM Adrian Bunk wrote:
>
> Signed-off-by: Adrian Bunk
> ---
> meta/recipes-devtools/gdb/{gdb-8.2.inc => gdb-8.2.1.inc} | 4 ++--
> ...{gdb-cross-canadian_8.2.bb => gdb-cross-canadian_8.2.1.bb} | 0
> .../gdb/{gdb-cross_8.2.bb => gdb-cross_8.2.1.bb} | 0
> meta/recipes-devtools/gdb/{gdb_8.2.bb => gdb_8.2.1.bb}| 0
> 4 files changed, 2 insertions(+), 2 deletions(-)
> rename meta/recipes-devtools/gdb/{gdb-8.2.inc => gdb-8.2.1.inc} (89%)
> rename meta/recipes-devtools/gdb/{gdb-cross-canadian_8.2.bb =>
> gdb-cross-canadian_8.2.1.bb} (100%)
> rename meta/recipes-devtools/gdb/{gdb-cross_8.2.bb => gdb-cross_8.2.1.bb}
> (100%)
> rename meta/recipes-devtools/gdb/{gdb_8.2.bb => gdb_8.2.1.bb} (100%)
>
LGTM
> diff --git a/meta/recipes-devtools/gdb/gdb-8.2.inc
> b/meta/recipes-devtools/gdb/gdb-8.2.1.inc
> similarity index 89%
> rename from meta/recipes-devtools/gdb/gdb-8.2.inc
> rename to meta/recipes-devtools/gdb/gdb-8.2.1.inc
> index f6d75ed081..1fc1ec0da4 100644
> --- a/meta/recipes-devtools/gdb/gdb-8.2.inc
> +++ b/meta/recipes-devtools/gdb/gdb-8.2.1.inc
> @@ -18,6 +18,6 @@ SRC_URI = "http://ftp.gnu.org/gnu/gdb/gdb-${PV}.tar.xz \
> file://gdbserver-ctrl-c-handling.patch \
> file://0001-Fix-build-with-latest-GCC-9.0-tree.patch \
> "
> -SRC_URI[md5sum] = "b5a49dbff00d9a87fbe114d14b3101c0"
> -SRC_URI[sha256sum] =
> "c3a441a29c7c89720b734e5a9c6289c0a06be7e0c76ef538f7bbcef389347c39"
> +SRC_URI[md5sum] = "f8b2562e830a4098dd5b5ea9e9296c70"
> +SRC_URI[sha256sum] =
> "0a6a432907a03c5c8eaad3c3cffd50c00a40c3a5e3c4039440624bae703f2202"
>
> diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_8.2.bb
> b/meta/recipes-devtools/gdb/gdb-cross-canadian_8.2.1.bb
> similarity index 100%
> rename from meta/recipes-devtools/gdb/gdb-cross-canadian_8.2.bb
> rename to meta/recipes-devtools/gdb/gdb-cross-canadian_8.2.1.bb
> diff --git a/meta/recipes-devtools/gdb/gdb-cross_8.2.bb
> b/meta/recipes-devtools/gdb/gdb-cross_8.2.1.bb
> similarity index 100%
> rename from meta/recipes-devtools/gdb/gdb-cross_8.2.bb
> rename to meta/recipes-devtools/gdb/gdb-cross_8.2.1.bb
> diff --git a/meta/recipes-devtools/gdb/gdb_8.2.bb
> b/meta/recipes-devtools/gdb/gdb_8.2.1.bb
> similarity index 100%
> rename from meta/recipes-devtools/gdb/gdb_8.2.bb
> rename to meta/recipes-devtools/gdb/gdb_8.2.1.bb
> --
> 2.17.1
>
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gdb: Upgrade 8.2 -> 8.2.1
Signed-off-by: Adrian Bunk
---
meta/recipes-devtools/gdb/{gdb-8.2.inc => gdb-8.2.1.inc} | 4 ++--
...{gdb-cross-canadian_8.2.bb => gdb-cross-canadian_8.2.1.bb} | 0
.../gdb/{gdb-cross_8.2.bb => gdb-cross_8.2.1.bb} | 0
meta/recipes-devtools/gdb/{gdb_8.2.bb => gdb_8.2.1.bb}| 0
4 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/gdb/{gdb-8.2.inc => gdb-8.2.1.inc} (89%)
rename meta/recipes-devtools/gdb/{gdb-cross-canadian_8.2.bb =>
gdb-cross-canadian_8.2.1.bb} (100%)
rename meta/recipes-devtools/gdb/{gdb-cross_8.2.bb => gdb-cross_8.2.1.bb}
(100%)
rename meta/recipes-devtools/gdb/{gdb_8.2.bb => gdb_8.2.1.bb} (100%)
diff --git a/meta/recipes-devtools/gdb/gdb-8.2.inc
b/meta/recipes-devtools/gdb/gdb-8.2.1.inc
similarity index 89%
rename from meta/recipes-devtools/gdb/gdb-8.2.inc
rename to meta/recipes-devtools/gdb/gdb-8.2.1.inc
index f6d75ed081..1fc1ec0da4 100644
--- a/meta/recipes-devtools/gdb/gdb-8.2.inc
+++ b/meta/recipes-devtools/gdb/gdb-8.2.1.inc
@@ -18,6 +18,6 @@ SRC_URI = "http://ftp.gnu.org/gnu/gdb/gdb-${PV}.tar.xz \
file://gdbserver-ctrl-c-handling.patch \
file://0001-Fix-build-with-latest-GCC-9.0-tree.patch \
"
-SRC_URI[md5sum] = "b5a49dbff00d9a87fbe114d14b3101c0"
-SRC_URI[sha256sum] =
"c3a441a29c7c89720b734e5a9c6289c0a06be7e0c76ef538f7bbcef389347c39"
+SRC_URI[md5sum] = "f8b2562e830a4098dd5b5ea9e9296c70"
+SRC_URI[sha256sum] =
"0a6a432907a03c5c8eaad3c3cffd50c00a40c3a5e3c4039440624bae703f2202"
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_8.2.bb
b/meta/recipes-devtools/gdb/gdb-cross-canadian_8.2.1.bb
similarity index 100%
rename from meta/recipes-devtools/gdb/gdb-cross-canadian_8.2.bb
rename to meta/recipes-devtools/gdb/gdb-cross-canadian_8.2.1.bb
diff --git a/meta/recipes-devtools/gdb/gdb-cross_8.2.bb
b/meta/recipes-devtools/gdb/gdb-cross_8.2.1.bb
similarity index 100%
rename from meta/recipes-devtools/gdb/gdb-cross_8.2.bb
rename to meta/recipes-devtools/gdb/gdb-cross_8.2.1.bb
diff --git a/meta/recipes-devtools/gdb/gdb_8.2.bb
b/meta/recipes-devtools/gdb/gdb_8.2.1.bb
similarity index 100%
rename from meta/recipes-devtools/gdb/gdb_8.2.bb
rename to meta/recipes-devtools/gdb/gdb_8.2.1.bb
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kmod: Remove compatibility for ancient hosts
Lack of be32toh() is handled upstream since 2014.
Linux 2.6.23 was released 2007, distributions with kernels
older than that are far outside the host distributions
still supported today.
Signed-off-by: Adrian Bunk
---
meta/recipes-kernel/kmod/kmod-native_git.bb | 3 --
meta/recipes-kernel/kmod/kmod.inc | 1 -
...g-bswap_-instead-of-htobe-and-be-toh.patch | 40 ---
.../kmod/kmod/fix-O_CLOEXEC.patch | 36 -
4 files changed, 80 deletions(-)
delete mode 100644
meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
delete mode 100644 meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch
diff --git a/meta/recipes-kernel/kmod/kmod-native_git.bb
b/meta/recipes-kernel/kmod/kmod-native_git.bb
index f0e274ed79..f61134bbaf 100644
--- a/meta/recipes-kernel/kmod/kmod-native_git.bb
+++ b/meta/recipes-kernel/kmod/kmod-native_git.bb
@@ -7,9 +7,6 @@ DEPENDS += "zlib-native"
inherit native
-SRC_URI += "file://Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch \
- "
-
do_install_append (){
for tool in depmod insmod lsmod modinfo modprobe rmmod
do
diff --git a/meta/recipes-kernel/kmod/kmod.inc
b/meta/recipes-kernel/kmod/kmod.inc
index 6d0e031c6f..e68860f6b4 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -21,7 +21,6 @@ PV = "26"
SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \
file://depmod-search.conf \
file://avoid_parallel_tests.patch \
- file://fix-O_CLOEXEC.patch \
"
S = "${WORKDIR}/git"
diff --git
a/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
b/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
deleted file mode 100644
index 0ec20fad99..00
---
a/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 38d6871d9c98e0080426ea375e390728485b2bc2 Mon Sep 17 00:00:00 2001
-From: Ting Liu
-Date: Tue, 10 Sep 2013 06:00:20 +
-Subject: [PATCH] Change to calling bswap_* instead of htobe* and be*toh
-
-We can't use htobe* and be*toh functions because they are not
-available on older versions of glibc, For example, shipped on Centos 5.5.
-
-Change to directly calling bswap_* as defined in+byteswap.h.
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Ting Liu
-Signed-off-by: Chen Qi
-
- libkmod/libkmod-signature.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
-index 48d0145..dd2c6fa 100644
a/libkmod/libkmod-signature.c
-+++ b/libkmod/libkmod-signature.c
-@@ -18,6 +18,7 @@
- */
-
- #include
-+#include
- #include
- #ifdef ENABLE_OPENSSL
- #include
-@@ -343,7 +344,7 @@ bool kmod_module_signature_info(const struct kmod_file
*file, struct kmod_signat
- modsig->hash >= PKEY_HASH__LAST ||
- modsig->id_type >= PKEY_ID_TYPE__LAST)
- return false;
-- sig_len = be32toh(get_unaligned(>sig_len));
-+ sig_len = bswap_32(get_unaligned(>sig_len));
- if (sig_len == 0 ||
- size < (int64_t)(modsig->signer_len + modsig->key_id_len + sig_len))
- return false;
diff --git a/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch
b/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch
deleted file mode 100644
index 07e4a1f538..00
--- a/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 5f55e6806cd8ae1a6c8ec1e6cb38ad292cfc1df9 Mon Sep 17 00:00:00 2001
-From: Robert Yang
-Date: Wed, 22 Jan 2014 01:06:40 -0500
-Subject: [PATCH] libkmod/libkmod-internal.h: check whether O_CLOEXEC is
- defined or not
-
-O_CLOEXEC is introduced from Linux 2.6.23, so old kernel doesn't have
-it, we need check before use.
-
-This patch is much more like a workaround, since it may need fcntl() use
-FD_CLOEXEC to replace.
-
-This problem was reported by "Ting Liu "
-Signed-off-by: Robert Yang
-
-Upstream-Status: Pending
-
- libkmod/libkmod-internal.h | 4
- 1 file changed, 4 insertions(+)
-
-diff --git a/libkmod/libkmod-internal.h b/libkmod/libkmod-internal.h
-index a65ddd1..a4f4b77 100644
a/libkmod/libkmod-internal.h
-+++ b/libkmod/libkmod-internal.h
-@@ -10,6 +10,10 @@
-
- #include "libkmod.h"
-
-+#ifndef O_CLOEXEC
-+#define O_CLOEXEC 0
-+#endif
-+
- static _always_inline_ _printf_format_(2, 3) void
- kmod_log_null(struct kmod_ctx *ctx, const char *format, ...) {}
-
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] README: Rename to README.OE-Core so its clear where its from/belongs/is about
This means we can add it to poky and reduce delta/confusion between the contents. Signed-off-by: Richard Purdie --- README => README.OE-Core | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README => README.OE-Core (100%) diff --git a/README b/README.OE-Core similarity index 100% rename from README rename to README.OE-Core -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] scripts: Add oe-pylint
On Wed, 2019-03-06 at 18:41 +, Richard Purdie wrote: > Add an oe-pylint wrapper around pylint3 to run static analysis on our > python > codebase. For now display errors and exclude common warnings which > are not > applicable to our codebase. > > The aim is to start generating this report on the autobuilder and to > improve our score over time. > > Signed-off-by: Richard Purdie The output of this is saved off as part of the autobuilder test result output, e.g.: https://autobuilder.yocto.io/pub/non-release/20190306-14/testresults/oe-selftest/pylint.log If anyone has some time and wants to help out cleaning things up to get better results, this would be a great and comparatively low learning curve way to get started with helping with the project! Right now we save errors only, ultimately we may be able to clean up warnings too. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] scripts: Add oe-pylint
Add an oe-pylint wrapper around pylint3 to run static analysis on our python codebase. For now display errors and exclude common warnings which are not applicable to our codebase. The aim is to start generating this report on the autobuilder and to improve our score over time. Signed-off-by: Richard Purdie --- scripts/oe-pylint | 11 +++ 1 file changed, 11 insertions(+) create mode 100755 scripts/oe-pylint diff --git a/scripts/oe-pylint b/scripts/oe-pylint new file mode 100755 index 000..74ff4b884de --- /dev/null +++ b/scripts/oe-pylint @@ -0,0 +1,11 @@ +#!/bin/bash +# +# Run the pylint3 against our common python module spaces and print a report of potential issues +# +this_dir=$(dirname $(readlink -f $0)) +ERRORS="-E" +IGNORELIST="$ERRORS -d logging-too-many-args -d missing-docstring -d line-too-long -d invalid-name" +PYTHONPATH=$this_dir/../bitbake/lib/ pylint3 $IGNORELIST bb +PYTHONPATH=$this_dir/../bitbake/lib/:$this_dir/../meta/lib pylint3 $IGNORELIST -d undefined-variable oe +PYTHONPATH=$this_dir/../bitbake/lib/:$this_dir/../meta/lib pylint3 $IGNORELIST oeqa +PYTHONPATH=$this_dir/../bitbake/lib/:$this_dir/../meta/lib:$this_dir/lib pylint3 $IGNORELIST -d undefined-variable argparse_oe buildstats devtool recipetool scriptpath testcasemgmt build_perf checklayer resulttool scriptutils wic \ No newline at end of file -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/6] machine: bump preferred version to 5.0
From: Bruce Ashfield
Signed-off-by: Bruce Ashfield
---
meta/conf/machine/include/x86-base.inc | 2 +-
meta/conf/machine/qemuarm.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/conf/machine/include/x86-base.inc
b/meta/conf/machine/include/x86-base.inc
index c29279209b..686f938233 100644
--- a/meta/conf/machine/include/x86-base.inc
+++ b/meta/conf/machine/include/x86-base.inc
@@ -18,7 +18,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0"
# kernel-related variables
#
PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ??= "4.18%"
+PREFERRED_VERSION_linux-yocto ??= "5.0%"
#
# XSERVER subcomponents, used to build the XSERVER variable
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index a544312627..f3a4997491 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -17,5 +17,5 @@ QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200
console=tty"
QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet"
# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device
virtio-rng-pci,rng=rng0"
-PREFERRED_VERSION_linux-yocto ??= "4.18%"
+PREFERRED_VERSION_linux-yocto ??= "5.0%"
QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto',
'4.7', '', 'zImage-versatile-pb.dtb', d)}"
--
2.19.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/6] lttng: add 5.x fixup patches to 2.10.8 release
From: Bruce Ashfield lttng hasn't released 2.10.9, but the stable/2.10 branch contains changes that we need to build against the 5.0 kernel. We add them here as patches, and we can drop them in the future when lttng is updated. Signed-off-by: Bruce Ashfield --- ...nguish-between-kernel_siginfo-and-si.patch | 133 +++ ...-signal-Remove-SEND_SIG_FORCED-v4.20.patch | 67 ...reserved-cluster-count-when-removing.patch | 149 ...x-timer-instrumentation-for-RHEL-7.6.patch | 32 ++ ...argument-from-access_ok-function-v5..patch | 204 +++ ...ter-values-with-task-tk_pid-and-rpc_.patch | 186 ++ ...ify-defining-common-RPC-trace-events.patch | 183 ++ ...-fsid-metadata_fsid-fields-from-btrf.patch | 341 ++ ...p-mempool-Remove-logically-dead-code.patch | 46 +++ .../lttng/lttng-modules_2.10.8.bb | 9 + 10 files changed, 1350 insertions(+) create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-Fix-signal-Distinguish-between-kernel_siginfo-and-si.patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0002-Fix-signal-Remove-SEND_SIG_FORCED-v4.20.patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0003-Fix-ext4-adjust-reserved-cluster-count-when-removing.patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0004-Fix-timer-instrumentation-for-RHEL-7.6.patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0005-Fix-Remove-type-argument-from-access_ok-function-v5..patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0006-Fix-Replace-pointer-values-with-task-tk_pid-and-rpc_.patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0007-Fix-SUNRPC-Simplify-defining-common-RPC-trace-events.patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0008-Fix-btrfs-Remove-fsid-metadata_fsid-fields-from-btrf.patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0009-Cleanup-tp-mempool-Remove-logically-dead-code.patch diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-signal-Distinguish-between-kernel_siginfo-and-si.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-signal-Distinguish-between-kernel_siginfo-and-si.patch new file mode 100644 index 00..351184dabb --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-signal-Distinguish-between-kernel_siginfo-and-si.patch @@ -0,0 +1,133 @@ +From 0a0d736ec89dffdbc83e7181166a99d5563acfe8 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson +Date: Mon, 5 Nov 2018 11:35:52 -0500 +Subject: [PATCH 1/9] Fix: signal: Distinguish between kernel_siginfo and + siginfo (v4.20) + +See upstream commit : + + commit ae7795bc6187a15ec51cf258abae656a625f9980 + Author: Eric W. Biederman + Date: Tue Sep 25 11:27:20 2018 +0200 + +signal: Distinguish between kernel_siginfo and siginfo + +Linus recently observed that if we did not worry about the padding +member in struct siginfo it is only about 48 bytes, and 48 bytes is +much nicer than 128 bytes for allocating on the stack and copying +around in the kernel. + +The obvious thing of only adding the padding when userspace is +including siginfo.h won't work as there are sigframe definitions in +the kernel that embed struct siginfo. + +So split siginfo in two; kernel_siginfo and siginfo. Keeping the +traditional name for the userspace definition. While the version that +is used internally to the kernel and ultimately will not be padded to +128 bytes is called kernel_siginfo. + +The definition of struct kernel_siginfo I have put in include/signal_types.h + +A set of buildtime checks has been added to verify the two structures have +the same field offsets. + +To make it easy to verify the change kernel_siginfo retains the same +size as siginfo. The reduction in size comes in a following change. + +Signed-off-by: Michael Jeanson +Signed-off-by: Mathieu Desnoyers + +Upstream-Status: backport https://github.com/lttng/lttng-modules/commit/0a0d736ec89dffdbc83e7181166a99d5563acfe8 + +Signed-off-by: Bruce Ashfield +--- + instrumentation/events/lttng-module/signal.h | 41 ++-- + 1 file changed, 37 insertions(+), 4 deletions(-) + +diff --git a/instrumentation/events/lttng-module/signal.h b/instrumentation/events/lttng-module/signal.h +index b3c9126..8783b52 100644 +--- a/instrumentation/events/lttng-module/signal.h b/instrumentation/events/lttng-module/signal.h +@@ -35,21 +35,24 @@ + * SEND_SIG_NOINFO means that si_code is SI_USER, and SEND_SIG_PRIV + * means that si_code is SI_KERNEL. + */ +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0)) + LTTNG_TRACEPOINT_EVENT(signal_generate, + +- TP_PROTO(int sig, struct siginfo *info, struct task_struct *task), ++ TP_PROTO(int sig, struct kernel_siginfo *info, struct task_struct *task, ++ int group, int result), + +-
[OE-core] [PATCH 5/6] linux-yocto/5.0: update configs for h/w reference boards
From: Bruce Ashfield
Integrating configuration changes from Kevin Hao for the reference
boards on the 5.0 kernel:
be627e4e386 beaglebone: Switch to the 8250 omap driver
957f6060c25 beaglebone: Update the audio options
ab5298a6983 mpc8315e-rdb: Enable the CONFIG_MTD_PHYSMAP
Signed-off-by: Bruce Ashfield
---
meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto_5.0.bb | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
index b7e0e5da23..a757945f8d 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
@@ -12,7 +12,7 @@ python () {
}
SRCREV_machine ?= "1a0da7e50b77c82841efb501c648dbaca699eac2"
-SRCREV_meta ?= "8ae7073a934d80c4f4b808bc01884777454aae8f"
+SRCREV_meta ?= "be627e4e38626c5e949de04c814ebd2487d5dd98"
SRC_URI =
"git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.0;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
index b95efa9306..57aada3f62 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
SRCREV_machine_qemuarm ?= "6da91ac9afd3b8c144760e3ceacc6a812ddfa3f6"
SRCREV_machine ?= "1a0da7e50b77c82841efb501c648dbaca699eac2"
-SRCREV_meta ?= "8ae7073a934d80c4f4b808bc01884777454aae8f"
+SRCREV_meta ?= "be627e4e38626c5e949de04c814ebd2487d5dd98"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.0.bb
b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
index 768036e298..a56e9a19d8 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?=
"1a0da7e50b77c82841efb501c648dbaca699eac2"
SRCREV_machine_qemux86-64 ?= "1a0da7e50b77c82841efb501c648dbaca699eac2"
SRCREV_machine_qemumips64 ?= "5f072445126e6a9e44f9435a552f4fcf6fc15499"
SRCREV_machine ?= "1a0da7e50b77c82841efb501c648dbaca699eac2"
-SRCREV_meta ?= "8ae7073a934d80c4f4b808bc01884777454aae8f"
+SRCREV_meta ?= "be627e4e38626c5e949de04c814ebd2487d5dd98"
# remap qemuarm to qemuarma15 for the 5.0 kernel
# KMACHINE_qemuarm ?= "qemuarma15"
--
2.19.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/6] linux-yocto: consolidated pull request (5.0 kernel intro)
From: Bruce Ashfield
Hi all,
The -rc8 of the kernel pushed this out a week longer than I would
have liked, but luckily the -dev kernel has been running 5.0 for
quite a while, so most of the issues had been worked out already.
In this series we have the bump of the libc-headers to 5.0, I've
built all arches for both musl and glibc, with no issues popping
up due to the headers bump. A few patches were dropped, since they
are now upstream.
I've also introduce the 5.0 versioned recipe in this series and
adjusted the two machines that still have a preferred version to
use it. Again, this was built and booted on all arches and over
several image types (minimal, sato, kernel-dev).
As usual lttng was tweaked to work with 5.0, but I was able to
keep it on the same 2.10 stable branch and only pull in a few
pending patches that haven't been formally released yet.
Once we get the h/w reference boards, and reference distros moved
to 4.19 and 5.0, I'll send a follow up patch to remove 4.18
from master.
I'll send follow up patches to the yocto-bsps and poky as
appropriate, but until the last few issues are resolved, they can
stay out of tree.
I captured as many details as possible in the commit messages of
the individual patches.
Cheers,
Bruce
The following changes since commit 44b28954997f62733c09c0f3261d29fe8049916c:
linux-yocto: update genericx86* SRCREV for 4.18 (2019-03-04 22:57:32 +)
are available in the Git repository at:
git://git.pokylinux.org/poky-contrib zedd/kernel
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel
Bruce Ashfield (6):
kernel-yocto: allow kernel-meta repositories to be patched
linux-libc-headers: update to 5.x headers
linux-yocto: introduce 5.0 versioned recipe
lttng: add 5.x fixup patches to 2.10.8 release
linux-yocto/5.0: update configs for h/w reference boards
machine: bump preferred version to 5.0
meta/classes/kernel-yocto.bbclass | 29 +-
meta/conf/distro/include/tcmode-default.inc | 2 +-
meta/conf/machine/include/x86-base.inc| 2 +-
meta/conf/machine/qemuarm.conf| 2 +-
.../linux-libc-headers/linux-libc-headers.inc | 2 +
...kernel_clockid_t-in-uapi-net_stamp.h.patch | 49 ---
...d-input-and-output-files-instead-of-.patch | 11 +-
...ce-Fix-SVE_PT_REGS_OFFSET-definition.patch | 43 ---
...angle-uapi-asm-ptrace.h-from-uapi-as.patch | 289 ---
...ders_4.19.bb => linux-libc-headers_5.0.bb} | 7 +-
.../linux/linux-yocto-rt_5.0.bb | 43 +++
.../linux/linux-yocto-tiny_5.0.bb | 32 ++
meta/recipes-kernel/linux/linux-yocto_5.0.bb | 51 +++
...nguish-between-kernel_siginfo-and-si.patch | 133 +++
...-signal-Remove-SEND_SIG_FORCED-v4.20.patch | 67
...reserved-cluster-count-when-removing.patch | 149
...x-timer-instrumentation-for-RHEL-7.6.patch | 32 ++
...argument-from-access_ok-function-v5..patch | 204 +++
...ter-values-with-task-tk_pid-and-rpc_.patch | 186 ++
...ify-defining-common-RPC-trace-events.patch | 183 ++
...-fsid-metadata_fsid-fields-from-btrf.patch | 341 ++
...p-mempool-Remove-logically-dead-code.patch | 46 +++
.../lttng/lttng-modules_2.10.8.bb | 9 +
23 files changed, 1513 insertions(+), 399 deletions(-)
delete mode 100644
meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch
delete mode 100644
meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-arm64-sve-ptrace-Fix-SVE_PT_REGS_OFFSET-definition.patch
delete mode 100644
meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-arm64-sve-Disentangle-uapi-asm-ptrace.h-from-uapi-as.patch
rename meta/recipes-kernel/linux-libc-headers/{linux-libc-headers_4.19.bb =>
linux-libc-headers_5.0.bb} (65%)
create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
create mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
create mode 100644 meta/recipes-kernel/linux/linux-yocto_5.0.bb
create mode 100644
meta/recipes-kernel/lttng/lttng-modules/0001-Fix-signal-Distinguish-between-kernel_siginfo-and-si.patch
create mode 100644
meta/recipes-kernel/lttng/lttng-modules/0002-Fix-signal-Remove-SEND_SIG_FORCED-v4.20.patch
create mode 100644
meta/recipes-kernel/lttng/lttng-modules/0003-Fix-ext4-adjust-reserved-cluster-count-when-removing.patch
create mode 100644
meta/recipes-kernel/lttng/lttng-modules/0004-Fix-timer-instrumentation-for-RHEL-7.6.patch
create mode 100644
meta/recipes-kernel/lttng/lttng-modules/0005-Fix-Remove-type-argument-from-access_ok-function-v5..patch
create mode 100644
meta/recipes-kernel/lttng/lttng-modules/0006-Fix-Replace-pointer-values-with-task-tk_pid-and-rpc_.patch
create mode 100644
meta/recipes-kernel/lttng/lttng-modules/0007-Fix-SUNRPC-Simplify-defining-common-RPC-trace-events.patch
create mode 100644
[OE-core] [PATCH 3/6] linux-yocto: introduce 5.0 versioned recipe
From: Bruce Ashfield
Introducing the 5.0 linux-yocto reference kernel, which will become
the "latest" kernel as part of the spring yocto release.
qemu* has been built and sanity tested against this kernel, and it
is suitable to become the default build for the emulated references.
Some minor configuration cleanup was performed, but otherwise, things
are very similar to the 4.19 kernel config:
7fdb966db86 (HEAD -> yocto-5.0) aufs4: kbuild patch
c76b027a8b2 iosched: remove configs for removed legacy io schedules
5d1f8102244 netfilter: drop removed config options
8ff16f508f5 kernel-yocto: 5.0 kernel prep
Feature wise, this is a match for 4.19, with yaffs2 and aufs4 being
kept around for another release. Aufs is scheduled for removal in
the fall release.
Signed-off-by: Bruce Ashfield
---
.../linux/linux-yocto-rt_5.0.bb | 43
.../linux/linux-yocto-tiny_5.0.bb | 32
meta/recipes-kernel/linux/linux-yocto_5.0.bb | 51 +++
3 files changed, 126 insertions(+)
create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
create mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
create mode 100644 meta/recipes-kernel/linux/linux-yocto_5.0.bb
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
new file mode 100644
index 00..b7e0e5da23
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
@@ -0,0 +1,43 @@
+KBRANCH ?= "v5.0/standard/preempt-rt/base"
+
+require recipes-kernel/linux/linux-yocto.inc
+
+# Skip processing of this recipe if it is not explicitly specified as the
+# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying
+# to build multiple virtual/kernel providers, e.g. as dependency of
+# core-image-rt-sdk, core-image-rt.
+python () {
+if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and
d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt":
+raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to
linux-yocto-rt to enable it")
+}
+
+SRCREV_machine ?= "1a0da7e50b77c82841efb501c648dbaca699eac2"
+SRCREV_meta ?= "8ae7073a934d80c4f4b808bc01884777454aae8f"
+
+SRC_URI =
"git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
+
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.0;destsuffix=${KMETA}"
+
+LINUX_VERSION ?= "5.0"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
+
+DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
+DEPENDS += "openssl-native util-linux-native"
+
+PV = "${LINUX_VERSION}+git${SRCPV}"
+
+KMETA = "kernel-meta"
+KCONF_BSP_AUDIT_LEVEL = "2"
+
+LINUX_KERNEL_TYPE = "preempt-rt"
+
+COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarm64|qemuppc|qemumips)"
+
+KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
+
+# Functionality flags
+KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc
features/taskstats/taskstats.scc"
+KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
+KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc"
+KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
+KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
new file mode 100644
index 00..b95efa9306
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
@@ -0,0 +1,32 @@
+KBRANCH ?= "v5.0/standard/tiny/base"
+KBRANCH_qemuarm ?= "v5.0/standard/tiny/arm-versatile-926ejs"
+
+LINUX_KERNEL_TYPE = "tiny"
+KCONFIG_MODE = "--allnoconfig"
+
+require recipes-kernel/linux/linux-yocto.inc
+
+LINUX_VERSION ?= "5.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
+
+DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
+DEPENDS += "openssl-native util-linux-native"
+
+KMETA = "kernel-meta"
+KCONF_BSP_AUDIT_LEVEL = "2"
+
+SRCREV_machine_qemuarm ?= "6da91ac9afd3b8c144760e3ceacc6a812ddfa3f6"
+SRCREV_machine ?= "1a0da7e50b77c82841efb501c648dbaca699eac2"
+SRCREV_meta ?= "8ae7073a934d80c4f4b808bc01884777454aae8f"
+
+PV = "${LINUX_VERSION}+git${SRCPV}"
+
+SRC_URI =
"git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
+
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.0;destsuffix=${KMETA}"
+
+COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm"
+
+# Functionality flags
+KERNEL_FEATURES = ""
+
+KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.0.bb
b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
new file mode 100644
index 00..768036e298
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
@@ -0,0 +1,51 @@
+KBRANCH ?= "v5.0/standard/base"
+
+require recipes-kernel/linux/linux-yocto.inc
+
+# board specific branches
+KBRANCH_qemuarm ?=
[OE-core] [PATCH 1/6] kernel-yocto: allow kernel-meta repositories to be patched
From: Bruce Ashfield
For testing purposes, it is often easier to patch a fragment
in a kernel-meta repository versus needing to make a copy or
modify the source repository.
We can allow this sort of patching when a patchdir of kernel-meta
is passed (to indicate the nested kernel-meta repository).
Also note that we must patch the meta data before they are
processed/gathered, since migrated copies to the kernel source
directory will be used later.
Signed-off-by: Bruce Ashfield
---
meta/classes/kernel-yocto.bbclass | 29 +
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass
b/meta/classes/kernel-yocto.bbclass
index 496c8a7f68..d2b194dd55 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -5,12 +5,21 @@ PATCH_GIT_USER_NAME ?= "OpenEmbedded"
# returns local (absolute) path names for all valid patches in the
# src_uri
-def find_patches(d):
+def find_patches(d,subdir):
patches = src_patches(d)
patch_list=[]
for p in patches:
-_, _, local, _, _, _ = bb.fetch.decodeurl(p)
-patch_list.append(local)
+_, _, local, _, _, parm = bb.fetch.decodeurl(p)
+# if patchdir has been passed, we won't be able to apply it so skip
+# the patch for now, and special processing happens later
+patchdir = ''
+if "patchdir" in parm:
+patchdir = parm["patchdir"]
+if patchdir:
+if subdir == patchdir:
+patch_list.append(local)
+else:
+patch_list.append(local)
return patch_list
@@ -119,8 +128,20 @@ do_kernel_metadata() {
fi
fi
+ # was anyone trying to patch the kernel meta data ?, we need to do
+ # this here, since the scc commands migrate the .cfg fragments to the
+ # kernel source tree, where they'll be used later.
+ check_git_config
+ patches="${@" ".join(find_patches(d,'kernel-meta'))}"
+ for p in $patches; do
+ (
+ cd ${WORKDIR}/kernel-meta
+ git am -s $p
+ )
+ done
+
sccs_from_src_uri="${@" ".join(find_sccs(d))}"
- patches="${@" ".join(find_patches(d))}"
+ patches="${@" ".join(find_patches(d,''))}"
feat_dirs="${@" ".join(find_kernel_feature_dirs(d))}"
# a quick check to make sure we don't have duplicate defconfigs
--
2.19.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/6] linux-libc-headers: update to 5.x headers
From: Bruce Ashfield
Updating the linux-libc-headers to the 5.x kernel variant to match
the latest reference kernel in the 2.7 release.
We have two patches refreshed for context changes, and three patches
dropped since they have been merged to the mainline kernel and are
no longer necessary.
Signed-off-by: Bruce Ashfield
---
meta/conf/distro/include/tcmode-default.inc | 2 +-
.../linux-libc-headers/linux-libc-headers.inc | 2 +
...kernel_clockid_t-in-uapi-net_stamp.h.patch | 49 ---
...d-input-and-output-files-instead-of-.patch | 11 +-
...ce-Fix-SVE_PT_REGS_OFFSET-definition.patch | 43 ---
...angle-uapi-asm-ptrace.h-from-uapi-as.patch | 289 --
...ders_4.19.bb => linux-libc-headers_5.0.bb} | 7 +-
7 files changed, 10 insertions(+), 393 deletions(-)
delete mode 100644
meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch
delete mode 100644
meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-arm64-sve-ptrace-Fix-SVE_PT_REGS_OFFSET-definition.patch
delete mode 100644
meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-arm64-sve-Disentangle-uapi-asm-ptrace.h-from-uapi-as.patch
rename meta/recipes-kernel/linux-libc-headers/{linux-libc-headers_4.19.bb =>
linux-libc-headers_5.0.bb} (65%)
diff --git a/meta/conf/distro/include/tcmode-default.inc
b/meta/conf/distro/include/tcmode-default.inc
index 5d71825889..12d3901ee1 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -23,7 +23,7 @@ SDKGCCVERSION ?= "${GCCVERSION}"
BINUVERSION ?= "2.32%"
GDBVERSION ?= "8.2%"
GLIBCVERSION ?= "2.29%"
-LINUXLIBCVERSION ?= "4.19%"
+LINUXLIBCVERSION ?= "5.0%"
QEMUVERSION ?= "3.1%"
GOVERSION ?= "1.11%"
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
index be215af9b9..7f838f623e 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
@@ -38,6 +38,8 @@ python __anonymous () {
d.setVar("HEADER_FETCH_VER", "3.0")
elif major == "4":
d.setVar("HEADER_FETCH_VER", "4.x")
+elif major == "5":
+d.setVar("HEADER_FETCH_VER", "5.x")
else:
d.setVar("HEADER_FETCH_VER", "2.6")
}
diff --git
a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch
b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch
deleted file mode 100644
index 3684cc21bf..00
---
a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From e2c4cf7f98a519eb4d95532bfa06bcaf3562fed5 Mon Sep 17 00:00:00 2001
-From: Davide Caratti
-Date: Mon, 17 Dec 2018 11:26:38 +0100
-Subject: [PATCH] net: Use __kernel_clockid_t in uapi net_stamp.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Herton reports the following error when building a userspace program that
-includes net_stamp.h:
-
- In file included from foo.c:2:
- /usr/include/linux/net_tstamp.h:158:2: error: unknown type name
- ‘clockid_t’
- clockid_t clockid; /* reference clockid */
- ^
-
-Fix it by using __kernel_clockid_t in place of clockid_t.
-
-Fixes: 80b14dee2bea ("net: Add a new socket option for a future transmit
time.")
-Cc: Timothy Redaelli
-Reported-by: Herton R. Krzesinski
-Signed-off-by: Davide Caratti
-Tested-by: Paolo Abeni
-Signed-off-by: David S. Miller
-Upstream-Status: Backport
[https://github.com/torvalds/linux/commit/e2c4cf7f98a519eb4d95532bfa06bcaf3562fed5]
-
- include/uapi/linux/net_tstamp.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/uapi/linux/net_tstamp.h b/include/uapi/linux/net_tstamp.h
-index 97ff3c17ec4d..e5b39721c6e4 100644
a/include/uapi/linux/net_tstamp.h
-+++ b/include/uapi/linux/net_tstamp.h
-@@ -155,8 +155,8 @@ enum txtime_flags {
- };
-
- struct sock_txtime {
-- clockid_t clockid;/* reference clockid */
-- __u32 flags; /* as defined by enum txtime_flags */
-+ __kernel_clockid_t clockid;/* reference clockid */
-+ __u32 flags; /* as defined by enum txtime_flags */
- };
-
- #endif /* _NET_TIMESTAMPING_H */
---
-2.20.1
-
diff --git
a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch
b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch
index 9ba1c076e8..a5ded602e5 100644
---
a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch
+++
[OE-core] [PATCH v2] Add source package to ${PACKAGES}
Permanently adds the -src source package to ${PACKAGES} instead of
relying on creating it dynamically at packaging time. The source package
is now defined in bitbake.conf, just like -dev and -dbg packages.
For compatibility, the -src package is still added dynamically if it was
missing, since some recipes have a tendency to completely override
PACKAGES and do so without manually adding back the -src package.
This allows RDEPENDS on the -src packages, which wasn't previously
possible.
[YOCTO #13203]
Signed-off-by: Joshua Watt
---
meta/classes/package.bbclass | 28 +++-
meta/conf/bitbake.conf | 11 ++-
2 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 749c7d9ea14..4c0a8595363 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1128,7 +1128,7 @@ python populate_packages () {
workdir = d.getVar('WORKDIR')
outdir = d.getVar('DEPLOY_DIR')
dvar = d.getVar('PKGD')
-packages = d.getVar('PACKAGES')
+packages = d.getVar('PACKAGES').split()
pn = d.getVar('PN')
bb.utils.mkdirhier(outdir)
@@ -1138,32 +1138,34 @@ python populate_packages () {
split_source_package = (d.getVar('PACKAGE_DEBUG_SPLIT_STYLE') ==
'debug-with-srcpkg')
-# If debug-with-srcpkg mode is enabled then the src package is added
-# into the package list and the source directory as its main content
+# If debug-with-srcpkg mode is enabled then add the source package if it
+# doesn't exist and add the source file contents to the source package.
if split_source_package:
src_package_name = ('%s-src' % d.getVar('PN'))
-packages += (' ' + src_package_name)
+if not src_package_name in packages:
+packages.append(src_package_name)
d.setVar('FILES_%s' % src_package_name, '/usr/src/debug')
# Sanity check PACKAGES for duplicates
# Sanity should be moved to sanity.bbclass once we have the infrastructure
package_dict = {}
-for i, pkg in enumerate(packages.split()):
+for i, pkg in enumerate(packages):
if pkg in package_dict:
msg = "%s is listed in PACKAGES multiple times, this leads to
packaging errors." % pkg
package_qa_handle_error("packages-list", msg, d)
-# If debug-with-srcpkg mode is enabled then the src package will have
-# priority over dbg package when assigning the files.
-# This allows src package to include source files and remove them from
dbg.
-elif split_source_package and pkg.endswith("-src"):
+# Ensure the source package gets the chance to pick up the source files
+# before the debug package by ordering it first in PACKAGES. Whether it
+# actually picks up any source files is controlled by
+# PACKAGE_DEBUG_SPLIT_STYLE.
+elif pkg.endswith("-src"):
package_dict[pkg] = (10, i)
elif autodebug and pkg.endswith("-dbg"):
package_dict[pkg] = (30, i)
else:
package_dict[pkg] = (50, i)
-package_list = sorted(package_dict.keys(), key=package_dict.get)
-d.setVar('PACKAGES', ' '.join(package_list))
+packages = sorted(package_dict.keys(), key=package_dict.get)
+d.setVar('PACKAGES', ' '.join(packages))
pkgdest = d.getVar('PKGDEST')
seen = []
@@ -1181,7 +1183,7 @@ python populate_packages () {
if "/.debug/" in path or path.endswith("/.debug"):
debug.append(path)
-for pkg in package_list:
+for pkg in packages:
root = os.path.join(pkgdest, pkg)
bb.utils.mkdirhier(root)
@@ -1252,7 +1254,7 @@ python populate_packages () {
# Handle LICENSE_EXCLUSION
package_list = []
-for pkg in packages.split():
+for pkg in packages:
if d.getVar('LICENSE_EXCLUSION-' + pkg):
msg = "%s has an incompatible license. Excluding from packaging."
% pkg
package_qa_handle_error("incompatible-license", msg, d)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index f1540a0acf7..8fc4e9bc1a8 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -237,6 +237,10 @@ DESCRIPTION ?= "${SUMMARY}."
#SUMMARY_${PN} ?= "${SUMMARY}"
#DESCRIPTION_${PN} ?= "${DESCRIPTION}"
+SUMMARY_${PN}-src ?= "${SUMMARY} - Source files"
+DESCRIPTION_${PN}-src ?= "${DESCRIPTION} \
+This package contains sources for debugging purposes."
+
SUMMARY_${PN}-dbg ?= "${SUMMARY} - Debugging files"
DESCRIPTION_${PN}-dbg ?= "${DESCRIPTION} \
This package contains ELF symbols and related sources for debugging purposes."
@@ -285,7 +289,7 @@ SOLIBSDEV_darwin = ".dylibbroken"
PACKAGE_DEBUG_SPLIT_STYLE ?= "debug-with-srcpkg"
PACKAGE_BEFORE_PN ?= ""
-PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale
${PACKAGE_BEFORE_PN} ${PN}"
+PACKAGES = "${PN}-src ${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc
[OE-core] [PATCH] bitbake: add readlink to HOSTTOOLS
If systemd has EFI enabled it uses readlink. Signed-off-by: Ross Burton --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index f1540a0acf7..3d1434931d1 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -485,7 +485,7 @@ HOSTTOOLS += " \ fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \ head hostname id install ld ldd ln ls make makeinfo md5sum mkdir mknod \ mktemp mv nm objcopy objdump od patch perl pod2man pr printf pwd python2 \ -python2.7 python3 ranlib readelf readlink rm rmdir rpcgen sed seq sh sha256sum \ +python2.7 python3 ranlib readelf readlink realpath rm rmdir rpcgen sed seq sh sha256sum \ sleep sort split stat strings strip tail tar tee test touch tr true uname \ uniq wc wget which xargs \ " -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] utils: Fix create_wrapper
Wrappers generated by create_wrapper do not work properly:
python, for example, looks at argv[0] to know if it is
running from a virtualenv. Because the wrapper replaces
argv[0] with python's canonical path, python cannot tell
whether it has been invoked directly or from a virtualenv
symlink.
This change makes the wrapper pass the original argv[0] down
to the real command.
Signed-off-by: Achille Fouilleul
---
meta/classes/utils.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index 0016e5c4e6..cd3d05709e 100644
--- a/meta/classes/utils.bbclass
+++ b/meta/classes/utils.bbclass
@@ -264,7 +264,7 @@ create_wrapper () {
realpath=\`readlink -fn \$0\`
realdir=\`dirname \$realpath\`
export $exportstring
-exec -a \`dirname \$realpath\`/$cmdname \`dirname \$realpath\`/$cmdname.real
"\$@"
+exec -a "\$0" \$realdir/$cmdname.real "\$@"
END
chmod +x $cmd
}
--
2.18.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V5] default-distrovars: Drop DISTRO_FEATURES_LIBC
On Tuesday 26 February 2019 at 18:27:04 -0800, Khem Raj wrote:
> After eglibc was merged into glibc, Kconfig support was also dropped so
> these libc features therefore are not effective anymore and can be
> removed
This patch appears to have landed on master as
c62b1cc06613a4cdddf53290e6203559f43fc62d. Git bisect tells me that it is
causing glibc-package to fail to build for me in glibc-locale:do_package
for aarch64 with usrmerge and multilib:
DEBUG: Executing shell function do_prep_locale_tree
| tar: ./l*.so*: Not found in archive
| tar: Exiting with failure status due to previous errors
| WARNING:
.../tmp-glibc/work/aarch64-oe-linux/glibc-locale/2.29-r0/temp/run.do_prep_locale_tree.14302:1
exit 2 from 'tar -xf - -C $treedir//usr/lib64 --wildcards './l*
.so*''
tmp-glibc/sysroots-components/aarch64/glibc-stash-locale/usr/lib64 contains
only the gconv directory.
I thought that perhaps it had interacted badly with my:
a705c0782c863ee960d65b5109168a4587a0a7b7
glibc: Install AArch64 loader link correctly for usrmerge+multilib
which was landed in parallel, but when I revert that (and hack around the
resulting rmdir failure) the failure still occurs.
glibc-stash-locale/usr/lib/ld-linux-aarch64.so.1 is present - there's just
no libraries or loaders in glibc-stash-locale/usr/lib64
local.conf to reproduce:
require conf/multilib.conf
MULTILIBS = "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 = "armv7at-neon"
DISTRO_FEATURES += "usrmerge"
MACHINE="qemuarm64"
INHERIT+="ccache"
Then:
bitbake glibc-locale
Mike.
On Tuesday 26 February 2019 at 18:27:04 -0800, Khem Raj wrote:
> Signed-off-by: Khem Raj
> ---
> v2:
> - Add ipv4 and ipv6 to default distro features, they are not libc
> specific anyway
> - Remove DISTRO_FEATURES_DEFAULT as this is redundant now
>
> v3:
> - Remove the use of libc-* overrides in metadata
>
> v4:
> - Cleanup further to simplify variable assignments
>
> v5:
> - Keep DISTRO_FEATURES_DEFAULT, distros e.g. poky relies on it
>
> meta/classes/image.bbclass| 5 -
> meta/classes/libc-package.bbclass | 9 +++--
> meta/conf/bitbake.conf| 4 ++--
> .../distro/include/default-distrovars.inc | 13 ++---
> meta/conf/distro/include/tclibc-glibc.inc | 19 +--
> meta/conf/local.conf.sample.extended | 16 ++--
> meta/recipes-core/glib-2.0/glib.inc | 2 --
> meta/recipes-core/glibc/glibc_2.29.bb | 3 +--
> meta/recipes-core/libxml/libxml2_2.9.8.bb | 2 --
> meta/recipes-devtools/mtools/mtools_4.0.19.bb | 2 --
> .../findutils/findutils_4.6.0.bb | 2 +-
> meta/recipes-extended/shadow/shadow.inc | 2 +-
> meta/recipes-extended/shadow/shadow_4.6.bb| 2 +-
> 13 files changed, 18 insertions(+), 63 deletions(-)
>
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index 11927f39f5..276d0d31f4 100644
> --- a/meta/classes/image.bbclass
> +++ b/meta/classes/image.bbclass
> @@ -176,11 +176,6 @@ IMAGE_LINGUAS ?= "de-de fr-fr en-gb"
>
> LINGUAS_INSTALL ?= "${@" ".join(map(lambda s: "locale-base-%s" % s,
> d.getVar('IMAGE_LINGUAS').split()))}"
>
> -python () {
> -if not bb.utils.contains('DISTRO_FEATURES', 'libc-charsets
> libc-locale-code libc-locales', True, False, d):
> -d.setVar('IMAGE_LINGUAS', '')
> -}
> -
> # Prefer image, but use the fallback files for lookups if the image ones
> # aren't yet available.
> PSEUDO_PASSWD = "${IMAGE_ROOTFS}:${STAGING_DIR_NATIVE}"
> diff --git a/meta/classes/libc-package.bbclass
> b/meta/classes/libc-package.bbclass
> index 34c9151ae9..8859dad566 100644
> --- a/meta/classes/libc-package.bbclass
> +++ b/meta/classes/libc-package.bbclass
> @@ -37,14 +37,11 @@ python __anonymous () {
> d.setVar("DEPENDS", depends)
> d.setVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", "compile")
> break
> -
> -# try to fix disable charsets/locales/locale-code compile fail
> -if bb.utils.contains('DISTRO_FEATURES', 'libc-charsets libc-locales
> libc-locale-code', True, False, d):
> -d.setVar('PACKAGE_NO_GCONV', '0')
> -else:
> -d.setVar('PACKAGE_NO_GCONV', '1')
> }
>
> +# try to fix disable charsets/locales/locale-code compile fail
> +PACKAGE_NO_GCONV ?= "0"
> +
> OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
>
> locale_base_postinst_ontarget() {
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 435646a946..1c5369ec98 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -123,7 +123,7 @@ TUNE_ASARGS ??= ""
> TUNE_FEATURES ??= "${TUNE_FEATURES_tune-${DEFAULTTUNE}}"
> LIBCEXTENSION ??= ""
> ABIEXTENSION ??= ""
> -USE_NLS ??= "${@bb.utils.contains('DISTRO_FEATURES', 'libc-locale-code',
> 'yes', 'no', d)}"
> +USE_NLS ??= "yes"
> SDKUSE_NLS ??= "yes"
>
> TARGET_ARCH = "${TUNE_ARCH}"
> @@ -820,7 +820,7 @@ IMAGE_FEATURES +=
Re: [OE-core] [PATCH 0/3] Upgrade systemd to 241
| src/boot/efi/meson.build:63:24: ERROR: Program or command
'realpath' not found or not executable
Fails if you turn on EFI.
Ross
On Fri, 1 Mar 2019 at 08:42, Chen Qi wrote:
>
>
> The following changes since commit 4d275d97b6c572fe11668ac16d2c77c018340c7c:
>
> perl: apply a native-only patch only to -native (2019-02-28 17:49:40 +)
>
> are available in the git repository at:
>
> git://git.pokylinux.org/poky-contrib ChenQi/systemd-241
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/systemd-241
>
> Chen Qi (3):
> systemd: upgrade to 241
> systemd-conf: add version info in recipe name
> systemd-boot: upgrade to 241
>
> .../{systemd-boot_239.bb => systemd-boot_241.bb} | 10 +-
> .../{systemd-conf.bb => systemd-conf_241.bb} | 0
> meta/recipes-core/systemd/systemd.inc | 2 +-
> ...ck-protector-flags-to-workaround-musl-bui.patch | 33 --
> ...t-meson-print-EFI-CC-configuration-nicely.patch | 33 ++
> ...vert-meson-use-an-array-option-for-efi-cc.patch | 77 +++
> ...tl.d-request-ECN-on-both-in-and-outgoing-.patch | 36 --
> ...nv-when-secure-versions-are-not-available.patch | 21 +-
> ...t-install-dependency-links-at-install-tim.patch | 22 +-
> ...sive-let-s-rework-the-recursive-logic-to-.patch | 219 -
> ...eserializing-state-always-use-read_line-L.patch | 250 --
> ...sure-we-have-enough-space-for-the-DHCP6-o.patch | 39 --
> ...01-do-not-disable-buffer-in-writing-files.patch | 523
> +
> ...arse_uid-when-unmounting-user-runtime-dir.patch | 110 -
> .../0001-meson-rename-Ddebug-to-Ddebug-extra.patch | 45 --
> ...bus-make-BUS_DEFAULT_TIMEOUT-configurable.patch | 175 ---
> ...l-Don-t-pass-null-directive-argument-to-s.patch | 31 --
> ...ync-changes-type-of-drift_freq-to-int64_t.patch | 49 --
> ...Fix-use-after-free-case-in-load_from_path.patch | 43 --
> .../0002-don-t-use-glibc-specific-qsort_r.patch| 231 +
> ...pper-instead-of-looking-for-relative-opti.patch | 14 +-
> ...fn_t-is-glibc-specific-use-raw-signature-.patch | 40 --
> ...0003-implment-systemd-sysv-install-for-OE.patch | 8 +-
> ...e.h-add-__compare_fn_t-and-comparison_fn_.patch | 61 +++
> ...llback-parse_printf_format-implementation.patch | 33 +-
> .../systemd/0004-rules-whitelist-hd-devices.patch | 18 +-
> ...5-Make-root-s-home-directory-configurable.patch | 70 ---
> ...user-util-properly-protect-use-of-gshadow.patch | 38 --
> ...es-watch-metadata-changes-in-ide-devices.patch} | 18 +-
> ...sic-missing.h-check-for-missing-strndupa.patch} | 90 ++--
> ...patch => 0006-Include-netinet-if_ether.h.patch} | 28 +-
> .../0006-remove-nobody-user-group-checking.patch | 63 ---
> ...if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch} | 49 +-
> ...le-nss-tests-if-nss-systemd-is-not-enable.patch | 29 --
> ...=> 0008-add-missing-FTW_-macros-for-musl.patch} | 29 +-
> ...nes-Build-conditionally-when-ENABLE_MYHOS.patch | 43 --
> ...l-don-t-fail-if-libc-doesn-t-support-IDN.patch} | 10 +-
> ...of-__register_atfork-for-non-glibc-build.patch} | 16 +-
> ...> 0011-Use-uintmax_t-for-handling-rlim_t.patch} | 59 ++-
> ...issing.h-check-for-missing-__compar_fn_t-.patch | 48 --
> ...-ULONG_LONG_MAX-definition-in-case-of-mus.patch | 27 ++
> ...xdecoct.c-Include-missing.h-for-strndupa.patch} | 8 +-
> ...-ULONG_LONG_MAX-definition-in-case-of-mus.patch | 30 --
> ...c-Disable-tests-for-missing-typedefs-in-.patch} | 12 +-
> ...ss-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch} | 10 +-
> ...-compatible-basename-for-non-glibc-syste.patch} | 8 +-
> ...le-buffering-when-writing-to-oom_score_a.patch} | 10 +-
> ...XSI-compliant-strerror_r-from-GNU-specif.patch} | 12 +-
> ...t_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch} | 29 +-
> ...ing_type.h-add-__compar_d_fn_t-definition.patch | 30 ++
> ...id-redefinition-of-prctl_mm_map-structure.patch | 47 ++
> ...se-if-instead-of-ifdef-for-ENABLE_GSHADOW.patch | 28 --
> ...etect-whether-struct-statx-is-defined-in-.patch | 109 -
> ...clude-sys-wait.h-to-avoid-compile-failure.patch | 33 ++
> ...onf-fixes-for-the-compatibility-interface.patch | 58 ---
> .../0023-socket-util.h-include-string.h.patch | 30 ++
> ...-not-store-the-iovec-entry-for-process-co.patch | 208
> .../systemd/0024-test-json.c-define-M_PIl.patch| 33 ++
> ...rnald-set-a-limit-on-the-number-of-fields.patch | 139 --
> ...nal-fix-out-of-bounds-read-CVE-2018-16866.patch | 49 --
> .../systemd/systemd/CVE-2019-6454.patch| 210 -
> ...e-receive-an-invalid-dbus-message-ignore-.patch | 61 ---
> .../systemd/{systemd_239.bb => systemd_241.bb} | 79 ++--
> 63 files changed, 1294 insertions(+), 2679 deletions(-)
> rename meta/recipes-core/systemd/{systemd-boot_239.bb =>
> systemd-boot_241.bb} (85%)
> rename meta/recipes-core/systemd/{systemd-conf.bb => systemd-conf_241.bb}
> (100%)
> delete mode 100644
>
[OE-core] [PATCH v2 4/4] imagefeatures: Add test to blacklist building busybox
Now that we have a packagegroup that can be used to replace the overall
functionality of busybox as base-utils, add a test that we can continue
to build a fairly complex image without busybox being available. This
also doubles as documentation-by-test of how to do this.
Signed-off-by: Tom Rini
---
meta/lib/oeqa/selftest/cases/imagefeatures.py | 26 ++
1 file changed, 26 insertions(+)
diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py
b/meta/lib/oeqa/selftest/cases/imagefeatures.py
index 8c95432e00b3..aed63e5476a7 100644
--- a/meta/lib/oeqa/selftest/cases/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py
@@ -236,3 +236,29 @@ USERADD_GID_TABLES += "files/static-group"
"""
self.write_config(config)
bitbake("core-image-base")
+
+def test_no_busybox_base_utils(self):
+config = """
+# Enable x11
+DISTRO_FEATURES_append += "x11"
+
+# Switch to systemd
+DISTRO_FEATURES += "systemd"
+VIRTUAL-RUNTIME_init_manager = "systemd"
+VIRTUAL-RUNTIME_initscripts = ""
+VIRTUAL-RUNTIME_syslog = ""
+VIRTUAL-RUNTIME_login_manager = "shadow-base"
+DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
+
+# Replace busybox
+PREFERRED_PROVIDER_virtual/base-utils = "packagegroup-core-base-utils"
+VIRTUAL-RUNTIME_base-utils = "packagegroup-core-base-utils"
+VIRTUAL-RUNTIME_base-utils-hwclock = "util-linux-hwclock"
+VIRTUAL-RUNTIME_base-utils-syslog = ""
+
+# Blacklist busybox
+PNBLACKLIST[busybox] = "Don't build this"
+"""
+self.write_config(config)
+
+bitbake("--graphviz core-image-sato")
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/4] vim: Import version 8.1.0347
In order to have a stand-alone editor in oe-core, bring in vim from meta-openembedded/meta-oe. This imports the recipes as of git commit: commit 41f3f8165bde3eb4f8bcf6dddbaca0d3b760c70b Author: Mark Hatle Date: Thu Feb 28 09:39:19 2019 +0800 vim: remove xfce vim bbappend Changing the behavior of a recipe by including a layer is not allowed by the yocto-check-layer script. Signed-off-by: Tom Rini -- Changes in v2: - List self as maintainer --- meta/conf/distro/include/maintainers.inc | 1 + meta/files/common-licenses/vim | 81 + ...0001-src-Makefile-improve-reproducibility.patch | 46 .../vim/files/disable_acl_header_check.patch | 39 +++ .../vim-add-knob-whether-elf.h-are-checked.patch | 42 +++ meta/recipes-support/vim/vim-tiny_8.1.0347.bb | 15 +++ meta/recipes-support/vim/vim_8.1.0347.bb | 129 + 7 files changed, 353 insertions(+) create mode 100644 meta/files/common-licenses/vim create mode 100644 meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch create mode 100644 meta/recipes-support/vim/files/disable_acl_header_check.patch create mode 100644 meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch create mode 100644 meta/recipes-support/vim/vim-tiny_8.1.0347.bb create mode 100644 meta/recipes-support/vim/vim_8.1.0347.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index e6a2f736caa3..b727dc5f5525 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -702,6 +702,7 @@ RECIPE_MAINTAINER_pn-util-macros = "Armin Kuster " RECIPE_MAINTAINER_pn-v86d = "Alexander Kanavin " RECIPE_MAINTAINER_pn-vala = "Alexander Kanavin " RECIPE_MAINTAINER_pn-valgrind = "Alexander Kanavin " +RECIPE_MAINTAINER_pn-vim = "Tom Rini " RECIPE_MAINTAINER_pn-virglrenderer = "Alexander Kanavin " RECIPE_MAINTAINER_pn-volatile-binds = "Chen Qi " RECIPE_MAINTAINER_pn-vte = "Anuj Mittal " diff --git a/meta/files/common-licenses/vim b/meta/files/common-licenses/vim new file mode 100644 index ..4aa818eb248e --- /dev/null +++ b/meta/files/common-licenses/vim @@ -0,0 +1,81 @@ +VIM LICENSE + +I) There are no restrictions on distributing unmodified copies of Vim except +that they must include this license text. You can also distribute +unmodified parts of Vim, likewise unrestricted except that they must +include this license text. You are also allowed to include executables +that you made from the unmodified Vim sources, plus your own usage +examples and Vim scripts. + +II) It is allowed to distribute a modified (or extended) version of Vim, +including executables and/or source code, when the following four +conditions are met: +1) This license text must be included unmodified. +2) The modified Vim must be distributed in one of the following five ways: + a) If you make changes to Vim yourself, you must clearly describe in + the distribution how to contact you. When the maintainer asks you + (in any way) for a copy of the modified Vim you distributed, you + must make your changes, including source code, available to the + maintainer without fee. The maintainer reserves the right to + include your changes in the official version of Vim. What the + maintainer will do with your changes and under what license they + will be distributed is negotiable. If there has been no negotiation + then this license, or a later version, also applies to your changes. + The current maintainer is Bram Moolenaar . If this + changes it will be announced in appropriate places (most likely + vim.sf.net, www.vim.org and/or comp.editors). When it is completely + impossible to contact the maintainer, the obligation to send him + your changes ceases. Once the maintainer has confirmed that he has + received your changes they will not have to be sent again. + b) If you have received a modified Vim that was distributed as + mentioned under a) you are allowed to further distribute it + unmodified, as mentioned at I). If you make additional changes the + text under a) applies to those changes. + c) Provide all the changes, including source code, with every copy of + the modified Vim you distribute. This may be done in the form of a + context diff. You can choose what license to use for new code you + add. The changes and their license must not restrict others from + making their own changes to the official version of Vim. + d) When you have a modified Vim which includes changes as mentioned + under c), you can distribute it without the source code for the + changes if the following three conditions are met: + -
[OE-core] [PATCH v2 3/4] packagegroup-core-base-utils: Introduce new base-utils packagegroup
This packagegroup is intended to provide all of the functionality found
in other VIRTUAL-RUNTIME_base-utils providers through full packages
rather than an all-on-one package. Document how to make use of this
in local.conf.sample.extended. Introduce VIRTUAL-RUNTIME-vim and
default this to vim-tiny to allow for a differently features vim to be
used instead.
Signed-off-by: Tom Rini
---
Changes in v2:
- Add a few more inetutils packages
- List kbd, add a few more packages specifically for non-systemd
systems, thanks Mark!
---
meta/conf/local.conf.sample.extended | 8 +++
.../packagegroups/packagegroup-core-base-utils.bb | 58 ++
2 files changed, 66 insertions(+)
create mode 100644
meta/recipes-extended/packagegroups/packagegroup-core-base-utils.bb
diff --git a/meta/conf/local.conf.sample.extended
b/meta/conf/local.conf.sample.extended
index 8062e4c5721b..d00221893ad9 100644
--- a/meta/conf/local.conf.sample.extended
+++ b/meta/conf/local.conf.sample.extended
@@ -384,3 +384,11 @@
#VIRTUAL-RUNTIME_login_manager = "shadow-base"
#VIRTUAL-RUNTIME_init_manager = "systemd"
#VIRTUAL-RUNTIME_initscripts = "systemd-compat-units"
+
+#
+# Use a full set of packages instead of busybox for base utils
+#
+#PREFERRED_PROVIDER_base-utils = "packagegroup-core-base-utils"
+#VIRTUAL-RUNTIME_base-utils = "packagegroup-core-base-utils"
+#VIRTUAL-RUNTIME_base-utils-hwclock = "util-linux-hwclock"
+#VIRTUAL-RUNTIME_base-utils-syslog = "syslog"
diff --git
a/meta/recipes-extended/packagegroups/packagegroup-core-base-utils.bb
b/meta/recipes-extended/packagegroups/packagegroup-core-base-utils.bb
new file mode 100644
index ..431dbb092615
--- /dev/null
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-base-utils.bb
@@ -0,0 +1,58 @@
+#
+# Copyright (C) 2019 Konsulko Group
+#
+
+SUMMARY = "Full-featured set of base utils"
+DESCRIPTION = "Package group bringing in packages needed to provide much of
the base utils type functionality found in busybox"
+
+inherit packagegroup
+
+VIRTUAL-RUNTIME_vim ?= "vim-tiny"
+
+RDEPENDS_${PN} = "\
+base-passwd \
+bash \
+bind-utils \
+bzip2 \
+coreutils \
+cpio \
+${@bb.utils.contains("DISTRO_FEATURES", "systemd", "",
"debianutils-run-parts", d)} \
+dhcp-client \
+${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "dhcp-server", d)} \
+diffutils \
+${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "dpkg-start-stop",
d)} \
+e2fsprogs \
+ed \
+file \
+findutils \
+gawk \
+grep \
+gzip \
+${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "ifupdown", d)} \
+inetutils \
+inetutils-ping \
+inetutils-telnet \
+inetutils-tftp \
+inetutils-traceroute \
+iproute2 \
+${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "kbd", "", d)} \
+kmod \
+less \
+lzip \
+ncurses-tools \
+net-tools \
+parted \
+patch \
+procps \
+psmisc \
+sed \
+shadow-base \
+tar \
+time \
+unzip \
+util-linux \
+${VIRTUAL-RUNTIME_vim} \
+wget \
+which \
+xz \
+"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 2/4] inetutils: Import version 1.9.4
In order to have more robust stand-alone network tools in oe-core, bring
in inetutils from meta-openembedded/meta-networking. This imports the
recipes as of git commit:
commit 408204073e6bdcd8ac586e05d5b75213417673f2
Author: Martin Jansa
Date: Thu Aug 16 20:39:15 2018 +
inetutils: fix build with glibc-2.28
Signed-off-by: Tom Rini
---
Changes in v2:
- Fix wording (thanks André!)
- Add self as maintainer
---
meta/conf/distro/include/maintainers.inc | 1 +
.../0001-rcp-fix-to-work-with-large-files.patch| 31
.../inetutils/inetutils/fix-disable-ipv6.patch | 83 +
...tf-parse-pull-in-features.h-for-__GLIBC__.patch | 29 +++
.../inetutils/inetutils-1.8-0003-wchar.patch | 14 ++
.../inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch | 26 +++
...ls-only-check-pam_appl.h-when-pam-enabled.patch | 40
.../inetutils/inetutils/rexec.xinetd.inetutils | 20 ++
.../inetutils/inetutils/rlogin.xinetd.inetutils| 23 +++
.../inetutils/inetutils/rsh.xinetd.inetutils | 21 +++
.../inetutils/inetutils/telnet.xinetd.inetutils| 13 ++
.../inetutils/inetutils/tftpd.xinetd.inetutils | 19 ++
.../inetutils/inetutils/version.patch | 17 ++
.../inetutils/inetutils_1.9.4.bb | 206 +
14 files changed, 543 insertions(+)
create mode 100644
meta/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch
create mode 100644
meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch
create mode 100644
meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch
create mode 100644
meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch
create mode 100644
meta/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch
create mode 100644
meta/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch
create mode 100644
meta/recipes-connectivity/inetutils/inetutils/rexec.xinetd.inetutils
create mode 100644
meta/recipes-connectivity/inetutils/inetutils/rlogin.xinetd.inetutils
create mode 100644
meta/recipes-connectivity/inetutils/inetutils/rsh.xinetd.inetutils
create mode 100644
meta/recipes-connectivity/inetutils/inetutils/telnet.xinetd.inetutils
create mode 100644
meta/recipes-connectivity/inetutils/inetutils/tftpd.xinetd.inetutils
create mode 100644 meta/recipes-connectivity/inetutils/inetutils/version.patch
create mode 100644 meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index b727dc5f5525..1a198e12d862 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -269,6 +269,7 @@ RECIPE_MAINTAINER_pn-i2c-tools = "Anuj Mittal
"
RECIPE_MAINTAINER_pn-icecc-create-env = "Joshua Watt "
RECIPE_MAINTAINER_pn-icu = "Alexander Kanavin "
RECIPE_MAINTAINER_pn-ifupdown = "Anuj Mittal "
+RECIPE_MAINTAINER_pn-inetutils = "Tom Rini "
RECIPE_MAINTAINER_pn-init-ifupdown = "Anuj Mittal "
RECIPE_MAINTAINER_pn-initramfs-boot = "Otavio Salvador
"
RECIPE_MAINTAINER_pn-initramfs-framework = "Otavio Salvador
"
diff --git
a/meta/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch
b/meta/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch
new file mode 100644
index ..d4764f586736
--- /dev/null
+++
b/meta/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch
@@ -0,0 +1,31 @@
+Upstream-Status: Pending
+
+Subject: rcp: fix to work with large files
+
+When we copy file by rcp command, if the file > 2GB, it will fail.
+The cause is that it used incorrect data type on file size in sink() of rcp.
+
+Signed-off-by: Chen Qi
+---
+ src/rcp.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/rcp.c b/src/rcp.c
+index 21f55b6..bafa35f 100644
+--- a/src/rcp.c
b/src/rcp.c
+@@ -876,9 +876,9 @@ sink (int argc, char *argv[])
+ enum
+ { YES, NO, DISPLAYED } wrerr;
+ BUF *bp;
+- off_t i, j;
++ off_t i, j, size;
+ int amt, count, exists, first, mask, mode, ofd, omode;
+- int setimes, size, targisdir, wrerrno;
++ int setimes, targisdir, wrerrno;
+ char ch, *cp, *np, *targ, *vect[1], buf[BUFSIZ];
+ const char *why;
+
+--
+1.9.1
+
diff --git
a/meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch
b/meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch
new file mode 100644
index ..24c134fcac8d
--- /dev/null
+++ b/meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch
@@ -0,0 +1,83 @@
+Upstream: http://www.mail-archive.com/bug-inetutils@gnu.org/msg02103.html
+
+Upstream-Status: Pending
+
+Signed-off-by: Jackie Huang
+---
+ ping/ping_common.h | 20
+ 1 file changed, 20
[OE-core] [PATCH v2 0/4] Introduce packagegroup-core-base-utils
Over on the Yocto list[1] the topic of how to build an image without busybox once again came up. As part of that discussion I said I'd been thinking about a packagegroup to make this easier to do as while virtual/base-utils and VIRTUAL-RUNTIME_base-utils exist and work and allow for this, the list of things we get from busybox is non-trivial. In fact, this exposed that in oe-core itself we have no editor aside from busybox and are missing a number of common network utilities too. To that end, this series migrates vim and inetutils from meta-oe to oe-core, introduces packagegroup-core-base-utils (and documents using it in local.conf.sample.extended) and finally adds a testcase of building (technically, making the dependency graph as that does what we need and is much quicker, 5s vs 3 minute) core-image-sato with busybox disabled, so that we can do our best to avoid introucing busybox as a hard requirement in the future. With respect to functionality, and since v2, this is basically 1:1 with busybox. I didn't add more "useful" utilities (which I would argue belong in packagegroup-core-full-cmdline which follow up to this could be enhanced to pull in this packagegroup and add to it). In terms of deviation: - On systemd, we use that for a trivial dhcp server. On sysvinit we provide dhcp-server. - We don't have fbset in oe-core, nor netcat-openbsd. Both of these exist in meta-openembedded but I don't know if it's worth the overhead to move one or both of those to oe-core as well for this. [1]: https://lists.yoctoproject.org/pipermail/yocto/2019-February/044317.html -- Tom -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] cve-check: How to convert to JUnit?
Hi I would like to convert the files generated by the cve-check class to the JUnit format so that I can use the findings in my CI (Bamboo). Does anyone know a tool which does it? Kind regards, Reto 0x9D090A915B7B8BD1.asc Description: application/pgp-keys 0x9D090A915B7B8BD1.asc Description: application/pgp-keys -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] bind-utils: Install nslookup
On Wed, Mar 06, 2019 at 09:59:01AM +0200, Adrian Bunk wrote: > nslookup was undeprecated 15 years ago, > and installing bind-utils should replace the busybox version. > > Signed-off-by: Adrian Bunk Thanks, I have this locally too but got side-tracked so I haven't posted my v2 series, I should get to that today. Reviewed-by: Tom Rini -- Tom signature.asc Description: PGP signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
