Re: [OE-core] disabling the whitelist
Community, My apologies. Please ignore my last post "Disabling the whitelist". That was in reference to a feature that OE apparently rejected (in 2015) but was adopted into WRLinux, which is what I'm working with. -Alan On Fri, Oct 26, 2018 at 3:11 PM Alan Kozlay wrote: > Community, > > We have a whitelist for packages in place and whitelist.bbclass works as > expected. But is there a simple mechanism that can be employed in > local.conf to disable it, when needed? > > To be clear, we don't want it disabled all of the time, but it would help > to have a simple line in local.conf disabled it, during development. > > Any ideas? > > -Alan > > -- > Alan Kozlay > VES Solutions, LLC > Alan Kozlay > DESK 443-595-7734 > CELL 443-752-0323 > -- Alan Kozlay VES Solutions, LLC Alan Kozlay DESK 443-595-7734 CELL 443-752-0323 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] disabling the whitelist
Community, We have a whitelist for packages in place and whitelist.bbclass works as expected. But is there a simple mechanism that can be employed in local.conf to disable it, when needed? To be clear, we don't want it disabled all of the time, but it would help to have a simple line in local.conf disabled it, during development. Any ideas? -Alan -- Alan Kozlay VES Solutions, LLC Alan Kozlay DESK 443-595-7734 CELL 443-752-0323 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] npm: change install directory to upstream default
On Fri, 19 Oct 2018 at 09:29, Olaf Mandel wrote: > > The node binary searches for packages in a number of locations, the last > of which is $PREFIX/lib/node (here: /usr/lib/node) from the list of > GLOBAL_FOLDERS [1]. Change the installation directory for all packages > depending on npm.bbclass to that location. This removes the need to > define the NODE_PATH variable to the non-standard /usr/lib/node_modules > value. > > While the Tips for Package Managers [2] discusses installing packages to > /usr/lib/node_modules//, this has several drawbacks: > > * it does not work for the REPL as mentioned in the documentation > * it also does not work for any code _not_ installed as a global >package under /usr/lib/node_modules (e.g. /usr/share/foo.js will not >find any packages below /usr/lib) > * using the non-default location and then having to set NODE_PATH >barely saves any time: there are only two file-system lookups (to the >legacy $HOME/.node_modules and $HOME/.node_libraries) directories >before the library would be found > > And the suggestion was made in the context of deduping the node_modules > tree by installing all packages in a flat hierarchy and using symlinks > to the correct version of each dependency. This is not what OpenEmbedded > does, so none of those benefits (deduping, cleaner packages) are being > had by shifting the installation directory to /usr/lib/node_modules. > > [1]: > https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders > [2]: https://nodejs.org/api/modules.html#modules_addenda_package_manager_tips > > Signed-off-by: Olaf Mandel > --- > meta/classes/npm.bbclass | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass > index c351ff0866..d5ff0c6d57 100644 > --- a/meta/classes/npm.bbclass > +++ b/meta/classes/npm.bbclass > @@ -10,7 +10,7 @@ def node_pkgname(d): > > NPMPN ?= "${@node_pkgname(d)}" > > -NPM_INSTALLDIR = "${D}${libdir}/node_modules/${NPMPN}" > +NPM_INSTALLDIR = "${D}${libdir}/node/${NPMPN}" Ï realise this has already gone în, but should this be ${nonarch_libdir}, or does it use /usr/lib64 or /usr/libx32 correctly? > > # function maps arch names to npm arch names > def npm_oe_arch_map(target_arch, d): > -- > 2.11.0 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] machine/qemu*: fix kernel finish crng init more and more slowly
Just adding `-device virtio-rng-pci' to the QEMU invocation will add the device with a default host backend. As of QEMU 1.3+, the default backend is to use the host's /dev/random as a source of entropy. [1] When the entropy pool is empty, reads from /dev/random will block until additional environmental noise is gathered. [2] For Yocto, if call runqemu frequently, it will consume lots of host's /dev/random, and kernel finish crng init in guest get more and more slowly. Here are 4 times runqemu boot test: [3.464432] random: crng init done [ 20.874030] random: crng init done [ 23.583589] random: crng init done [ 23.858945] random: crng init done Modify entropy source to /dev/urandom device on the host which returns random bytes using a pseudorandom number generator seeded from the entropy pool. Reads from this device do not block and kernel finish crng init in guest will not delay. Of course, the side effect is obviously, we lost the quality of randomness, but the modification is only on runqemu script rather than real embedded device, and it benefits oeqa efficiency in which many cases call runqemu especially multiple oeqa builds on one host. After apply the fix: [3.364670] random: crng init done [4.619061] random: crng init done [3.403897] random: crng init done [3.450717] random: crng init done [1] https://wiki.qemu.org/Features/VirtIORNG [2] http://man7.org/linux/man-pages/man4/random.4.html Signed-off-by: Hongxu Jia --- meta/conf/machine/include/qemuboot-mips.inc | 3 ++- meta/conf/machine/include/qemuboot-x86.inc | 3 ++- meta/conf/machine/qemuarm.conf | 3 ++- meta/conf/machine/qemuarm64.conf| 4 +++- meta/conf/machine/qemuppc.conf | 3 ++- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/meta/conf/machine/include/qemuboot-mips.inc b/meta/conf/machine/include/qemuboot-mips.inc index 7d9fa52..75bb988 100644 --- a/meta/conf/machine/include/qemuboot-mips.inc +++ b/meta/conf/machine/include/qemuboot-mips.inc @@ -3,6 +3,7 @@ IMAGE_CLASSES += "qemuboot" QB_MEM = "-m 256" QB_MACHINE = "-machine malta" QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" +QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -device usb-tablet" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy -QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -device usb-tablet -device virtio-rng-pci" +QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" QB_SYSTEM_NAME = "qemu-system-${TUNE_ARCH}" diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc index 1456bf7..ae6c2de 100644 --- a/meta/conf/machine/include/qemuboot-x86.inc +++ b/meta/conf/machine/include/qemuboot-x86.inc @@ -11,7 +11,8 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo" QB_AUDIO_DRV = "alsa" QB_AUDIO_OPT = "-soundhw ac97,es1370" QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1" +QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet -device" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy -QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet -device virtio-rng-pci" +QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" UVESA_MODE ?= "640x480-32" diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index d2f2c85..a544312 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf @@ -14,7 +14,8 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1" QB_SYSTEM_NAME = "qemu-system-arm" QB_MACHINE = "-machine versatilepb" 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 = "-show-cursor -usb -device usb-tablet -device virtio-rng-pci" +QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" PREFERRED_VERSION_linux-yocto ??= "4.18%" QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf index 242889a..34fcd2a 100644 --- a/meta/conf/machine/qemuarm64.conf +++ b/meta/conf/machine/qemuarm64.conf @@ -16,7 +16,9 @@ QB_MACHINE = "-machine virt" QB_CPU = "-cpu cortex-a57" QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,38400" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy -QB_OPT_APPEND = "-show-cursor -device virtio-rng-pci -monitor null" +QB_OPT_APPEND = "-show-cursor -monitor null" +# 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" QB_TAP_OPT = "-netdev
[OE-core] [PATCH v2] go 1.9/1.11: fix textrel qa warning for non mips arch
While building go itself, the go build system does not support to set `-buildmode=pie' from environment. Add GOBUILDMODE to support it which make PIE executables the default build mode, as PIE executables are required as of Yocto But mips doesn't support -buildmode=pie, so skip the QA checking for mips and its variants Issue: LIN1018-2738 (LOCAL REV: NOT UPSTREAM) -- Sent to oe-core 20181026 Signed-off-by: Hongxu Jia --- meta/recipes-devtools/go/go-1.11.inc | 1 + .../0008-use-GOBUILDMODE-to-set-buildmode.patch| 40 ++ meta/recipes-devtools/go/go-1.9.inc| 1 + .../0011-use-GOBUILDMODE-to-set-buildmode.patch| 40 ++ meta/recipes-devtools/go/go_1.11.bb| 12 +++ meta/recipes-devtools/go/go_1.9.bb | 16 + 6 files changed, 104 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch create mode 100644 meta/recipes-devtools/go/go-1.9/0011-use-GOBUILDMODE-to-set-buildmode.patch diff --git a/meta/recipes-devtools/go/go-1.11.inc b/meta/recipes-devtools/go/go-1.11.inc index c02e468..d626514 100644 --- a/meta/recipes-devtools/go/go-1.11.inc +++ b/meta/recipes-devtools/go/go-1.11.inc @@ -15,6 +15,7 @@ SRC_URI += "\ file://0005-make.bash-override-CC-when-building-dist-and-go_boot.patch \ file://0006-cmd-dist-separate-host-and-target-builds.patch \ file://0007-cmd-go-make-GOROOT-precious-by-default.patch \ +file://0008-use-GOBUILDMODE-to-set-buildmode.patch \ " SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" diff --git a/meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch b/meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch new file mode 100644 index 000..b6ab504 --- /dev/null +++ b/meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch @@ -0,0 +1,40 @@ +From 0e0c247f0caec23528889ff09d98348cba9028f1 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Fri, 26 Oct 2018 15:02:32 +0800 +Subject: [PATCH] use GOBUILDMODE to set buildmode + +While building go itself, the go build system does not support +to set `-buildmode=pie' from environment. + +Add GOBUILDMODE to support it which make PIE executables the default +build mode, as PIE executables are required as of Yocto + +Refers: https://groups.google.com/forum/#!topic/golang-dev/gRCe5URKewI +Upstream-Status: Denied [upstream choose antoher solution: `17a256b +cmd/go: -buildmode=pie for android/arm'] + +Signed-off-by: Hongxu Jia +--- + src/cmd/go/internal/work/build.go | 6 +- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go +index 145b875..595d703 100644 +--- a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go +@@ -218,7 +218,11 @@ func AddBuildFlags(cmd *base.Command) { + + cmd.Flag.Var(, "asmflags", "") + cmd.Flag.Var(buildCompiler{}, "compiler", "") +- cmd.Flag.StringVar(, "buildmode", "default", "") ++ if bm := os.Getenv("GOBUILDMODE"); bm != "" { ++ cmd.Flag.StringVar(, "buildmode", bm, "") ++ } else { ++ cmd.Flag.StringVar(, "buildmode", "default", "") ++ } + cmd.Flag.Var(, "gcflags", "") + cmd.Flag.Var(, "gccgoflags", "") + cmd.Flag.StringVar(, "mod", "", "") +-- +2.7.4 + diff --git a/meta/recipes-devtools/go/go-1.9.inc b/meta/recipes-devtools/go/go-1.9.inc index 329cee0..ba1eaa0 100644 --- a/meta/recipes-devtools/go/go-1.9.inc +++ b/meta/recipes-devtools/go/go-1.9.inc @@ -19,6 +19,7 @@ SRC_URI += "\ file://0008-make.bash-add-GOHOSTxx-indirection-for-cross-canadia.patch \ file://0009-cmd-go-buildmode-pie-forces-external-linking-mode-on.patch \ file://0010-make.bash-override-CC-when-building-dist-and-go_boot.patch \ +file://0011-use-GOBUILDMODE-to-set-buildmode.patch \ " SRC_URI_append_libc-musl = " file://set-external-linker.patch" diff --git a/meta/recipes-devtools/go/go-1.9/0011-use-GOBUILDMODE-to-set-buildmode.patch b/meta/recipes-devtools/go/go-1.9/0011-use-GOBUILDMODE-to-set-buildmode.patch new file mode 100644 index 000..da93dc5 --- /dev/null +++ b/meta/recipes-devtools/go/go-1.9/0011-use-GOBUILDMODE-to-set-buildmode.patch @@ -0,0 +1,40 @@ +From b928fafab1d9425aae9341806bd2f6178ba1da1f Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Fri, 26 Oct 2018 16:32:50 +0800 +Subject: [PATCH] use GOBUILDMODE to set buildmode + +While building go itself, the go build system does not support +to set `-buildmode=pie' from environment. +
[OE-core] [PATCH 0/2] Fixes for groff and toolchain-scripts.bbclass
From: Kai Kang The following changes since commit 3be5331986289bf11040c241fd54239fb2011695: testimage.bbclass: define ptest suite variable (2018-10-25 14:53:44 +0100) are available in the Git repository at: git://git.pokylinux.org/poky-contrib kangkai/misc http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/misc Kai Kang (2): groff: not search fonts on build host toolchain-scripts.bbclass: fix paths of siteconfig files meta/classes/toolchain-scripts.bbclass| 9 + ...groff-not-search-fonts-on-build-host.patch | 20 +++ meta/recipes-extended/groff/groff_1.22.3.bb | 1 + 3 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-extended/groff/groff-1.22.3/groff-not-search-fonts-on-build-host.patch -- 2.18.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] toolchain-scripts.bbclass: fix paths of siteconfig files
From: Kai Kang It can't find right siteconfig files in toolchain-scripts.bbclass after adapting to RSS. Correct the paths. Signed-off-by: Kai Kang --- meta/classes/toolchain-scripts.bbclass | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index 6d1ba69473..cfc5eb9fae 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass @@ -158,7 +158,7 @@ EOF #we get the cached site config in the runtime TOOLCHAIN_CONFIGSITE_NOCACHE = "${@siteinfo_get_files(d)}" -TOOLCHAIN_CONFIGSITE_SYSROOTCACHE = "${STAGING_DIR}/${MLPREFIX}${MACHINE}/${target_datadir}/${TARGET_SYS}_config_site.d" +TOOLCHAIN_CONFIGSITE_SYSROOTCACHE = "${COMPONENTS_DIR}/${DEFAULTTUNE}" TOOLCHAIN_NEED_CONFIGSITE_CACHE ??= "virtual/${MLPREFIX}libc ncurses" DEPENDS += "${TOOLCHAIN_NEED_CONFIGSITE_CACHE}" @@ -178,11 +178,12 @@ toolchain_create_sdk_siteconfig () { # Resolve virtual/* names to the real recipe name using sysroot-providers info case $sitefile in virtual/*) sitefile=`echo $sitefile | tr / _` - sitefile=`cat ${STAGING_DIR_TARGET}/sysroot-providers/$sitefile` + sitefile=`cat ${STAGING_DIR_TARGET}/sysroot-providers/$sitefile | sed "s/^${MLPREFIX}//"` esac - if [ -r ${TOOLCHAIN_CONFIGSITE_SYSROOTCACHE}/${sitefile}_config ]; then - cat ${TOOLCHAIN_CONFIGSITE_SYSROOTCACHE}/${sitefile}_config >> $siteconfig + sitefile_config=${TOOLCHAIN_CONFIGSITE_SYSROOTCACHE}/${MLPREFIX}${sitefile}/${target_datadir}/${TARGET_SYS}_config_site.d/${sitefile}_config + if [ -r $sitefile_config ]; then + cat $sitefile_config >> $siteconfig fi done } -- 2.18.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] groff: not search fonts on build host
From: Kai Kang groff searches fonts on build host which are provided by ghostscript. The number of font files installed by groff are different according to whether ghostscript fonts are installed on build host. Fix it by not search font dirs on the host. Signed-off-by: Kai Kang --- ...groff-not-search-fonts-on-build-host.patch | 20 +++ meta/recipes-extended/groff/groff_1.22.3.bb | 1 + 2 files changed, 21 insertions(+) create mode 100644 meta/recipes-extended/groff/groff-1.22.3/groff-not-search-fonts-on-build-host.patch diff --git a/meta/recipes-extended/groff/groff-1.22.3/groff-not-search-fonts-on-build-host.patch b/meta/recipes-extended/groff/groff-1.22.3/groff-not-search-fonts-on-build-host.patch new file mode 100644 index 00..ff8f320592 --- /dev/null +++ b/meta/recipes-extended/groff/groff-1.22.3/groff-not-search-fonts-on-build-host.patch @@ -0,0 +1,20 @@ +groff searchs fonts which are provided by ghostscript on build host. +It causes non-determinism issue. So not search font dirs on host. + +Upstream-Status: Inappropriate [cross build specific] + +Signed-off-by: Kai Kang + +diff --git a/font/devpdf/Foundry.in b/font/devpdf/Foundry.in +index a6e968f..8094642 100644 +--- a/font/devpdf/Foundry.in b/font/devpdf/Foundry.in +@@ -65,7 +65,7 @@ ZD|YDingbats!d05l.pfb + #== + + #Foundry|Name|Searchpath +-foundry|U|(gs):/usr/share/fonts/type1/gsfonts :/opt/local/share/fonts/urw-fonts # the URW fonts delivered with ghostscript (may be different) ++foundry|U|(gs) # the URW fonts delivered with ghostscript (may be different) + #Define Flags for afmtodit + + r=-i 0 -m diff --git a/meta/recipes-extended/groff/groff_1.22.3.bb b/meta/recipes-extended/groff/groff_1.22.3.bb index ce7ce3e791..ba90cadd88 100644 --- a/meta/recipes-extended/groff/groff_1.22.3.bb +++ b/meta/recipes-extended/groff/groff_1.22.3.bb @@ -11,6 +11,7 @@ SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ file://groff-1.22.2-correct-man.local-install-path.patch \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://0001-replace-perl-w-with-use-warnings.patch \ + file://groff-not-search-fonts-on-build-host.patch \ " SRC_URI[md5sum] = "cc825fa64bc7306a885f2fb2268d3ec5" -- 2.18.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for go 1.9/1.11: fix textrel qa warning for non mips arch
== Series Details == Series: go 1.9/1.11: fix textrel qa warning for non mips arch Revision: 1 URL : https://patchwork.openembedded.org/series/14686/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Upstream-Status is in incorrect format [test_upstream_status_presence_format] Suggested fixFix Upstream-Status format in 0008-use-GOBUILDMODE-to-set-buildmode.patch Current Upstream-Status: Deny [upstream choose antoher solution: `17a256b Standard format Upstream-Status: Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where] If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] go 1.9/1.11: fix textrel qa warning for non mips arch
While building go itself, the go build system does not support to set `-buildmode=pie' from environment. Add GOBUILDMODE to support it which make PIE executables the default build mode, as PIE executables are required as of Yocto But mips doesn't support -buildmode=pie, so skip the QA checking for mips and its variants Signed-off-by: Hongxu Jia --- meta/recipes-devtools/go/go-1.11.inc | 1 + .../0008-use-GOBUILDMODE-to-set-buildmode.patch| 40 ++ meta/recipes-devtools/go/go-1.9.inc| 1 + .../0011-use-GOBUILDMODE-to-set-buildmode.patch| 40 ++ meta/recipes-devtools/go/go_1.11.bb| 12 +++ meta/recipes-devtools/go/go_1.9.bb | 16 + 6 files changed, 104 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch create mode 100644 meta/recipes-devtools/go/go-1.9/0011-use-GOBUILDMODE-to-set-buildmode.patch diff --git a/meta/recipes-devtools/go/go-1.11.inc b/meta/recipes-devtools/go/go-1.11.inc index c02e468..d626514 100644 --- a/meta/recipes-devtools/go/go-1.11.inc +++ b/meta/recipes-devtools/go/go-1.11.inc @@ -15,6 +15,7 @@ SRC_URI += "\ file://0005-make.bash-override-CC-when-building-dist-and-go_boot.patch \ file://0006-cmd-dist-separate-host-and-target-builds.patch \ file://0007-cmd-go-make-GOROOT-precious-by-default.patch \ +file://0008-use-GOBUILDMODE-to-set-buildmode.patch \ " SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" diff --git a/meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch b/meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch new file mode 100644 index 000..88986dc --- /dev/null +++ b/meta/recipes-devtools/go/go-1.11/0008-use-GOBUILDMODE-to-set-buildmode.patch @@ -0,0 +1,40 @@ +From 0e0c247f0caec23528889ff09d98348cba9028f1 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Fri, 26 Oct 2018 15:02:32 +0800 +Subject: [PATCH] use GOBUILDMODE to set buildmode + +While building go itself, the go build system does not support +to set `-buildmode=pie' from environment. + +Add GOBUILDMODE to support it which make PIE executables the default +build mode, as PIE executables are required as of Yocto + +Refers: https://groups.google.com/forum/#!topic/golang-dev/gRCe5URKewI +Upstream-Status: Deny [upstream choose antoher solution: `17a256b +cmd/go: -buildmode=pie for android/arm'] + +Signed-off-by: Hongxu Jia +--- + src/cmd/go/internal/work/build.go | 6 +- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go +index 145b875..595d703 100644 +--- a/src/cmd/go/internal/work/build.go b/src/cmd/go/internal/work/build.go +@@ -218,7 +218,11 @@ func AddBuildFlags(cmd *base.Command) { + + cmd.Flag.Var(, "asmflags", "") + cmd.Flag.Var(buildCompiler{}, "compiler", "") +- cmd.Flag.StringVar(, "buildmode", "default", "") ++ if bm := os.Getenv("GOBUILDMODE"); bm != "" { ++ cmd.Flag.StringVar(, "buildmode", bm, "") ++ } else { ++ cmd.Flag.StringVar(, "buildmode", "default", "") ++ } + cmd.Flag.Var(, "gcflags", "") + cmd.Flag.Var(, "gccgoflags", "") + cmd.Flag.StringVar(, "mod", "", "") +-- +2.7.4 + diff --git a/meta/recipes-devtools/go/go-1.9.inc b/meta/recipes-devtools/go/go-1.9.inc index 329cee0..ba1eaa0 100644 --- a/meta/recipes-devtools/go/go-1.9.inc +++ b/meta/recipes-devtools/go/go-1.9.inc @@ -19,6 +19,7 @@ SRC_URI += "\ file://0008-make.bash-add-GOHOSTxx-indirection-for-cross-canadia.patch \ file://0009-cmd-go-buildmode-pie-forces-external-linking-mode-on.patch \ file://0010-make.bash-override-CC-when-building-dist-and-go_boot.patch \ +file://0011-use-GOBUILDMODE-to-set-buildmode.patch \ " SRC_URI_append_libc-musl = " file://set-external-linker.patch" diff --git a/meta/recipes-devtools/go/go-1.9/0011-use-GOBUILDMODE-to-set-buildmode.patch b/meta/recipes-devtools/go/go-1.9/0011-use-GOBUILDMODE-to-set-buildmode.patch new file mode 100644 index 000..e69ce06 --- /dev/null +++ b/meta/recipes-devtools/go/go-1.9/0011-use-GOBUILDMODE-to-set-buildmode.patch @@ -0,0 +1,40 @@ +From b928fafab1d9425aae9341806bd2f6178ba1da1f Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +Date: Fri, 26 Oct 2018 16:32:50 +0800 +Subject: [PATCH] use GOBUILDMODE to set buildmode + +While building go itself, the go build system does not support +to set `-buildmode=pie' from environment. + +Add GOBUILDMODE to support it which make PIE executables the default +build mode, as PIE executables are required as of Yocto + +Refers: https://groups.google.com/forum/#!topic/golang-dev/gRCe5URKewI +Upstream-Status: Deny [upstream choose antoher solution: `17a256b +cmd/go: -buildmode=pie for android/arm'] + +Signed-off-by:
Re: [OE-core] [meta-python][PATCHV2] Add recipes for django rest framework
Hi Joris, I think this patch should be sent to openembedded-de...@lists.openembedded.org Title should be "[oe][meta-python][PATCH] Add recipes for django rest framework" Best Regards, Chen Qi On 10/26/2018 03:54 PM, Joris Offouga wrote: For create a database with django Signed-off-by: Joris Offouga --- .../python/python-djangorestframework.inc| 16 .../python/python-djangorestframework_3.9.0.bb | 2 ++ .../python/python3-djangorestframework_3.9.0.bb | 2 ++ 3 files changed, 20 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python-djangorestframework.inc create mode 100644 meta-python/recipes-devtools/python/python-djangorestframework_3.9.0.bb create mode 100644 meta-python/recipes-devtools/python/python3-djangorestframework_3.9.0.bb diff --git a/meta-python/recipes-devtools/python/python-djangorestframework.inc b/meta-python/recipes-devtools/python/python-djangorestframework.inc new file mode 100644 index 000..8551a83 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-djangorestframework.inc @@ -0,0 +1,16 @@ +SUMMARY = "djangorestframework" +DESCRIPTION = "pip3 install djangorestframework" +HOMEPAGE = "https://pypi.python.org/pypi/djangorestframework; + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7879a5a716147a784f7e524c9cf103c1" + +SRC_URI[md5sum] = "0d481bf8dbb87bb927b46798edc1a9bd" +SRC_URI[sha256sum] = "607865b0bb1598b153793892101d881466bd5a991de12bd6229abb18b1c86136" +PYPI_PACKAGE = "djangorestframework" + +inherit pypi + +RDEPENDS_${PN} += "\ +${PYTHON_PN}-django \ +" \ No newline at end of file diff --git a/meta-python/recipes-devtools/python/python-djangorestframework_3.9.0.bb b/meta-python/recipes-devtools/python/python-djangorestframework_3.9.0.bb new file mode 100644 index 000..540d12d --- /dev/null +++ b/meta-python/recipes-devtools/python/python-djangorestframework_3.9.0.bb @@ -0,0 +1,2 @@ +require python-djangorestframework.inc +inherit setuptools \ No newline at end of file diff --git a/meta-python/recipes-devtools/python/python3-djangorestframework_3.9.0.bb b/meta-python/recipes-devtools/python/python3-djangorestframework_3.9.0.bb new file mode 100644 index 000..9ed6d17 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-djangorestframework_3.9.0.bb @@ -0,0 +1,2 @@ +require python-djangorestframework.inc +inherit setuptools3 \ No newline at end of file -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for Add recipes for django rest framework
== Series Details == Series: Add recipes for django rest framework Revision: 1 URL : https://patchwork.openembedded.org/series/14684/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch[meta-python,V2] Add recipes for django rest framework Issue Shortlog does not follow expected format [test_shortlog_format] Suggested fixCommit shortlog (first line of commit message) should follow the format ": " If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for Signed-off-by: Joris Offouga
== Series Details == Series: Signed-off-by: Joris Offouga Revision: 1 URL : https://patchwork.openembedded.org/series/14683/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch[meta-oe] Signed-off-by: Joris Offouga Issue Patch is missing Signed-off-by [test_signed_off_by_presence] Suggested fixSign off the patch (either manually or with "git commit --amend -s") If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-python][PATCHV2] Add recipes for django rest framework
For create a database with django Signed-off-by: Joris Offouga --- .../python/python-djangorestframework.inc| 16 .../python/python-djangorestframework_3.9.0.bb | 2 ++ .../python/python3-djangorestframework_3.9.0.bb | 2 ++ 3 files changed, 20 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python-djangorestframework.inc create mode 100644 meta-python/recipes-devtools/python/python-djangorestframework_3.9.0.bb create mode 100644 meta-python/recipes-devtools/python/python3-djangorestframework_3.9.0.bb diff --git a/meta-python/recipes-devtools/python/python-djangorestframework.inc b/meta-python/recipes-devtools/python/python-djangorestframework.inc new file mode 100644 index 000..8551a83 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-djangorestframework.inc @@ -0,0 +1,16 @@ +SUMMARY = "djangorestframework" +DESCRIPTION = "pip3 install djangorestframework" +HOMEPAGE = "https://pypi.python.org/pypi/djangorestframework; + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7879a5a716147a784f7e524c9cf103c1" + +SRC_URI[md5sum] = "0d481bf8dbb87bb927b46798edc1a9bd" +SRC_URI[sha256sum] = "607865b0bb1598b153793892101d881466bd5a991de12bd6229abb18b1c86136" +PYPI_PACKAGE = "djangorestframework" + +inherit pypi + +RDEPENDS_${PN} += "\ +${PYTHON_PN}-django \ +" \ No newline at end of file diff --git a/meta-python/recipes-devtools/python/python-djangorestframework_3.9.0.bb b/meta-python/recipes-devtools/python/python-djangorestframework_3.9.0.bb new file mode 100644 index 000..540d12d --- /dev/null +++ b/meta-python/recipes-devtools/python/python-djangorestframework_3.9.0.bb @@ -0,0 +1,2 @@ +require python-djangorestframework.inc +inherit setuptools \ No newline at end of file diff --git a/meta-python/recipes-devtools/python/python3-djangorestframework_3.9.0.bb b/meta-python/recipes-devtools/python/python3-djangorestframework_3.9.0.bb new file mode 100644 index 000..9ed6d17 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-djangorestframework_3.9.0.bb @@ -0,0 +1,2 @@ +require python-djangorestframework.inc +inherit setuptools3 \ No newline at end of file -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] sysklogd: add alternatives for klogd and syslogd
On Fri, 26 Oct 2018, Markus Lehtonen wrote: 'why would you want to have multiple, alternative syslog daemons on the system? Wouldn't a better fix be to move the syslogd and klogd symlinks to the busybox-syslog package? It doesn't seem to make much sense to have a syslogd binary on the system without an init script(?) The original problem really was related to managing init scripts with alternatives (and I think that problem still persists, and, it shouldn't be done). So, using alternatives for the binaries wouldn't cause any problems. The question is just why to do this, instead of "fixing" the (binary) package content so that existing rconflicts would handle it. Thank you, Markus. Please see ChenQi reply on the thread. I has already been fixed by Richard in the way you suggested. My problem was because similar fix was not present in meta-selinux busybox.bbappend ... meta-selinux practically has a copy of alternative handling for busybox because of SELinux labeling requirements and it was negating Richard's change. So it is sorted out now. Thanks, Victor Cheers, Markus On 26/10/2018, 7.55, "Victor Kamensky" wrote: Otherwise when used in presense of busybox that provides its own version of klogd and syslogd, image packaging complains that klogd exists and it is not syymbolic link. Failure happens only if image packaging script install sysklogd package first followed by installtion of busybox package. If during packaging reverse installtion order happens, busybox first followed by sysklogd, packaging succeed. Note this fix along with recently committed 55ba9dc1f8 sysklogd: Re-enable alternatives for syslogd.8 man page effectively reverts this commit 988aad01b2 sysklogd: don't use update-alternatives Signed-off-by: Victor Kamensky --- Hi Guys, Here is more details. Example of failure that I observe: update-alternatives: Error: not linking /home/wd8/oe/20181021/build/tmp-glibc/work/intel_corei7_64-oe-linux/kdevel-console-devel-image/1.0-r0/rootfs/sbin/klogd to /usr/lib/busybox/sbin/klogd since /home/wd8/oe/20181021/build/tmp-glibc/work/intel_corei7_64-oe-linux/kdevel-console-devel-image/1.0-r0/rootfs/sbin/klogd exists and is not a link Also 988aad01b2 says: > Using update-alternatives for managing init scripts has proved to be > problematic. And, sysklogd rconflicts with other syslog daemons so there > is no point in using update-alternatives from this perspective, either. I am not sure why "managing init scripts has proved to be problematic" and syslogd and klogd are not really init script per se, aren't they? Also klogd and syslogd actually come from busybox, not busybox-syslog as listed in sysklogd RCONFLICTS. Maybe it what has changed since 988aad01b2. busybox-syslog now contains only init script for syslog and its configuration. Adding Markus for further comments. meta/recipes-extended/sysklogd/sysklogd.inc | 5 + 1 file changed, 5 insertions(+) diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc index f151dd87f7..4393a39180 100644 --- a/meta/recipes-extended/sysklogd/sysklogd.inc +++ b/meta/recipes-extended/sysklogd/sysklogd.inc @@ -60,9 +60,14 @@ FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix} ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN} = "syslogd klogd" + ALTERNATIVE_${PN}-doc = "syslogd.8" ALTERNATIVE_LINK_NAME[syslogd.8] = "${mandir}/man8/syslogd.8" +ALTERNATIVE_LINK_NAME[syslogd] = "${base_sbindir}/syslogd" +ALTERNATIVE_LINK_NAME[klogd] = "${base_sbindir}/klogd" + pkg_prerm_${PN} () { if test "x$D" = "x"; then if test "$1" = "upgrade" -o "$1" = "remove"; then -- 2.17.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] udev-hwdb: fix postinstall scripts failures when multilib enabled
On 2018/10/24 上午5:17, richard.pur...@linuxfoundation.org wrote: On Tue, 2018-10-23 at 14:43 +0800, Kang Kai wrote: On 2018/10/22 下午11:11, Kang Kai wrote: On 2018/10/18 下午11:28, kai.k...@windriver.com wrote: From: Kai Kang When multilib is enabled and both udev-hwdb and ${MLPREFIX}udev- hwdb are installed to image, it fails to run one of their postinstall scripts that they both call ${base_bindir}/udevadm with same user mode qemu. Duplicate udevadm and add postinst-intercept update_udev_hwdb to fix the failures. Signed-off-by: Kai Kang --- meta/recipes-core/systemd/systemd_239.bb | 13 ++--- meta/recipes-core/udev/eudev_3.2.5.bb| 11 +-- scripts/postinst-intercepts/update_udev_hwdb | 6 ++ 3 files changed, 17 insertions(+), 13 deletions(-) create mode 100644 scripts/postinst-intercepts/update_udev_hwdb diff --git a/meta/recipes-core/systemd/systemd_239.bb b/meta/recipes-core/systemd/systemd_239.bb index 7ed932141d..44e972ebce 100644 --- a/meta/recipes-core/systemd/systemd_239.bb +++ b/meta/recipes-core/systemd/systemd_239.bb @@ -284,6 +284,10 @@ do_install() { chown polkitd:root ${D}${datadir}/polkit-1/rules.d fi fi + +# duplicate udevadm for postinst script +install -d ${D}${libexecdir} +ln ${D}${base_bindir}/udevadm ${D}${libexecdir}/${MLPREFIX}udevadm } @@ -542,6 +546,7 @@ FILES_udev += "${base_sbindir}/udevd \ ${systemd_unitdir}/system/*udev* \ ${systemd_unitdir}/system/*.wants/*udev* \ ${base_bindir}/udevadm \ + ${libexecdir}/${MLPREFIX}udevadm \ ${datadir}/bash-completion/completions/udevadm \ " @@ -580,13 +585,7 @@ pkg_prerm_${PN} () { PACKAGE_WRITE_DEPS += "qemu-native" pkg_postinst_udev-hwdb () { if test -n "$D"; then -if ${@bb.utils.contains('MACHINE_FEATURES', 'qemu- usermode', 'true','false', d)}; then -${@qemu_run_binary(d, '$D', '${base_bindir}/udevadm')} hwdb --update \ ---root $D -chown root:root $D${sysconfdir}/udev/hwdb.bin -else -$INTERCEPT_DIR/postinst_intercept delay_to_first_boot ${PKG} mlprefix=${MLPREFIX} -fi +$INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} else udevadm hwdb --update fi diff --git a/meta/recipes-core/udev/eudev_3.2.5.bb b/meta/recipes-core/udev/eudev_3.2.5.bb index efd62c6495..592dd8f22a 100644 --- a/meta/recipes-core/udev/eudev_3.2.5.bb +++ b/meta/recipes-core/udev/eudev_3.2.5.bb @@ -50,6 +50,10 @@ do_install_append() { # hid2hci has moved to bluez4. removed in udev as of version 169 rm -f ${D}${base_libdir}/udev/hid2hci + +# duplicate udevadm for postinst script +install -d ${D}${libexecdir} +ln ${D}${bindir}/udevadm ${D}${libexecdir}/${MLPREFIX}udevadm } do_install_prepend_class-target () { @@ -81,12 +85,7 @@ RPROVIDES_eudev-hwdb += "udev-hwdb" PACKAGE_WRITE_DEPS += "qemu-native" pkg_postinst_eudev-hwdb () { if test -n "$D"; then -if ${@bb.utils.contains('MACHINE_FEATURES', 'qemu- usermode', 'true','false', d)}; then Hi Richard, It seems check for 'qemu-usermode' should not be removed. And it also need to check for other intercept scripts. I just realize that intercept scripts have been handled well in lib/oe/package_manager.py. So please ignore my last reply. I'm now confused, which version of this patch do we need? Sorry for missing your comment and made you inconvenient. I received some inner comments that remove check 'qemu-usermode' may cause problem. I was convinced and it has been merged to master-next already, so I sent a reply that 'will send V2'. But after build without machine feature 'qemu-usermode', it turns out that the guardian of 'qemu-usermode' has been handled well by package_manager.py. Then I sent the last reply and not V2 patch sent. Regards, Kai Cheers, Richard -- Regards, Neil | Kai Kang -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH] Signed-off-by: Joris Offouga
Add recipes for django rest framework For create a database with django --- .../python/python-djangorestframework.inc| 16 .../python/python-djangorestframework_3.9.0.bb | 2 ++ .../python/python3-djangorestframework_3.9.0.bb | 2 ++ 3 files changed, 20 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python-djangorestframework.inc create mode 100644 meta-python/recipes-devtools/python/python-djangorestframework_3.9.0.bb create mode 100644 meta-python/recipes-devtools/python/python3-djangorestframework_3.9.0.bb diff --git a/meta-python/recipes-devtools/python/python-djangorestframework.inc b/meta-python/recipes-devtools/python/python-djangorestframework.inc new file mode 100644 index 000..8551a83 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-djangorestframework.inc @@ -0,0 +1,16 @@ +SUMMARY = "djangorestframework" +DESCRIPTION = "pip3 install djangorestframework" +HOMEPAGE = "https://pypi.python.org/pypi/djangorestframework; + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7879a5a716147a784f7e524c9cf103c1" + +SRC_URI[md5sum] = "0d481bf8dbb87bb927b46798edc1a9bd" +SRC_URI[sha256sum] = "607865b0bb1598b153793892101d881466bd5a991de12bd6229abb18b1c86136" +PYPI_PACKAGE = "djangorestframework" + +inherit pypi + +RDEPENDS_${PN} += "\ +${PYTHON_PN}-django \ +" \ No newline at end of file diff --git a/meta-python/recipes-devtools/python/python-djangorestframework_3.9.0.bb b/meta-python/recipes-devtools/python/python-djangorestframework_3.9.0.bb new file mode 100644 index 000..540d12d --- /dev/null +++ b/meta-python/recipes-devtools/python/python-djangorestframework_3.9.0.bb @@ -0,0 +1,2 @@ +require python-djangorestframework.inc +inherit setuptools \ No newline at end of file diff --git a/meta-python/recipes-devtools/python/python3-djangorestframework_3.9.0.bb b/meta-python/recipes-devtools/python/python3-djangorestframework_3.9.0.bb new file mode 100644 index 000..9ed6d17 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-djangorestframework_3.9.0.bb @@ -0,0 +1,2 @@ +require python-djangorestframework.inc +inherit setuptools3 \ No newline at end of file -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] sysklogd: add alternatives for klogd and syslogd
'why would you want to have multiple, alternative syslog daemons on the system? Wouldn't a better fix be to move the syslogd and klogd symlinks to the busybox-syslog package? It doesn't seem to make much sense to have a syslogd binary on the system without an init script(?) The original problem really was related to managing init scripts with alternatives (and I think that problem still persists, and, it shouldn't be done). So, using alternatives for the binaries wouldn't cause any problems. The question is just why to do this, instead of "fixing" the (binary) package content so that existing rconflicts would handle it. Cheers, Markus On 26/10/2018, 7.55, "Victor Kamensky" wrote: Otherwise when used in presense of busybox that provides its own version of klogd and syslogd, image packaging complains that klogd exists and it is not syymbolic link. Failure happens only if image packaging script install sysklogd package first followed by installtion of busybox package. If during packaging reverse installtion order happens, busybox first followed by sysklogd, packaging succeed. Note this fix along with recently committed 55ba9dc1f8 sysklogd: Re-enable alternatives for syslogd.8 man page effectively reverts this commit 988aad01b2 sysklogd: don't use update-alternatives Signed-off-by: Victor Kamensky --- Hi Guys, Here is more details. Example of failure that I observe: update-alternatives: Error: not linking /home/wd8/oe/20181021/build/tmp-glibc/work/intel_corei7_64-oe-linux/kdevel-console-devel-image/1.0-r0/rootfs/sbin/klogd to /usr/lib/busybox/sbin/klogd since /home/wd8/oe/20181021/build/tmp-glibc/work/intel_corei7_64-oe-linux/kdevel-console-devel-image/1.0-r0/rootfs/sbin/klogd exists and is not a link Also 988aad01b2 says: > Using update-alternatives for managing init scripts has proved to be > problematic. And, sysklogd rconflicts with other syslog daemons so there > is no point in using update-alternatives from this perspective, either. I am not sure why "managing init scripts has proved to be problematic" and syslogd and klogd are not really init script per se, aren't they? Also klogd and syslogd actually come from busybox, not busybox-syslog as listed in sysklogd RCONFLICTS. Maybe it what has changed since 988aad01b2. busybox-syslog now contains only init script for syslog and its configuration. Adding Markus for further comments. meta/recipes-extended/sysklogd/sysklogd.inc | 5 + 1 file changed, 5 insertions(+) diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc index f151dd87f7..4393a39180 100644 --- a/meta/recipes-extended/sysklogd/sysklogd.inc +++ b/meta/recipes-extended/sysklogd/sysklogd.inc @@ -60,9 +60,14 @@ FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix} ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN} = "syslogd klogd" + ALTERNATIVE_${PN}-doc = "syslogd.8" ALTERNATIVE_LINK_NAME[syslogd.8] = "${mandir}/man8/syslogd.8" +ALTERNATIVE_LINK_NAME[syslogd] = "${base_sbindir}/syslogd" +ALTERNATIVE_LINK_NAME[klogd] = "${base_sbindir}/klogd" + pkg_prerm_${PN} () { if test "x$D" = "x"; then if test "$1" = "upgrade" -o "$1" = "remove"; then -- 2.17.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] sysklogd: add alternatives for klogd and syslogd
Hi Chen, On Fri, 26 Oct 2018, ChenQi wrote: On 10/26/2018 12:53 PM, Victor Kamensky via Openembedded-core wrote: Otherwise when used in presense of busybox that provides its own version of klogd and syslogd, image packaging complains that klogd exists and it is not syymbolic link. Failure happens only if image packaging script install sysklogd package first followed by installtion of busybox package. Hi Victor, I think this problem has been fixed by the following commit. """ commit ef11c54ba99af261a70ec31091216cdd1556da24 Author: Richard Purdie Date: Wed Sep 5 17:39:31 2018 +0100 busybox: Put klogd/syslogd alternative links in syslog package Currently these are in ${PN} and ${PN}-syslog may get replaced by other packages but update-alternatives would error in the postinst if other files were installed first. Avoid the problems by putting the links in the correct package. Signed-off-by: Richard Purdie """ For the current status, the update-alternatives operations for syslogd and klogd should be in the busybox-syslog package, which conflicts with sysklogd package. Could you please help check this? Thank you! That helps. I see it now. Apprently busybox.bbappend from meta-selinux layer: http://git.yoctoproject.org/cgit/cgit.cgi/meta-selinux/tree/recipes-core/busybox/busybox_selinux.inc is effectively undoing effect of above commit in my workspace. meta-selinux is doing it because of http://git.yoctoproject.org/cgit/cgit.cgi/meta-selinux/commit/?id=521ca9c9cf370840e9f8c808a7955aa5da7c356e It seems changes similar to above Richard's commit needed to be applied there as well. After applying that to busybox_selinux.inc in meta-selinux my problem goes away. No need for proposed below patch. Thanks, Victor Best Regards, Chen Qi If during packaging reverse installtion order happens, busybox first followed by sysklogd, packaging succeed. Note this fix along with recently committed 55ba9dc1f8 sysklogd: Re-enable alternatives for syslogd.8 man page effectively reverts this commit 988aad01b2 sysklogd: don't use update-alternatives Signed-off-by: Victor Kamensky --- Hi Guys, Here is more details. Example of failure that I observe: update-alternatives: Error: not linking /home/wd8/oe/20181021/build/tmp-glibc/work/intel_corei7_64-oe-linux/kdevel-console-devel-image/1.0-r0/rootfs/sbin/klogd to /usr/lib/busybox/sbin/klogd since /home/wd8/oe/20181021/build/tmp-glibc/work/intel_corei7_64-oe-linux/kdevel-console-devel-image/1.0-r0/rootfs/sbin/klogd exists and is not a link Also 988aad01b2 says: Using update-alternatives for managing init scripts has proved to be problematic. And, sysklogd rconflicts with other syslog daemons so there is no point in using update-alternatives from this perspective, either. I am not sure why "managing init scripts has proved to be problematic" and syslogd and klogd are not really init script per se, aren't they? Also klogd and syslogd actually come from busybox, not busybox-syslog as listed in sysklogd RCONFLICTS. Maybe it what has changed since 988aad01b2. busybox-syslog now contains only init script for syslog and its configuration. Adding Markus for further comments. meta/recipes-extended/sysklogd/sysklogd.inc | 5 + 1 file changed, 5 insertions(+) diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc index f151dd87f7..4393a39180 100644 --- a/meta/recipes-extended/sysklogd/sysklogd.inc +++ b/meta/recipes-extended/sysklogd/sysklogd.inc @@ -60,9 +60,14 @@ FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix} ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE_${PN} = "syslogd klogd" + ALTERNATIVE_${PN}-doc = "syslogd.8" ALTERNATIVE_LINK_NAME[syslogd.8] = "${mandir}/man8/syslogd.8" +ALTERNATIVE_LINK_NAME[syslogd] = "${base_sbindir}/syslogd" +ALTERNATIVE_LINK_NAME[klogd] = "${base_sbindir}/klogd" + pkg_prerm_${PN} () { if test "x$D" = "x"; then if test "$1" = "upgrade" -o "$1" = "remove"; then -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core