* [PATCH 01/24] base.bbclass: Add buildcfg multilib values
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-26 9:51 ` Alexander Kanavin
2018-05-25 2:48 ` [PATCH 02/24] runqemu-extract-sdk: allow install debugfs on rootfs Robert Yang
` (23 subsequent siblings)
24 siblings, 1 reply; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
When displaying the buildcfg for the end user, add in processing
of the multilib variants. Only the items that are not the same as
the DEFAULTTUNE are displayed.
I.e.:
Build Configuration:
BB_VERSION = "1.19.0"
BUILD_SYS = "x86_64-linux"
NATIVELSBSTRING = "CentOS-6.4"
DISTRO_VERSION = "oe-core.0"
MACHINE = "qemux86-64"
DEFAULTTUNE = "x86-64"
TARGET_SYS = "x86_64-oe-linux"
TUNE_FEATURES = "m64"
TARGET_FPU = ""
lib32: DEFAULTTUNE = "x86"
lib32: TARGET_SYS = "i586-oe-linux"
lib32: TUNE_FEATURES = "m32"
meta = "master:1975f3d7bbeb184489a5d0a2e0de231f317d3e1b"
The order of the displayed elements was changed slightly to group the
host information together, as well as group the target information
together.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/classes/base.bbclass | 16 +++++++++++++++-
meta/conf/bitbake.conf | 2 +-
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 7c42cf9..fa5c24b 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -188,7 +188,7 @@ def get_layers_branch_rev(d):
return layers_branch_rev
-BUILDCFG_FUNCS ??= "buildcfg_vars get_layers_branch_rev buildcfg_neededvars"
+BUILDCFG_FUNCS ??= "buildcfg_vars buildcfg_multilibs get_layers_branch_rev buildcfg_neededvars"
BUILDCFG_FUNCS[type] = "list"
def buildcfg_vars(d):
@@ -198,6 +198,20 @@ def buildcfg_vars(d):
if value is not None:
yield '%-20s = "%s"' % (var, value)
+def buildcfg_multilibs(d):
+ variants = d.getVar("MULTILIB_VARIANTS", True) or ""
+ for variant in variants.split():
+ localdata = bb.data.createCopy(d)
+ overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + variant
+ localdata.setVar("OVERRIDES", overrides)
+ bb.data.update_data(localdata)
+ statusvars = oe.data.typed_value('BUILDCFG_VARS', d)
+ for var in statusvars:
+ origvalue = d.getVar(var, True)
+ variantvalue = localdata.getVar(var, True)
+ if origvalue is not None and variantvalue is not None and origvalue != variantvalue:
+ yield '%-7s %-17s = "%s"' % (variant + ":", var, variantvalue)
+
def buildcfg_neededvars(d):
needed_vars = oe.data.typed_value("BUILDCFG_NEEDEDVARS", d)
pesteruser = []
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 6ecf78b..73686ea 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -699,7 +699,7 @@ PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native"
# Pre-build configuration output
BUILDCFG_HEADER = "Build Configuration:"
-BUILDCFG_VARS = "BB_VERSION BUILD_SYS NATIVELSBSTRING TARGET_SYS MACHINE DISTRO DISTRO_VERSION TUNE_FEATURES TARGET_FPU"
+BUILDCFG_VARS = "BB_VERSION BUILD_SYS NATIVELSBSTRING DISTRO DISTRO_VERSION MACHINE DEFAULTTUNE TARGET_SYS TUNE_FEATURES TARGET_FPU"
BUILDCFG_VARS[type] = "list"
BUILDCFG_NEEDEDVARS = "TARGET_ARCH TARGET_OS"
BUILDCFG_NEEDEDVARS[type] = "list"
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* Re: [PATCH 01/24] base.bbclass: Add buildcfg multilib values
2018-05-25 2:48 ` [PATCH 01/24] base.bbclass: Add buildcfg multilib values Robert Yang
@ 2018-05-26 9:51 ` Alexander Kanavin
2018-05-28 3:24 ` Robert Yang
0 siblings, 1 reply; 40+ messages in thread
From: Alexander Kanavin @ 2018-05-26 9:51 UTC (permalink / raw)
To: Robert Yang, openembedded-core, Hatle, Mark G (Wind River), Burton, Ross
On 05/25/2018 05:48 AM, Robert Yang wrote:
> +def buildcfg_multilibs(d):
> + variants = d.getVar("MULTILIB_VARIANTS", True) or ""
> + for variant in variants.split():
> + localdata = bb.data.createCopy(d)
> + overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + variant
> + localdata.setVar("OVERRIDES", overrides)
> + bb.data.update_data(localdata)
> + statusvars = oe.data.typed_value('BUILDCFG_VARS', d)
> + for var in statusvars:
> + origvalue = d.getVar(var, True)
> + variantvalue = localdata.getVar(var, True)
> + if origvalue is not None and variantvalue is not None and origvalue != variantvalue:
> + yield '%-7s %-17s = "%s"' % (variant + ":", var, variantvalue)
> +
There are helper functions in utils.bbclass that take care of multilib
datastore setup, please use them instead of re-implementing what they
do. USe all_multlilib_tune_values() in particular.
Alex
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 01/24] base.bbclass: Add buildcfg multilib values
2018-05-26 9:51 ` Alexander Kanavin
@ 2018-05-28 3:24 ` Robert Yang
2018-05-28 5:23 ` Alexander Kanavin
0 siblings, 1 reply; 40+ messages in thread
From: Robert Yang @ 2018-05-28 3:24 UTC (permalink / raw)
To: Alexander Kanavin, openembedded-core, Hatle, Mark G (Wind River),
Burton, Ross
Hi Alexander,
On 05/26/2018 05:51 PM, Alexander Kanavin wrote:
> On 05/25/2018 05:48 AM, Robert Yang wrote:
>> +def buildcfg_multilibs(d):
>> + variants = d.getVar("MULTILIB_VARIANTS", True) or ""
>> + for variant in variants.split():
>> + localdata = bb.data.createCopy(d)
>> + overrides = localdata.getVar("OVERRIDES", False) +
>> ":virtclass-multilib-" + variant
>> + localdata.setVar("OVERRIDES", overrides)
>> + bb.data.update_data(localdata)
>> + statusvars = oe.data.typed_value('BUILDCFG_VARS', d)
>> + for var in statusvars:
>> + origvalue = d.getVar(var, True)
>> + variantvalue = localdata.getVar(var, True)
>> + if origvalue is not None and variantvalue is not None and
>> origvalue != variantvalue:
>> + yield '%-7s %-17s = "%s"' % (variant + ":", var, variantvalue)
>> +
>
> There are helper functions in utils.bbclass that take care of multilib datastore
> setup, please use them instead of re-implementing what they do. USe
> all_multlilib_tune_values() in particular.
Thanks for the reply, but I'm afraid that all_multlilib_tune_values() isn't
suitable for this case, what need to display is something like:
lib32: DEFAULTTUNE = "x86"
lib32: TARGET_SYS = "i686-pokymllib32-linux"
lib32: TUNE_FEATURES = "m32"
But all_multlilib_tune_values() returns all values, e.g:
DEFAULTTUNE = "core2-64 x86"
If there is only one multilib variant, it can work if we remove "core2-64" from
DEFAULTTUNE, then we will get "x86", but if there are multiple multilib
variants, e.g., lib32 and lib64, then
all_multlilib_tune_values(d, 'DEFAULTTUNE') is:
DEFAULTTUNE = "core2-64 x86 <foo>"
We don't know how to strip x86 for lib32, or <foo> for lib64. So I think that
the current implementation is a must.
// Robert
>
>
> Alex
>
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 01/24] base.bbclass: Add buildcfg multilib values
2018-05-28 3:24 ` Robert Yang
@ 2018-05-28 5:23 ` Alexander Kanavin
2018-05-28 6:56 ` Robert Yang
0 siblings, 1 reply; 40+ messages in thread
From: Alexander Kanavin @ 2018-05-28 5:23 UTC (permalink / raw)
To: Robert Yang; +Cc: openembedded-core
2018-05-28 6:24 GMT+03:00 Robert Yang <liezhi.yang@windriver.com>:
> Thanks for the reply, but I'm afraid that all_multlilib_tune_values() isn't
> suitable for this case, what need to display is something like:
>
> lib32: DEFAULTTUNE = "x86"
> lib32: TARGET_SYS = "i686-pokymllib32-linux"
> lib32: TUNE_FEATURES = "m32"
>
> But all_multlilib_tune_values() returns all values, e.g:
>
> DEFAULTTUNE = "core2-64 x86"
That's right, but you should still use get_multilib_datastore()
instead of setting up localdata manually
Alex
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 01/24] base.bbclass: Add buildcfg multilib values
2018-05-28 5:23 ` Alexander Kanavin
@ 2018-05-28 6:56 ` Robert Yang
0 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-28 6:56 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: openembedded-core
On 05/28/2018 01:23 PM, Alexander Kanavin wrote:
> 2018-05-28 6:24 GMT+03:00 Robert Yang <liezhi.yang@windriver.com>:
>
>> Thanks for the reply, but I'm afraid that all_multlilib_tune_values() isn't
>> suitable for this case, what need to display is something like:
>>
>> lib32: DEFAULTTUNE = "x86"
>> lib32: TARGET_SYS = "i686-pokymllib32-linux"
>> lib32: TUNE_FEATURES = "m32"
>>
>> But all_multlilib_tune_values() returns all values, e.g:
>>
>> DEFAULTTUNE = "core2-64 x86"
>
> That's right, but you should still use get_multilib_datastore()
> instead of setting up localdata manually
Thanks, make sense, updated in the repo:
+def buildcfg_multilibs(d):
+ variants = d.getVar("MULTILIB_VARIANTS", True) or ""
+ for variant in variants.split():
+ localdata = get_multilib_datastore(variant, d)
+ statusvars = oe.data.typed_value('BUILDCFG_VARS', d)
+ for var in statusvars:
+ origvalue = d.getVar(var, True)
+ variantvalue = localdata.getVar(var, True)
+ if origvalue and variantvalue and origvalue != variantvalue:
+ yield '%-7s %-17s = "%s"' % (variant + ":", var, variantvalue)
+
// Robert
>
> Alex
>
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 02/24] runqemu-extract-sdk: allow install debugfs on rootfs
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
2018-05-25 2:48 ` [PATCH 01/24] base.bbclass: Add buildcfg multilib values Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-28 17:14 ` Randy MacLeod
2018-05-25 2:48 ` [PATCH 03/24] initscripts: Avoid starting rpcbind daemon twice Robert Yang
` (22 subsequent siblings)
24 siblings, 1 reply; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
Usually, the debugfs' (-dbg.tar.*) work follow is:
1) Install regular rootfs to dir_foo
2) Install debugfs (-dbg.tar.*) to the same dir_foo
So we need allow install debugfs on rootfs.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
| 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--git a/scripts/runqemu-extract-sdk b/scripts/runqemu-extract-sdk
index 2a0dd50..f4286ef 100755
--- a/scripts/runqemu-extract-sdk
+++ b/scripts/runqemu-extract-sdk
@@ -76,7 +76,9 @@ fi
pseudo_state_dir="$SDK_ROOTFS_DIR/../$(basename "$SDK_ROOTFS_DIR").pseudo_state"
pseudo_state_dir="$(readlink -f $pseudo_state_dir)"
-if [ -e "$pseudo_state_dir" ]; then
+debug_image="`echo $ROOTFS_TARBALL | grep '\-dbg\.tar\.'`"
+
+if [ -e "$pseudo_state_dir" -a -z "$debug_image" ]; then
echo "Error: $pseudo_state_dir already exists!"
echo "Please delete the rootfs tree and pseudo directory manually"
echo "if this is really what you want."
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* Re: [PATCH 02/24] runqemu-extract-sdk: allow install debugfs on rootfs
2018-05-25 2:48 ` [PATCH 02/24] runqemu-extract-sdk: allow install debugfs on rootfs Robert Yang
@ 2018-05-28 17:14 ` Randy MacLeod
2018-05-29 1:39 ` Robert Yang
0 siblings, 1 reply; 40+ messages in thread
From: Randy MacLeod @ 2018-05-28 17:14 UTC (permalink / raw)
To: openembedded-core, Yang, Liezhi
On 05/24/2018 10:48 PM, Robert Yang wrote:
> Usually, the debugfs' (-dbg.tar.*) work follow is:
s/work follow/workflow/
> 1) Install regular rootfs to dir_foo
> 2) Install debugfs (-dbg.tar.*) to the same dir_foo
>
> So we need allow install debugfs on rootfs.
So we need to allow installing the debugfs on top of the rootfs.
or at least, I think that's what you mean.
../Randy
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
> scripts/runqemu-extract-sdk | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/runqemu-extract-sdk b/scripts/runqemu-extract-sdk
> index 2a0dd50..f4286ef 100755
> --- a/scripts/runqemu-extract-sdk
> +++ b/scripts/runqemu-extract-sdk
> @@ -76,7 +76,9 @@ fi
> pseudo_state_dir="$SDK_ROOTFS_DIR/../$(basename "$SDK_ROOTFS_DIR").pseudo_state"
> pseudo_state_dir="$(readlink -f $pseudo_state_dir)"
>
> -if [ -e "$pseudo_state_dir" ]; then
> +debug_image="`echo $ROOTFS_TARBALL | grep '\-dbg\.tar\.'`"
> +
> +if [ -e "$pseudo_state_dir" -a -z "$debug_image" ]; then
> echo "Error: $pseudo_state_dir already exists!"
> echo "Please delete the rootfs tree and pseudo directory manually"
> echo "if this is really what you want."
>
--
# Randy MacLeod
# Wind River Linux
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 02/24] runqemu-extract-sdk: allow install debugfs on rootfs
2018-05-28 17:14 ` Randy MacLeod
@ 2018-05-29 1:39 ` Robert Yang
2018-05-29 1:40 ` Robert Yang
0 siblings, 1 reply; 40+ messages in thread
From: Robert Yang @ 2018-05-29 1:39 UTC (permalink / raw)
To: Randy MacLeod, openembedded-core
On 05/29/2018 01:14 AM, Randy MacLeod wrote:
> On 05/24/2018 10:48 PM, Robert Yang wrote:
>> Usually, the debugfs' (-dbg.tar.*) work follow is:
> s/work follow/workflow/
>> 1) Install regular rootfs to dir_foo
>> 2) Install debugfs (-dbg.tar.*) to the same dir_foo
>>
>> So we need allow install debugfs on rootfs.
> So we need to allow installing the debugfs on top of the rootfs.
>
>
> or at least, I think that's what you mean.
Thanks, done.
// Robert
> ../Randy
>>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>> scripts/runqemu-extract-sdk | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/scripts/runqemu-extract-sdk b/scripts/runqemu-extract-sdk
>> index 2a0dd50..f4286ef 100755
>> --- a/scripts/runqemu-extract-sdk
>> +++ b/scripts/runqemu-extract-sdk
>> @@ -76,7 +76,9 @@ fi
>> pseudo_state_dir="$SDK_ROOTFS_DIR/../$(basename
>> "$SDK_ROOTFS_DIR").pseudo_state"
>> pseudo_state_dir="$(readlink -f $pseudo_state_dir)"
>> -if [ -e "$pseudo_state_dir" ]; then
>> +debug_image="`echo $ROOTFS_TARBALL | grep '\-dbg\.tar\.'`"
>> +
>> +if [ -e "$pseudo_state_dir" -a -z "$debug_image" ]; then
>> echo "Error: $pseudo_state_dir already exists!"
>> echo "Please delete the rootfs tree and pseudo directory manually"
>> echo "if this is really what you want."
>>
>
>
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 02/24] runqemu-extract-sdk: allow install debugfs on rootfs
2018-05-29 1:39 ` Robert Yang
@ 2018-05-29 1:40 ` Robert Yang
0 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-29 1:40 UTC (permalink / raw)
To: Randy MacLeod, openembedded-core
On 05/29/2018 09:39 AM, Robert Yang wrote:
>
>
> On 05/29/2018 01:14 AM, Randy MacLeod wrote:
>> On 05/24/2018 10:48 PM, Robert Yang wrote:
>>> Usually, the debugfs' (-dbg.tar.*) work follow is:
>> s/work follow/workflow/
>>> 1) Install regular rootfs to dir_foo
>>> 2) Install debugfs (-dbg.tar.*) to the same dir_foo
>>>
>>> So we need allow install debugfs on rootfs.
>> So we need to allow installing the debugfs on top of the rootfs.
>>
>>
>> or at least, I think that's what you mean.
>
> Thanks, done.
I meant updated in the repo:
git://git.openembedded.org/openembedded-core-contrib rbt/fix_from_wr
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/fix_from_wr
// Robert
>
> // Robert
>
>> ../Randy
>>>
>>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>>> ---
>>> scripts/runqemu-extract-sdk | 4 +++-
>>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/scripts/runqemu-extract-sdk b/scripts/runqemu-extract-sdk
>>> index 2a0dd50..f4286ef 100755
>>> --- a/scripts/runqemu-extract-sdk
>>> +++ b/scripts/runqemu-extract-sdk
>>> @@ -76,7 +76,9 @@ fi
>>> pseudo_state_dir="$SDK_ROOTFS_DIR/../$(basename
>>> "$SDK_ROOTFS_DIR").pseudo_state"
>>> pseudo_state_dir="$(readlink -f $pseudo_state_dir)"
>>> -if [ -e "$pseudo_state_dir" ]; then
>>> +debug_image="`echo $ROOTFS_TARBALL | grep '\-dbg\.tar\.'`"
>>> +
>>> +if [ -e "$pseudo_state_dir" -a -z "$debug_image" ]; then
>>> echo "Error: $pseudo_state_dir already exists!"
>>> echo "Please delete the rootfs tree and pseudo directory manually"
>>> echo "if this is really what you want."
>>>
>>
>>
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 03/24] initscripts: Avoid starting rpcbind daemon twice
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
2018-05-25 2:48 ` [PATCH 01/24] base.bbclass: Add buildcfg multilib values Robert Yang
2018-05-25 2:48 ` [PATCH 02/24] runqemu-extract-sdk: allow install debugfs on rootfs Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-25 2:48 ` [PATCH 04/24] lsof: fix LSOF_CCV in version.h Robert Yang
` (21 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
From: Yue Tao <Yue.Tao@windriver.com>
Check the status before start it to avoid duplicates.
Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
---
meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh b/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh
index fe6c196..be9f597 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh
@@ -67,9 +67,12 @@ if test "$rpcbind" = yes
then
if test -x /usr/sbin/rpcbind
then
- echo -n "Starting rpcbind... "
- start-stop-daemon --start --quiet --exec /usr/sbin/rpcbind
- sleep 2
+ service rpcbind status > /dev/null
+ if [ $? != 0 ]; then
+ echo -n "Starting rpcbind..."
+ start-stop-daemon --start --quiet --exec /usr/sbin/rpcbind
+ sleep 2
+ fi
fi
fi
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 04/24] lsof: fix LSOF_CCV in version.h
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
` (2 preceding siblings ...)
2018-05-25 2:48 ` [PATCH 03/24] initscripts: Avoid starting rpcbind daemon twice Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-25 2:48 ` [PATCH 05/24] shadow: fix pam configs for chpasswd, newusers Robert Yang
` (20 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
From: Jian Liu <jian.liu@windriver.com>
When using cross compiler to build the package "lsof" on a host,
the value of LSOF_CCV in version.h genegrated by the Makefile
is the version of the compiler on the host while it should be
the version of cross compiler.
On Ubuntu host before fixed:
#define LSOF_CCV "4.6.3 (Ubuntu/Linaro 4.6.3-1ubuntu5) "
After fixed:
#define LSOF_CCV "4.9.1 (GCC) "
Signed-off-by: Jian Liu <jian.liu@windriver.com>
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
.../files/Configure-fix-LSOF_CCV-assignment.patch | 31 ++++++++++++++++++++++
meta/recipes-extended/lsof/lsof_4.89.bb | 4 ++-
2 files changed, 34 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-extended/lsof/files/Configure-fix-LSOF_CCV-assignment.patch
diff --git a/meta/recipes-extended/lsof/files/Configure-fix-LSOF_CCV-assignment.patch b/meta/recipes-extended/lsof/files/Configure-fix-LSOF_CCV-assignment.patch
new file mode 100644
index 0000000..a182925
--- /dev/null
+++ b/meta/recipes-extended/lsof/files/Configure-fix-LSOF_CCV-assignment.patch
@@ -0,0 +1,31 @@
+From c197389c9d8ccdbfcfe1dc31da6b4ce69b90ecf6 Mon Sep 17 00:00:00 2001
+From: Wenzong Fan <wenzong.fan@windriver.com>
+Date: Thu, 23 Oct 2014 03:43:27 -0400
+Subject: [PATCH] Configure: fix LSOF_CCV assignment
+
+Allow to use specified LSOF_CC to get the version of linux compiler.
+
+Upstream-Status: Pending
+
+Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
+---
+ Configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Configure b/Configure
+index 29c1292..e5a199f 100755
+--- a/Configure
++++ b/Configure
+@@ -2705,8 +2705,8 @@ LOCKF_OWNER4
+ if test "X$LSOF_CC" = "X" # {
+ then
+ LSOF_CC=cc
+- LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
+ fi # }
++ LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
+ if test "X$LINUX_CONF_CC" = "X" # {
+ then
+ LINUX_CONF_CC=$LSOF_CC
+--
+1.7.9.5
+
diff --git a/meta/recipes-extended/lsof/lsof_4.89.bb b/meta/recipes-extended/lsof/lsof_4.89.bb
index 14546db..52b40dc 100644
--- a/meta/recipes-extended/lsof/lsof_4.89.bb
+++ b/meta/recipes-extended/lsof/lsof_4.89.bb
@@ -13,7 +13,8 @@ LIC_FILES_CHKSUM = "file://00README;beginline=645;endline=679;md5=964df275d26429
SRC_URI = "http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2 \
file://lsof-remove-host-information.patch \
- "
+ file://Configure-fix-LSOF_CCV-assignment.patch \
+"
SRC_URI[md5sum] = "1b9cd34f3fb86856a125abbf2be3a386"
SRC_URI[sha256sum] = "81ac2fc5fdc944793baf41a14002b6deb5a29096b387744e28f8c30a360a3718"
@@ -40,6 +41,7 @@ python do_unpack () {
export LSOF_INCLUDE = "${STAGING_INCDIR}"
do_configure () {
+ export LSOF_CC="${CC}"
export LSOF_AR="${AR} cr"
export LSOF_RANLIB="${RANLIB}"
if [ "x${GLIBCVERSION}" != "x" ]; then
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 05/24] shadow: fix pam configs for chpasswd, newusers
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
` (3 preceding siblings ...)
2018-05-25 2:48 ` [PATCH 04/24] lsof: fix LSOF_CCV in version.h Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-25 2:48 ` [PATCH 06/24] at: add libselinux to PACKAGECONFIG Robert Yang
` (19 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
From: Hu <yadi.hu@windriver.com>
Fix below errors while pam is enabled on target:
root@qemux86:~# newusers
newusers: PAM: Authentication failure
root@qemux86:~# chpasswd
chpasswd: PAM: Authentication failure
The configs copied from "chgpasswd" which command works with pam.
Signed-off-by: Hu <yadi.hu@windriver.com>
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
meta/recipes-extended/shadow/files/pam.d/chpasswd | 2 ++
meta/recipes-extended/shadow/files/pam.d/newusers | 2 ++
2 files changed, 4 insertions(+)
diff --git a/meta/recipes-extended/shadow/files/pam.d/chpasswd b/meta/recipes-extended/shadow/files/pam.d/chpasswd
index 9e3efa6..b769d92 100644
--- a/meta/recipes-extended/shadow/files/pam.d/chpasswd
+++ b/meta/recipes-extended/shadow/files/pam.d/chpasswd
@@ -1,4 +1,6 @@
# The PAM configuration file for the Shadow 'chpasswd' service
#
+auth sufficient pam_rootok.so
+account required pam_permit.so
password include common-password
diff --git a/meta/recipes-extended/shadow/files/pam.d/newusers b/meta/recipes-extended/shadow/files/pam.d/newusers
index 4aa3dde..4c59dfa 100644
--- a/meta/recipes-extended/shadow/files/pam.d/newusers
+++ b/meta/recipes-extended/shadow/files/pam.d/newusers
@@ -1,4 +1,6 @@
# The PAM configuration file for the Shadow 'newusers' service
#
+auth sufficient pam_rootok.so
+account required pam_permit.so
password include common-password
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 06/24] at: add libselinux to PACKAGECONFIG
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
` (4 preceding siblings ...)
2018-05-25 2:48 ` [PATCH 05/24] shadow: fix pam configs for chpasswd, newusers Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-29 22:01 ` Andre McCurdy
2018-05-25 2:48 ` [PATCH 07/24] busybox: handle syslog Robert Yang
` (18 subsequent siblings)
24 siblings, 1 reply; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
From: Mingli Yu <mingli.yu@windriver.com>
* add libselinux to PACKAGECONFIG for at
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-extended/at/at_3.1.20.bb | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/meta/recipes-extended/at/at_3.1.20.bb b/meta/recipes-extended/at/at_3.1.20.bb
index 8fe3b43..b76e83d 100644
--- a/meta/recipes-extended/at/at_3.1.20.bb
+++ b/meta/recipes-extended/at/at_3.1.20.bb
@@ -8,6 +8,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4"
DEPENDS = "flex flex-native bison-native \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
+PACKAGECONFIG ?= "\
+ ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
+"
+
+PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux,"
+
RDEPENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)} \
"
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* Re: [PATCH 06/24] at: add libselinux to PACKAGECONFIG
2018-05-25 2:48 ` [PATCH 06/24] at: add libselinux to PACKAGECONFIG Robert Yang
@ 2018-05-29 22:01 ` Andre McCurdy
2018-05-30 8:48 ` Robert Yang
0 siblings, 1 reply; 40+ messages in thread
From: Andre McCurdy @ 2018-05-29 22:01 UTC (permalink / raw)
To: Robert Yang; +Cc: OE Core mailing list
On Thu, May 24, 2018 at 7:48 PM, Robert Yang <liezhi.yang@windriver.com> wrote:
> From: Mingli Yu <mingli.yu@windriver.com>
>
> * add libselinux to PACKAGECONFIG for at
>
> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
> meta/recipes-extended/at/at_3.1.20.bb | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/meta/recipes-extended/at/at_3.1.20.bb b/meta/recipes-extended/at/at_3.1.20.bb
> index 8fe3b43..b76e83d 100644
> --- a/meta/recipes-extended/at/at_3.1.20.bb
> +++ b/meta/recipes-extended/at/at_3.1.20.bb
> @@ -8,6 +8,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4"
> DEPENDS = "flex flex-native bison-native \
> ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
>
> +PACKAGECONFIG ?= "\
> + ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
The "new way" to do this would be:
${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}
> +"
> +
> +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux,"
> +
> RDEPENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)} \
> "
>
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 06/24] at: add libselinux to PACKAGECONFIG
2018-05-29 22:01 ` Andre McCurdy
@ 2018-05-30 8:48 ` Robert Yang
0 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-30 8:48 UTC (permalink / raw)
To: Andre McCurdy; +Cc: OE Core mailing list
On 05/30/2018 06:01 AM, Andre McCurdy wrote:
> On Thu, May 24, 2018 at 7:48 PM, Robert Yang <liezhi.yang@windriver.com> wrote:
>> From: Mingli Yu <mingli.yu@windriver.com>
>>
>> * add libselinux to PACKAGECONFIG for at
>>
>> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>> meta/recipes-extended/at/at_3.1.20.bb | 6 ++++++
>> 1 file changed, 6 insertions(+)
>>
>> diff --git a/meta/recipes-extended/at/at_3.1.20.bb b/meta/recipes-extended/at/at_3.1.20.bb
>> index 8fe3b43..b76e83d 100644
>> --- a/meta/recipes-extended/at/at_3.1.20.bb
>> +++ b/meta/recipes-extended/at/at_3.1.20.bb
>> @@ -8,6 +8,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4"
>> DEPENDS = "flex flex-native bison-native \
>> ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
>>
>> +PACKAGECONFIG ?= "\
>> + ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
>
> The "new way" to do this would be:
>
> ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}
Thanks, good to know that, the patch has been merged, I'm leaning to keep it
as the current status since it has no side effect.
// Robert
>
>> +"
>> +
>> +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux,"
>> +
>> RDEPENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)} \
>> "
>>
>> --
>> 2.7.4
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 07/24] busybox: handle syslog
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
` (5 preceding siblings ...)
2018-05-25 2:48 ` [PATCH 06/24] at: add libselinux to PACKAGECONFIG Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-25 2:48 ` [PATCH 08/24] gawk: fix command location in ptest script Robert Yang
` (17 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
From: "Yadi.hu" <yadi.hu@windriver.com>
If CONFIG_KLOGD is not enabled, then the related service file should
not be installed, The error message is below:
Cannot add dependency job for unit busybox-klogd.service,
ignoring: Unit busybox-klogd.service failed to load:
No such file or directory.
So we should first check the configuration before we install these
service files.
Signed-off-by: Yadi.hu <yadi.hu@windriver.com>
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
meta/recipes-core/busybox/busybox.inc | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index d1675c3..8c6dbba 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -315,20 +315,24 @@ do_install () {
fi
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ if grep -q "CONFIG_KLOGD=y" ${B}/.config; then
+ install -d ${D}${systemd_unitdir}/system
+ sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \
+ > ${D}${systemd_unitdir}/system/busybox-klogd.service
+ fi
+
if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then
install -d ${D}${systemd_unitdir}/system
sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \
> ${D}${systemd_unitdir}/system/busybox-syslog.service
+ if [ ! -e ${D}${systemd_unitdir}/system/busybox-klogd.service ] ; then
+ sed -i '/klog/d' ${D}${systemd_unitdir}/system/busybox-syslog.service
+ fi
if [ -f ${WORKDIR}/busybox-syslog.default ] ; then
install -d ${D}${sysconfdir}/default
install -m 0644 ${WORKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog
fi
fi
- if grep -q "CONFIG_KLOGD=y" ${B}/.config; then
- install -d ${D}${systemd_unitdir}/system
- sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \
- > ${D}${systemd_unitdir}/system/busybox-klogd.service
- fi
fi
# Remove the sysvinit specific configuration file for systemd systems to avoid confusion
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 08/24] gawk: fix command location in ptest script
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
` (6 preceding siblings ...)
2018-05-25 2:48 ` [PATCH 07/24] busybox: handle syslog Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-25 2:48 ` [PATCH 09/24] xinetd: add Init Script Actions to xinetd script Robert Yang
` (16 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
From: Li Wang <li.wang@windriver.com>
* Correct the command location in ptest scripts such as
update the line "#!/bin/awk -f" to "#!/usr/bin/awk -f" in the
file /usr/lib64/gawk/ptest/test/fcall_exit2.awk belongs
to package gawk-ptest and the line "#!/usr/local/bin/gawk -f"
to "#!/usr/bin/gawk -f" in the file
/usr/lib64/gawk/ptest/test/fnarydel.awk
Signed-off-by: Li Wang <li.wang@windriver.com>
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
---
meta/recipes-extended/gawk/gawk_4.2.1.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-extended/gawk/gawk_4.2.1.bb b/meta/recipes-extended/gawk/gawk_4.2.1.bb
index 6b99357..9663752 100644
--- a/meta/recipes-extended/gawk/gawk_4.2.1.bb
+++ b/meta/recipes-extended/gawk/gawk_4.2.1.bb
@@ -43,6 +43,8 @@ do_install_ptest() {
for i in `grep -vE "@|^$|#|Gt-dummy" ${S}/test/Maketests |awk -F: '{print $1}'` Maketests inclib.awk; \
do cp ${S}/test/$i* ${D}${PTEST_PATH}/test; \
done
+ sed -i -e 's|/usr/local/bin|${bindir}|g' \
+ -e 's|#!${base_bindir}/awk|#!${bindir}/awk|g' ${D}${PTEST_PATH}/test/*.awk
}
BBCLASSEXTEND = "native nativesdk"
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 09/24] xinetd: add Init Script Actions to xinetd script
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
` (7 preceding siblings ...)
2018-05-25 2:48 ` [PATCH 08/24] gawk: fix command location in ptest script Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-25 2:48 ` [PATCH 10/24] dbus: update build options when enable ptest Robert Yang
` (15 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
From: Shan Hai <shan.hai@windriver.com>
The chkconfig fails to list the xinetd service because the xinetd
lacks Init Script Actions in it, add the actions to fix it.
Signed-off-by: Shan Hai <shan.hai@windriver.com>
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
---
meta/recipes-extended/xinetd/xinetd/xinetd.init | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/xinetd/xinetd/xinetd.init b/meta/recipes-extended/xinetd/xinetd/xinetd.init
index 777c2c8..a021410 100644
--- a/meta/recipes-extended/xinetd/xinetd/xinetd.init
+++ b/meta/recipes-extended/xinetd/xinetd/xinetd.init
@@ -1,5 +1,15 @@
#!/bin/sh
-#
+### BEGIN INIT INFO
+# Provides: inetd
+# Required-Start: $local_fs $remote_fs
+# Required-Stop: $local_fs $remote_fs
+# Should-Start: $syslog
+# Should-Stop: $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Start or stop the xinetd daemon.
+### END INIT INFO
+
# /etc/init.d/xinetd -- script to start and stop xinetd.
# Source function library.
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 10/24] dbus: update build options when enable ptest
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
` (8 preceding siblings ...)
2018-05-25 2:48 ` [PATCH 09/24] xinetd: add Init Script Actions to xinetd script Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-25 3:01 ` Robert Yang
2018-05-25 2:48 ` [PATCH 11/24] gcc-sanitizers: Fix libtool .la files Robert Yang
` (14 subsequent siblings)
24 siblings, 1 reply; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
From: Kai Kang <kai.kang@windriver.com>
It fails to run some dbus-ptest cases that some symbols cannot be found:
| ./test/test-bus: relocation error: ./test/test-bus: symbol
| _dbus_threads_init_debug, version LIBDBUS_PRIVATE_1.10.10 not defined
| in file libdbus-1.so.3 with link time reference
| FAIL: test/test-bus
These missing symbols are controlled by some macros. Update configure
options and compile macro to make the symbols visible to ptest cases.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
meta/recipes-core/dbus/dbus_1.12.8.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/dbus/dbus_1.12.8.bb b/meta/recipes-core/dbus/dbus_1.12.8.bb
index b3ddaaf..ff235f1 100644
--- a/meta/recipes-core/dbus/dbus_1.12.8.bb
+++ b/meta/recipes-core/dbus/dbus_1.12.8.bb
@@ -92,7 +92,7 @@ pkg_postinst_dbus() {
fi
}
-EXTRA_OECONF = "--disable-tests \
+EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '--enable-embedded-tests --enable-asserts --enable-verbose-mode', '--disable-tests', d)} \
--disable-xml-docs \
--disable-doxygen-docs \
--disable-libaudit \
@@ -102,6 +102,8 @@ EXTRA_OECONF = "--disable-tests \
EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl"
EXTRA_OECONF_append_class-native = " --disable-selinux"
+EXTRA_OEMAKE = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'CFLAG_VISIBILITY=-fvisibility=default', '', d)}"
+
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)}"
PACKAGECONFIG_class-native = ""
PACKAGECONFIG_class-nativesdk = ""
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* Re: [PATCH 10/24] dbus: update build options when enable ptest
2018-05-25 2:48 ` [PATCH 10/24] dbus: update build options when enable ptest Robert Yang
@ 2018-05-25 3:01 ` Robert Yang
0 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-25 3:01 UTC (permalink / raw)
To: openembedded-core
Qi said that this one can be covered by the fix:
commit 2d3e09949732ed48c8c9a328d9ab6ebbf6889b13
Author: Juro Bystricky <juro.bystricky@intel.com>
Date: Tue Feb 27 12:19:26 2018 -0800
dbus-test_1.12.2: various fixes
So I dropped it from the PULL.
// Robert
On 05/25/2018 10:48 AM, Robert Yang wrote:
> From: Kai Kang <kai.kang@windriver.com>
>
> It fails to run some dbus-ptest cases that some symbols cannot be found:
>
> | ./test/test-bus: relocation error: ./test/test-bus: symbol
> | _dbus_threads_init_debug, version LIBDBUS_PRIVATE_1.10.10 not defined
> | in file libdbus-1.so.3 with link time reference
> | FAIL: test/test-bus
>
> These missing symbols are controlled by some macros. Update configure
> options and compile macro to make the symbols visible to ptest cases.
>
> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ---
> meta/recipes-core/dbus/dbus_1.12.8.bb | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-core/dbus/dbus_1.12.8.bb b/meta/recipes-core/dbus/dbus_1.12.8.bb
> index b3ddaaf..ff235f1 100644
> --- a/meta/recipes-core/dbus/dbus_1.12.8.bb
> +++ b/meta/recipes-core/dbus/dbus_1.12.8.bb
> @@ -92,7 +92,7 @@ pkg_postinst_dbus() {
> fi
> }
>
> -EXTRA_OECONF = "--disable-tests \
> +EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '--enable-embedded-tests --enable-asserts --enable-verbose-mode', '--disable-tests', d)} \
> --disable-xml-docs \
> --disable-doxygen-docs \
> --disable-libaudit \
> @@ -102,6 +102,8 @@ EXTRA_OECONF = "--disable-tests \
> EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl"
> EXTRA_OECONF_append_class-native = " --disable-selinux"
>
> +EXTRA_OEMAKE = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'CFLAG_VISIBILITY=-fvisibility=default', '', d)}"
> +
> PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)}"
> PACKAGECONFIG_class-native = ""
> PACKAGECONFIG_class-nativesdk = ""
>
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 11/24] gcc-sanitizers: Fix libtool .la files
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
` (9 preceding siblings ...)
2018-05-25 2:48 ` [PATCH 10/24] dbus: update build options when enable ptest Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-29 17:32 ` Khem Raj
2018-05-25 2:48 ` [PATCH 12/24] oe/copy_buildsystem.py: add SDK_LAYERS_EXCLUDE_PATTERN Robert Yang
` (13 subsequent siblings)
24 siblings, 1 reply; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
From: Yuanjie Huang <yuanjie.huang@windriver.com>
Since libtool sysroot is not set when compiling sanitizers, the libtool
does no prefix the dependency path correctly. Fix it, so that programs
can link to sanitizer libraries without error.
Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-devtools/gcc/gcc-sanitizers.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers.inc b/meta/recipes-devtools/gcc/gcc-sanitizers.inc
index e5e8452..2373dd8 100644
--- a/meta/recipes-devtools/gcc/gcc-sanitizers.inc
+++ b/meta/recipes-devtools/gcc/gcc-sanitizers.inc
@@ -39,6 +39,8 @@ do_install () {
rmdir --ignore-fail-on-non-empty -p ${D}${infodir}
fi
chown -R root:root ${D}
+ # Fix broken libtool with stdc++, as sysroot is not set.
+ find ${D} -name \*.la -exec sed -i "/^dependency_libs=/s@'${libdir}'@=${libdir}@g" {} \;
}
INHIBIT_DEFAULT_DEPS = "1"
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* Re: [PATCH 11/24] gcc-sanitizers: Fix libtool .la files
2018-05-25 2:48 ` [PATCH 11/24] gcc-sanitizers: Fix libtool .la files Robert Yang
@ 2018-05-29 17:32 ` Khem Raj
0 siblings, 0 replies; 40+ messages in thread
From: Khem Raj @ 2018-05-29 17:32 UTC (permalink / raw)
To: Robert Yang; +Cc: Patches and discussions about the oe-core layer
this seems fine
On Thu, May 24, 2018 at 7:48 PM, Robert Yang <liezhi.yang@windriver.com> wrote:
> From: Yuanjie Huang <yuanjie.huang@windriver.com>
>
> Since libtool sysroot is not set when compiling sanitizers, the libtool
> does no prefix the dependency path correctly. Fix it, so that programs
> can link to sanitizer libraries without error.
>
> Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com>
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> ---
> meta/recipes-devtools/gcc/gcc-sanitizers.inc | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers.inc b/meta/recipes-devtools/gcc/gcc-sanitizers.inc
> index e5e8452..2373dd8 100644
> --- a/meta/recipes-devtools/gcc/gcc-sanitizers.inc
> +++ b/meta/recipes-devtools/gcc/gcc-sanitizers.inc
> @@ -39,6 +39,8 @@ do_install () {
> rmdir --ignore-fail-on-non-empty -p ${D}${infodir}
> fi
> chown -R root:root ${D}
> + # Fix broken libtool with stdc++, as sysroot is not set.
> + find ${D} -name \*.la -exec sed -i "/^dependency_libs=/s@'${libdir}'@=${libdir}@g" {} \;
> }
>
> INHIBIT_DEFAULT_DEPS = "1"
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 12/24] oe/copy_buildsystem.py: add SDK_LAYERS_EXCLUDE_PATTERN
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
` (10 preceding siblings ...)
2018-05-25 2:48 ` [PATCH 11/24] gcc-sanitizers: Fix libtool .la files Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-25 2:48 ` [PATCH 13/24] dbus-test: sync x11 configure options with dbus Robert Yang
` (12 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
It is helpful when exclude a lot of layers. It uses python re, and
supports multiple patterns (separated by space).
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/lib/oe/copy_buildsystem.py | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py
index 4b94806..c43c2bd 100644
--- a/meta/lib/oe/copy_buildsystem.py
+++ b/meta/lib/oe/copy_buildsystem.py
@@ -1,5 +1,12 @@
# This class should provide easy access to the different aspects of the
# buildsystem such as layers, bitbake location, etc.
+#
+# SDK_LAYERS_EXCLUDE: Layers which will be excluded from SDK layers.
+# SDK_LAYERS_EXCLUDE_PATTERN: The simiar to SDK_LAYERS_EXCLUDE, this supports
+# python regular expression, use space as separator,
+# e.g.: ".*-downloads closed-.*"
+#
+
import stat
import shutil
@@ -23,8 +30,10 @@ class BuildSystem(object):
self.context = context
self.layerdirs = [os.path.abspath(pth) for pth in d.getVar('BBLAYERS').split()]
self.layers_exclude = (d.getVar('SDK_LAYERS_EXCLUDE') or "").split()
+ self.layers_exclude_pattern = d.getVar('SDK_LAYERS_EXCLUDE_PATTERN')
def copy_bitbake_and_layers(self, destdir, workspace_name=None):
+ import re
# Copy in all metadata layers + bitbake (as repositories)
layers_copied = []
bb.utils.mkdirhier(destdir)
@@ -40,8 +49,17 @@ class BuildSystem(object):
# Exclude layers
for layer_exclude in self.layers_exclude:
if layer_exclude in layers:
+ bb.note('Excluded %s from sdk layers since it is in SDK_LAYERS_EXCLUDE' % layer_exclude)
layers.remove(layer_exclude)
+ if self.layers_exclude_pattern:
+ layers_cp = layers[:]
+ for pattern in self.layers_exclude_pattern.split():
+ for layer in layers_cp:
+ if re.match(pattern, layer):
+ bb.note('Excluded %s from sdk layers since matched SDK_LAYERS_EXCLUDE_PATTERN' % layer)
+ layers.remove(layer)
+
workspace_newname = workspace_name
if workspace_newname:
layernames = [os.path.basename(layer) for layer in layers]
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 13/24] dbus-test: sync x11 configure options with dbus
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
` (11 preceding siblings ...)
2018-05-25 2:48 ` [PATCH 12/24] oe/copy_buildsystem.py: add SDK_LAYERS_EXCLUDE_PATTERN Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-25 3:01 ` Robert Yang
2018-05-25 2:48 ` [PATCH 14/24] site/powerpc64-linux: add cvs_cv_func_printf_ptr Robert Yang
` (11 subsequent siblings)
24 siblings, 1 reply; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
From: Kai Kang <kai.kang@windriver.com>
Sync x11 related configure options with dbus and replace EXTRA_OECONF_X
with PACKAGECONFIG for dbus-test.
Remove configure for native as well that no such native package.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
meta/recipes-core/dbus/dbus-test_1.12.8.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/dbus/dbus-test_1.12.8.bb b/meta/recipes-core/dbus/dbus-test_1.12.8.bb
index f33fbaf..020a340 100644
--- a/meta/recipes-core/dbus/dbus-test_1.12.8.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.12.8.bb
@@ -25,8 +25,8 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
inherit autotools pkgconfig gettext ptest upstream-version-is-even
-EXTRA_OECONF_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
-EXTRA_OECONF_X_class-native = "--without-x"
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm"
EXTRA_OECONF = "--enable-tests \
--enable-modular-tests \
@@ -39,7 +39,7 @@ EXTRA_OECONF = "--enable-tests \
--disable-doxygen-docs \
--disable-libaudit \
--with-dbus-test-dir=${PTEST_PATH} \
- ${EXTRA_OECONF_X}"
+ "
EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl"
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* Re: [PATCH 13/24] dbus-test: sync x11 configure options with dbus
2018-05-25 2:48 ` [PATCH 13/24] dbus-test: sync x11 configure options with dbus Robert Yang
@ 2018-05-25 3:01 ` Robert Yang
0 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-25 3:01 UTC (permalink / raw)
To: openembedded-core
Qi said that this one can be covered by the fix:
commit 2d3e09949732ed48c8c9a328d9ab6ebbf6889b13
Author: Juro Bystricky <juro.bystricky@intel.com>
Date: Tue Feb 27 12:19:26 2018 -0800
dbus-test_1.12.2: various fixes
So I dropped it from the PULL.
// Robert
On 05/25/2018 10:48 AM, Robert Yang wrote:
> From: Kai Kang <kai.kang@windriver.com>
>
> Sync x11 related configure options with dbus and replace EXTRA_OECONF_X
> with PACKAGECONFIG for dbus-test.
>
> Remove configure for native as well that no such native package.
>
> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ---
> meta/recipes-core/dbus/dbus-test_1.12.8.bb | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-core/dbus/dbus-test_1.12.8.bb b/meta/recipes-core/dbus/dbus-test_1.12.8.bb
> index f33fbaf..020a340 100644
> --- a/meta/recipes-core/dbus/dbus-test_1.12.8.bb
> +++ b/meta/recipes-core/dbus/dbus-test_1.12.8.bb
> @@ -25,8 +25,8 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"
>
> inherit autotools pkgconfig gettext ptest upstream-version-is-even
>
> -EXTRA_OECONF_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
> -EXTRA_OECONF_X_class-native = "--without-x"
> +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
> +PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm"
>
> EXTRA_OECONF = "--enable-tests \
> --enable-modular-tests \
> @@ -39,7 +39,7 @@ EXTRA_OECONF = "--enable-tests \
> --disable-doxygen-docs \
> --disable-libaudit \
> --with-dbus-test-dir=${PTEST_PATH} \
> - ${EXTRA_OECONF_X}"
> + "
>
> EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl"
>
>
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 14/24] site/powerpc64-linux: add cvs_cv_func_printf_ptr
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
` (12 preceding siblings ...)
2018-05-25 2:48 ` [PATCH 13/24] dbus-test: sync x11 configure options with dbus Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-25 2:48 ` [PATCH 15/24] rootfs-postcommands: split ssh_allow_empty_password Robert Yang
` (10 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
Fixed when powerpc64:
$ bitbake <image> -ctestsdk
[snip]
checking whether printf supports %p... configure: error: cannot run test program while cross compiling
See `config.log' for more details.
test_cvs (oeqa.sdk.buildcvs.BuildCvsTest) ... FAIL
[snip]
The cvs_cv_func_printf_ptr is already in powerpc32-linux.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/site/powerpc64-linux | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/site/powerpc64-linux b/meta/site/powerpc64-linux
index d64e230..820a4b8 100644
--- a/meta/site/powerpc64-linux
+++ b/meta/site/powerpc64-linux
@@ -37,3 +37,5 @@ ac_cv_linux_vers=${ac_cv_linux_vers=2}
# apr
apr_cv_tcp_nodelay_with_cork=${apr_cv_tcp_nodelay_with_cork=yes}
+# cvs
+cvs_cv_func_printf_ptr=${cvs_cv_func_printf_ptr=yes}
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 15/24] rootfs-postcommands: split ssh_allow_empty_password
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
` (13 preceding siblings ...)
2018-05-25 2:48 ` [PATCH 14/24] site/powerpc64-linux: add cvs_cv_func_printf_ptr Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-25 2:48 ` [PATCH 16/24] dropbear: add default config file to disable root login Robert Yang
` (9 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
From: Jackie Huang <jackie.huang@windriver.com>
"allow root login" should not be bundled in ssh_allow_empty_password,
because some distro may want only one of "allow root login" and "allow
empty password", so split it out into ssh_allow_root_login and add new
imagefeature allow-root-login so they can be controlled separately,
debug-tweaks will still include both of them.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
meta/classes/image.bbclass | 2 +-
meta/classes/rootfs-postcommands.bbclass | 25 ++++++++++++++++++++++---
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 2247b30..28e64ba 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -23,7 +23,7 @@ inherit ${TESTIMAGECLASS}
# IMAGE_FEATURES may contain any available package group
IMAGE_FEATURES ?= ""
IMAGE_FEATURES[type] = "list"
-IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs empty-root-password allow-empty-password post-install-logging"
+IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs empty-root-password allow-empty-password allow-root-login post-install-logging"
# Generate companion debugfs?
IMAGE_GEN_DEBUGFS ?= "0"
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass
index 5522209..72cc6db 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -2,9 +2,12 @@
# Zap the root password if debug-tweaks feature is not enabled
ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'empty-root-password' ], "", "zap_empty_root_password ; ",d)}'
-# Allow dropbear/openssh to accept logins from accounts with an empty password string if debug-tweaks is enabled
+# Allow dropbear/openssh to accept logins from accounts with an empty password string if debug-tweaks or allow-empty-password is enabled
ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'allow-empty-password' ], "ssh_allow_empty_password; ", "",d)}'
+# Allow dropbear/openssh to accept root logins if debug-tweaks or allow-root-login is enabled
+ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'allow-root-login' ], "ssh_allow_root_login; ", "",d)}'
+
# Enable postinst logging if debug-tweaks is enabled
ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}'
@@ -146,12 +149,11 @@ zap_empty_root_password () {
}
#
-# allow dropbear/openssh to accept root logins and logins from accounts with an empty password string
+# allow dropbear/openssh to accept logins from accounts with an empty password string
#
ssh_allow_empty_password () {
for config in sshd_config sshd_config_readonly; do
if [ -e ${IMAGE_ROOTFS}${sysconfdir}/ssh/$config ]; then
- sed -i 's/^[#[:space:]]*PermitRootLogin.*/PermitRootLogin yes/' ${IMAGE_ROOTFS}${sysconfdir}/ssh/$config
sed -i 's/^[#[:space:]]*PermitEmptyPasswords.*/PermitEmptyPasswords yes/' ${IMAGE_ROOTFS}${sysconfdir}/ssh/$config
fi
done
@@ -174,6 +176,23 @@ ssh_allow_empty_password () {
fi
}
+#
+# allow dropbear/openssh to accept root logins
+#
+ssh_allow_root_login () {
+ for config in sshd_config sshd_config_readonly; do
+ if [ -e ${IMAGE_ROOTFS}${sysconfdir}/ssh/$config ]; then
+ sed -i 's/^[#[:space:]]*PermitRootLogin.*/PermitRootLogin yes/' ${IMAGE_ROOTFS}${sysconfdir}/ssh/$config
+ fi
+ done
+
+ if [ -e ${IMAGE_ROOTFS}${sbindir}/dropbear ] ; then
+ if grep -q DROPBEAR_EXTRA_ARGS ${IMAGE_ROOTFS}${sysconfdir}/default/dropbear 2>/dev/null ; then
+ sed -i '/^DROPBEAR_EXTRA_ARGS=/ s/-w//' ${IMAGE_ROOTFS}${sysconfdir}/default/dropbear
+ fi
+ fi
+}
+
ssh_disable_dns_lookup () {
if [ -e ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config ]; then
sed -i -e 's:#UseDNS yes:UseDNS no:' ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 16/24] dropbear: add default config file to disable root login
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
` (14 preceding siblings ...)
2018-05-25 2:48 ` [PATCH 15/24] rootfs-postcommands: split ssh_allow_empty_password Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-25 3:34 ` Andre McCurdy
2018-05-25 2:48 ` [PATCH 17/24] toolchain-scripts.bbclass: do not extend dependency if extended already Robert Yang
` (8 subsequent siblings)
24 siblings, 1 reply; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
From: Jackie Huang <jackie.huang@windriver.com>
root login is disabled by default for openssh and we can
enable it through IMAGE_FEATURES 'debug-tweaks' or
'allow-empty-password', so change to the same default
behavior for dropbear.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
meta/recipes-core/dropbear/dropbear.inc | 3 +++
meta/recipes-core/dropbear/dropbear/dropbear.default | 2 ++
2 files changed, 5 insertions(+)
create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear.default
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 16ac644..3c79be9 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -20,6 +20,7 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
file://dropbearkey.service \
file://dropbear@.service \
file://dropbear.socket \
+ file://dropbear.default \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} "
PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \
@@ -63,6 +64,8 @@ do_install() {
${D}${sbindir} \
${D}${localstatedir}
+ install -m 0755 ${WORKDIR}/dropbear.default ${D}${sysconfdir}/default/dropbear
+
install -m 0755 dropbearmulti ${D}${sbindir}/
ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient
diff --git a/meta/recipes-core/dropbear/dropbear/dropbear.default b/meta/recipes-core/dropbear/dropbear/dropbear.default
new file mode 100644
index 0000000..522453a
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear/dropbear.default
@@ -0,0 +1,2 @@
+# Disallow root logins by default
+DROPBEAR_EXTRA_ARGS="-w"
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* Re: [PATCH 16/24] dropbear: add default config file to disable root login
2018-05-25 2:48 ` [PATCH 16/24] dropbear: add default config file to disable root login Robert Yang
@ 2018-05-25 3:34 ` Andre McCurdy
2018-05-25 5:42 ` Robert Yang
0 siblings, 1 reply; 40+ messages in thread
From: Andre McCurdy @ 2018-05-25 3:34 UTC (permalink / raw)
To: Robert Yang; +Cc: OE Core mailing list
On Thu, May 24, 2018 at 7:48 PM, Robert Yang <liezhi.yang@windriver.com> wrote:
> From: Jackie Huang <jackie.huang@windriver.com>
>
> root login is disabled by default for openssh and we can
> enable it through IMAGE_FEATURES 'debug-tweaks' or
> 'allow-empty-password', so change to the same default
> behavior for dropbear.
>
> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> ---
> meta/recipes-core/dropbear/dropbear.inc | 3 +++
> meta/recipes-core/dropbear/dropbear/dropbear.default | 2 ++
> 2 files changed, 5 insertions(+)
> create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear.default
>
> diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
> index 16ac644..3c79be9 100644
> --- a/meta/recipes-core/dropbear/dropbear.inc
> +++ b/meta/recipes-core/dropbear/dropbear.inc
> @@ -20,6 +20,7 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
> file://dropbearkey.service \
> file://dropbear@.service \
> file://dropbear.socket \
> + file://dropbear.default \
> ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} "
>
> PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \
> @@ -63,6 +64,8 @@ do_install() {
> ${D}${sbindir} \
> ${D}${localstatedir}
>
> + install -m 0755 ${WORKDIR}/dropbear.default ${D}${sysconfdir}/default/dropbear
Files in /etc/default don't need to be executable.
> +
> install -m 0755 dropbearmulti ${D}${sbindir}/
> ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient
>
> diff --git a/meta/recipes-core/dropbear/dropbear/dropbear.default b/meta/recipes-core/dropbear/dropbear/dropbear.default
> new file mode 100644
> index 0000000..522453a
> --- /dev/null
> +++ b/meta/recipes-core/dropbear/dropbear/dropbear.default
> @@ -0,0 +1,2 @@
> +# Disallow root logins by default
> +DROPBEAR_EXTRA_ARGS="-w"
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 16/24] dropbear: add default config file to disable root login
2018-05-25 3:34 ` Andre McCurdy
@ 2018-05-25 5:42 ` Robert Yang
0 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-25 5:42 UTC (permalink / raw)
To: Andre McCurdy; +Cc: OE Core mailing list
On 05/25/2018 11:34 AM, Andre McCurdy wrote:
> On Thu, May 24, 2018 at 7:48 PM, Robert Yang <liezhi.yang@windriver.com> wrote:
>> From: Jackie Huang <jackie.huang@windriver.com>
>>
>> root login is disabled by default for openssh and we can
>> enable it through IMAGE_FEATURES 'debug-tweaks' or
>> 'allow-empty-password', so change to the same default
>> behavior for dropbear.
>>
>> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
>> ---
>> meta/recipes-core/dropbear/dropbear.inc | 3 +++
>> meta/recipes-core/dropbear/dropbear/dropbear.default | 2 ++
>> 2 files changed, 5 insertions(+)
>> create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear.default
>>
>> diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
>> index 16ac644..3c79be9 100644
>> --- a/meta/recipes-core/dropbear/dropbear.inc
>> +++ b/meta/recipes-core/dropbear/dropbear.inc
>> @@ -20,6 +20,7 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
>> file://dropbearkey.service \
>> file://dropbear@.service \
>> file://dropbear.socket \
>> + file://dropbear.default \
>> ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} "
>>
>> PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \
>> @@ -63,6 +64,8 @@ do_install() {
>> ${D}${sbindir} \
>> ${D}${localstatedir}
>>
>> + install -m 0755 ${WORKDIR}/dropbear.default ${D}${sysconfdir}/default/dropbear
>
> Files in /etc/default don't need to be executable.
Thanks, I updated it to 0644 in the repo:
install -m 0644 ${WORKDIR}/dropbear.default ${D}${sysconfdir}/default/dropbear
// Robert
>
>> +
>> install -m 0755 dropbearmulti ${D}${sbindir}/
>> ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient
>>
>> diff --git a/meta/recipes-core/dropbear/dropbear/dropbear.default b/meta/recipes-core/dropbear/dropbear/dropbear.default
>> new file mode 100644
>> index 0000000..522453a
>> --- /dev/null
>> +++ b/meta/recipes-core/dropbear/dropbear/dropbear.default
>> @@ -0,0 +1,2 @@
>> +# Disallow root logins by default
>> +DROPBEAR_EXTRA_ARGS="-w"
>> --
>> 2.7.4
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 17/24] toolchain-scripts.bbclass: do not extend dependency if extended already
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
` (15 preceding siblings ...)
2018-05-25 2:48 ` [PATCH 16/24] dropbear: add default config file to disable root login Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-25 2:48 ` [PATCH 18/24] shadow: update ownership and permission of /var/spool/mail Robert Yang
` (7 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
From: Kai Kang <kai.kang@windriver.com>
When set MULTILIBS with two or more items, such as for mips64:
MULTILIBS ?= "multilib:lib32 multilib:libn32"
It expands dependency once in mutlib.bbclass, and expand again in
toolchain-scripts.bbclass which causes error:
| ERROR: Nothing PROVIDES 'virtual/lib32-libn32-libc'. Close matches:
| virtual/libn32-libc
| virtual/lib32-libc
| virtual/libn32-librpc
| ERROR: Required build target 'libn32-meta-ide-support' has no buildable providers.
| Missing or unbuildable dependency chain was: ['libn32-meta-ide-support', 'virtual/lib32-libn32-libc']
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/classes/toolchain-scripts.bbclass | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 71da5e5..848bff4 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -170,7 +170,18 @@ python __anonymous () {
deps = ""
for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE') or "").split():
deps += " %s:do_populate_sysroot" % dep
- for variant in (d.getVar('MULTILIB_VARIANTS') or "").split():
+ ml_variants = (d.getVar('MULTILIB_VARIANTS') or "").split()
+
+ # don't extend if dep has been extended already
+ extended = False
+ for variant in ml_variants:
+ if dep.startswith(variant) or dep.startswith('virtual/' + variant):
+ extended = True
+ break
+ if extended:
+ continue
+
+ for variant in ml_variants:
clsextend = oe.classextend.ClassExtender(variant, d)
newdep = clsextend.extend_name(dep)
deps += " %s:do_populate_sysroot" % newdep
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 18/24] shadow: update ownership and permission of /var/spool/mail
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
` (16 preceding siblings ...)
2018-05-25 2:48 ` [PATCH 17/24] toolchain-scripts.bbclass: do not extend dependency if extended already Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-25 2:48 ` [PATCH 19/24] populate_sdk_ext.bbclass: add ESDK_MANIFEST_EXCLUDES Robert Yang
` (6 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
From: Kai Kang <kai.kang@windriver.com>
Update shadow to change ownership of /var/spool/mail from root:root to
root:mail and permission from 0755 to 0775 just as in most popular
distributions such as fedora and debian(It also set setgid bit in debian
but we don't need it).
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
meta/recipes-extended/shadow/shadow.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc
index 673207f..ca1facf 100644
--- a/meta/recipes-extended/shadow/shadow.inc
+++ b/meta/recipes-extended/shadow/shadow.inc
@@ -127,7 +127,8 @@ do_install_append() {
# Ensure that the image has as a /var/spool/mail dir so shadow can
# put mailboxes there if the user reconfigures shadow to its
# defaults (see sed below).
- install -d ${D}${localstatedir}/spool/mail
+ install -m 0775 -d ${D}${localstatedir}/spool/mail
+ chown root:mail ${D}${localstatedir}/spool/mail
if [ -e ${WORKDIR}/pam.d ]; then
install -d ${D}${sysconfdir}/pam.d/
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 19/24] populate_sdk_ext.bbclass: add ESDK_MANIFEST_EXCLUDES
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
` (17 preceding siblings ...)
2018-05-25 2:48 ` [PATCH 18/24] shadow: update ownership and permission of /var/spool/mail Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-25 2:48 ` [PATCH 20/24] init-install: add timeout for legacy grub Robert Yang
` (5 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
From: Chen Qi <Qi.Chen@windriver.com>
Add ESDK_MANIFEST_EXCLUDES to enable excluding items in sdk-conf-manifest.
By default, files under conf/ are all added to sdk-conf-manifest, as the
manifest file is set to 'conf/*'.
However, there are situations where some configuration files under conf/
directory are not intended to be added to sdk-conf-manifest, thus adding
ESDK_MANIFEST_EXCLUDES to enable users to do this.
This variable takes the form of glob matching.
e.g.
ESDK_MANIFEST_EXCLUDES = "conf/autogen*"
This would exclude all files under conf/ starting with 'autogen' from
sdk-conf-manifest.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
meta/classes/populate_sdk_ext.bbclass | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index e1bba49..017c4b6 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -484,12 +484,18 @@ python copy_buildsystem () {
# sdk_ext_postinst() below) thus the checksum we take here would always
# be different.
manifest_file_list = ['conf/*']
+ esdk_manifest_excludes = (d.getVar('ESDK_MANIFEST_EXCLUDES') or '').split()
+ esdk_manifest_excludes_list = []
+ for exclude_item in esdk_manifest_excludes:
+ esdk_manifest_excludes_list += glob.glob(os.path.join(baseoutpath, exclude_item))
manifest_file = os.path.join(baseoutpath, 'conf', 'sdk-conf-manifest')
with open(manifest_file, 'w') as f:
for item in manifest_file_list:
for fn in glob.glob(os.path.join(baseoutpath, item)):
if fn == manifest_file:
continue
+ if fn in esdk_manifest_excludes_list:
+ continue
chksum = bb.utils.sha256_file(fn)
f.write('%s\t%s\n' % (chksum, os.path.relpath(fn, baseoutpath)))
}
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 20/24] init-install: add timeout for legacy grub
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
` (18 preceding siblings ...)
2018-05-25 2:48 ` [PATCH 19/24] populate_sdk_ext.bbclass: add ESDK_MANIFEST_EXCLUDES Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-25 2:48 ` [PATCH 21/24] glibc: re-package for libnss-db Robert Yang
` (4 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
From: Catalin Enache <catalin.enache@windriver.com>
After installing an image from an iso, booting the system using
the legacy boots makes the grub prompt wait for an enter.
This is not desirable since many of this devices are embedded
devices that should start by them self without user entry.
Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
---
meta/recipes-core/initrdscripts/files/init-install.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
index 28e8f09..e715796 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -302,6 +302,8 @@ if [ -f /etc/grub.d/00_header -a $grub_version -ne 0 ] ; then
GRUBCFG="/boot/grub/grub.cfg"
mkdir -p $(dirname $GRUBCFG)
cat >$GRUBCFG <<_EOF
+timeout=5
+default=0
menuentry "Linux" {
search --no-floppy --fs-uuid $boot_uuid --set root
linux /$kernel root=PARTUUID=$root_part_uuid $rootwait rw $5 $3 $4 quiet
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 21/24] glibc: re-package for libnss-db
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
` (19 preceding siblings ...)
2018-05-25 2:48 ` [PATCH 20/24] init-install: add timeout for legacy grub Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-25 2:48 ` [PATCH 22/24] rpcbind: add option to make user able to use fixed port number Robert Yang
` (3 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
From: Jackie Huang <jackie.huang@windriver.com>
On other distros like ubuntu/centos, libnss-db usually provides:
- The libraries
- The Makefile to create database
(in /var/db for centos, /var/lib/misc/ for ubuntu)
- The makedb command (it's in glibc-common for centos7)
What we had is:
- The libraries are in glibc-extra-nss
- The Makefile is removed
- The makedb command is in glibc-utils (lack of dependency)
So when glibc-extra-nss is installed but glibc-utils is not,
we see error like:
nscd[165]: 165 checking for monitored file `/var/db/group.db': No such file or directory
nscd[165]: 165 checking for monitored file `/var/db/passwd.db': No such file or directory
And there is not an easy way to create these databases.
To fix the issue:
- Re-package the libraries into libnss-db
- Don't remove the Makefile and add it in libnss-db
- Add RDEPENDS for libnss-db on glibc-utils and make
Notes:
For external toolchain, an extra package 'libnss-db' need to be provided
If replacing glibc from core.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
meta/recipes-core/glibc/glibc-package.inc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index ae3f2f6..ad0c6d5 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -1,6 +1,6 @@
INHIBIT_SYSROOT_STRIP = "1"
-PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc"
+PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage libnss-db libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc"
# The ld.so in this glibc supports the GNU_HASH
RPROVIDES_${PN} = "eglibc rtld(GNU_HASH)"
@@ -23,6 +23,8 @@ FILES_ldd = "${bindir}/ldd"
FILES_libsegfault = "${base_libdir}/libSegFault*"
FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*"
FILES_libmemusage = "${base_libdir}/libmemusage.so"
+FILES_libnss-db = "${base_libdir}/libnss_db.so.* ${base_libdir}/libnss_db-*.so ${localstatedir}/db/Makefile"
+RDEPENDS_libnss-db = "${PN}-utils make"
FILES_glibc-extra-nss = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*"
FILES_sln = "${base_sbindir}/sln"
FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o"
@@ -59,7 +61,6 @@ inherit libc-common multilib_header
do_install_append () {
rm -f ${D}${sysconfdir}/localtime
- rm -rf ${D}${localstatedir}
# remove empty glibc dir
if [ -d ${D}${libexecdir} ]; then
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 22/24] rpcbind: add option to make user able to use fixed port number
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
` (20 preceding siblings ...)
2018-05-25 2:48 ` [PATCH 21/24] glibc: re-package for libnss-db Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-25 2:48 ` [PATCH 23/24] openssl-nativesdk: Fix "can't open config file" warning Robert Yang
` (2 subsequent siblings)
24 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
From: Li Wang <li.wang@windriver.com>
Add option "-p" to specify fixed port number
Signed-off-by: Li Wang <li.wang@windriver.com>
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
.../rpcbind_add_option_to_fix_port_number.patch | 130 +++++++++++++++++++++
meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb | 1 +
2 files changed, 131 insertions(+)
create mode 100644 meta/recipes-extended/rpcbind/rpcbind/rpcbind_add_option_to_fix_port_number.patch
diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind_add_option_to_fix_port_number.patch b/meta/recipes-extended/rpcbind/rpcbind/rpcbind_add_option_to_fix_port_number.patch
new file mode 100644
index 0000000..434b6b1
--- /dev/null
+++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind_add_option_to_fix_port_number.patch
@@ -0,0 +1,130 @@
+From 76f8598fd20727908e760cbb497dd6a17eda4af5 Mon Sep 17 00:00:00 2001
+From: Roy Li <rongqing.li@windriver.com>
+Date: Wed, 17 Sep 2014 13:22:14 +0800
+Subject: [PATCH] add option to make users able to use fixed port number
+
+Upstream-Status: Submitted [https://sourceforge.net/p/rpcbind/discussion/716839/thread/32af721d/]
+
+Signed-off-by: Li Wang <li.wang@windriver.com>
+Signed-off-by: Roy Li <rongqing.li@windriver.com>
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ man/rpcbind.8 | 4 +++-
+ src/rpcb_svc_com.c | 17 +++++++++++++++++
+ src/rpcbind.c | 8 ++++++--
+ 3 files changed, 26 insertions(+), 3 deletions(-)
+
+diff --git a/man/rpcbind.8 b/man/rpcbind.8
+index af6200f..2e6146b 100644
+--- a/man/rpcbind.8
++++ b/man/rpcbind.8
+@@ -11,7 +11,7 @@
+ .Nd universal addresses to RPC program number mapper
+ .Sh SYNOPSIS
+ .Nm
+-.Op Fl adhiLls
++.Op Fl adhpiLls
+ .Sh DESCRIPTION
+ The
+ .Nm
+@@ -107,6 +107,8 @@ will automatically add
+ and if IPv6 is enabled,
+ .Li ::1
+ to the list.
++.It Fl p
++Bind for fixed UDP port number
+ .It Fl i
+ .Dq Insecure
+ mode.
+diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
+index 8aef9e5..c2632a4 100644
+--- a/src/rpcb_svc_com.c
++++ b/src/rpcb_svc_com.c
+@@ -48,6 +48,7 @@
+ #include <rpc/rpc.h>
+ #include <rpc/rpcb_prot.h>
+ #include <rpc/svc_dg.h>
++#include <rpc/rpc_com.h>
+ #include <netconfig.h>
+ #include <errno.h>
+ #include <syslog.h>
+@@ -497,6 +498,7 @@ xdr_opaque_parms(XDR *xdrs, struct r_rmtcall_args *cap)
+
+ static struct rmtcallfd_list *rmthead;
+ static struct rmtcallfd_list *rmttail;
++extern unsigned short fixed_port;
+
+ int
+ create_rmtcall_fd(struct netconfig *nconf)
+@@ -504,6 +506,8 @@ create_rmtcall_fd(struct netconfig *nconf)
+ int fd;
+ struct rmtcallfd_list *rmt;
+ SVCXPRT *xprt;
++ struct __rpc_sockinfo si;
++ struct t_bind taddr;
+
+ if ((fd = __rpc_nconf2fd(nconf)) == -1) {
+ if (debugging)
+@@ -512,6 +516,19 @@ create_rmtcall_fd(struct netconfig *nconf)
+ nconf->nc_device, errno);
+ return (-1);
+ }
++
++ if (fixed_port) {
++ __rpc_fd2sockinfo(fd, &si);
++ memset(&taddr, 0, sizeof(taddr));
++ taddr.addr.maxlen = taddr.addr.len = si.si_alen;
++ taddr.addr.buf = malloc(si.si_alen);
++ if (taddr.addr.buf == NULL) {
++ return -1;
++ }
++ *(unsigned short *)(&(taddr.addr.buf[0])) = si.si_af;
++ *(unsigned short *)(&(taddr.addr.buf[2])) = htons(fixed_port);
++ xprt = svc_tli_create(fd, nconf, &taddr, RPC_MAXDATASIZE, RPC_MAXDATASIZE);
++ } else
+ xprt = svc_tli_create(fd, 0, (struct t_bind *) 0, 0, 0);
+ if (xprt == NULL) {
+ if (debugging)
+diff --git a/src/rpcbind.c b/src/rpcbind.c
+index 137011b..dc3d2d6 100644
+--- a/src/rpcbind.c
++++ b/src/rpcbind.c
+@@ -111,6 +111,7 @@ int runasdaemon = 0;
+ int insecure = 0;
+ int oldstyle_local = 0;
+ int verboselog = 0;
++unsigned short fixed_port = 0;
+
+ char **hosts = NULL;
+ int nhosts = 0;
+@@ -869,7 +870,7 @@ parseargs(int argc, char *argv[])
+ {
+ int c;
+ oldstyle_local = 1;
+- while ((c = getopt(argc, argv, "adh:ilswf")) != -1) {
++ while ((c = getopt(argc, argv, "adh:p:ilswf")) != -1) {
+ switch (c) {
+ case 'a':
+ doabort = 1; /* when debugging, do an abort on */
+@@ -887,6 +888,9 @@ parseargs(int argc, char *argv[])
+ if (hosts[nhosts - 1] == NULL)
+ errx(1, "Out of memory");
+ break;
++ case 'p':
++ fixed_port = atoi(optarg);
++ break;
+ case 'i':
+ insecure = 1;
+ break;
+@@ -905,7 +909,7 @@ parseargs(int argc, char *argv[])
+ break;
+ #endif
+ default: /* error */
+- fprintf(stderr, "usage: rpcbind [-adhilswf]\n");
++ fprintf(stderr, "usage: rpcbind [-adhpilswf]\n");
+ exit (1);
+ }
+ }
+--
+1.9.1
+
diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb
index dcdee6c..3c6774c 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb
@@ -18,6 +18,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
file://0001-rpcbind-pair-all-svc_getargs-calls-with-svc_freeargs.patch \
file://pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch \
file://rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch \
+ file://rpcbind_add_option_to_fix_port_number.patch \
"
SRC_URI[md5sum] = "cf10cd41ed8228fc54c316191c1f07fe"
SRC_URI[sha256sum] = "074a9a530dc7c11e0d905aa59bcb0847c009313f02e98d3d798aa9568f414c66"
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 23/24] openssl-nativesdk: Fix "can't open config file" warning
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
` (21 preceding siblings ...)
2018-05-25 2:48 ` [PATCH 22/24] rpcbind: add option to make user able to use fixed port number Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-25 2:48 ` [PATCH 24/24] nativesdk-rpm: Add wrappers for nativesdk support Robert Yang
2018-05-25 3:04 ` [PATCH 00/24] meta: various fixes Robert Yang
24 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
From: Ovidiu Panait <ovidiu.panait@windriver.com>
When SDK is not installed in the default location, openssl will not be
able to find the the openssl.cnf config file:
"WARNING: can't open config file: XXXX/usr/lib/ssl/openssl.cnf"
To fix this, we need to provide the environment variable $OPENSSL_CONF
pointing to the correct config file location.
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
.../openssl/openssl/environment.d-openssl.sh | 1 +
meta/recipes-connectivity/openssl/openssl10.inc | 7 +++++++
meta/recipes-connectivity/openssl/openssl_1.0.2o.bb | 5 +++++
meta/recipes-connectivity/openssl/openssl_1.1.0h.bb | 11 +++++++++++
4 files changed, 24 insertions(+)
create mode 100644 meta/recipes-connectivity/openssl/openssl/environment.d-openssl.sh
diff --git a/meta/recipes-connectivity/openssl/openssl/environment.d-openssl.sh b/meta/recipes-connectivity/openssl/openssl/environment.d-openssl.sh
new file mode 100644
index 0000000..b9cc24a
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/environment.d-openssl.sh
@@ -0,0 +1 @@
+export OPENSSL_CONF="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/openssl.cnf"
diff --git a/meta/recipes-connectivity/openssl/openssl10.inc b/meta/recipes-connectivity/openssl/openssl10.inc
index 645d64e..9f23758 100644
--- a/meta/recipes-connectivity/openssl/openssl10.inc
+++ b/meta/recipes-connectivity/openssl/openssl10.inc
@@ -281,5 +281,12 @@ do_install_append_class-native() {
OPENSSL_ENGINES=${libdir}/ssl/engines
}
+do_install_append_class-nativesdk() {
+ mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
+ install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
+}
+
+FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh"
+
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
index 413ebf3..7cae553 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
@@ -47,6 +47,11 @@ SRC_URI_append_class-target = "\
file://reproducible-cflags.patch \
file://reproducible-mkbuildinf.patch \
"
+
+SRC_URI_append_class-nativesdk = " \
+ file://environment.d-openssl.sh \
+ "
+
SRC_URI[md5sum] = "44279b8557c3247cbe324e2322ecd114"
SRC_URI[sha256sum] = "ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d"
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
index 94b75eb..29f83a3 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
@@ -19,6 +19,10 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
file://0001-Take-linking-flags-from-LDFLAGS-env-var.patch \
"
+SRC_URI_append_class-nativesdk = " \
+ file://environment.d-openssl.sh \
+ "
+
S = "${WORKDIR}/openssl-${PV}"
inherit lib_package multilib_header ptest
@@ -142,6 +146,13 @@ do_install_append_class-native () {
sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash
}
+do_install_append_class-nativesdk() {
+ mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
+ install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
+}
+
+FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh"
+
do_install_ptest() {
cp -r * ${D}${PTEST_PATH}
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 24/24] nativesdk-rpm: Add wrappers for nativesdk support
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
` (22 preceding siblings ...)
2018-05-25 2:48 ` [PATCH 23/24] openssl-nativesdk: Fix "can't open config file" warning Robert Yang
@ 2018-05-25 2:48 ` Robert Yang
2018-05-25 3:04 ` [PATCH 00/24] meta: various fixes Robert Yang
24 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-25 2:48 UTC (permalink / raw)
To: openembedded-core
From: Ovidiu Panait <ovidiu.panait@windriver.com>
When installing the SDK to a non-default path, running "rpm --showrc" from the
sdk will produce the following error:
error: Unable to open /opt/windriver/wrlinux-small/10.17.41/sysroots/x86_64-wrlinuxsdk-linux/usr/lib/rpm/rpmrc for reading: No such file or directory.
Fix this by adding wrappers that dynamically export the RPM_CONFIGDIR,
RPM_ETCCONFIGDIR and MAGIC environment variables, pointing to the proper
sdk locations.
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
meta/recipes-devtools/rpm/rpm_4.14.1.bb | 42 ++++++++++++++++++++++-----------
1 file changed, 28 insertions(+), 14 deletions(-)
diff --git a/meta/recipes-devtools/rpm/rpm_4.14.1.bb b/meta/recipes-devtools/rpm/rpm_4.14.1.bb
index d49530e..cf26c1e 100644
--- a/meta/recipes-devtools/rpm/rpm_4.14.1.bb
+++ b/meta/recipes-devtools/rpm/rpm_4.14.1.bb
@@ -67,6 +67,7 @@ EXTRA_OECONF_append_libc-musl = " --disable-nls"
# Disable dbus for native, so that rpm doesn't attempt to inhibit shutdown via session dbus even when plugins support is enabled.
# Also disable plugins by default for native.
EXTRA_OECONF_append_class-native = " --sysconfdir=/etc --localstatedir=/var --without-dbus --disable-plugins"
+EXTRA_OECONF_append_class-nativesdk = " --sysconfdir=/etc --localstatedir=/var --without-dbus --disable-plugins"
BBCLASSEXTEND = "native nativesdk"
@@ -77,21 +78,22 @@ ASNEEDED = ""
# Direct rpm-native to read configuration from our sysroot, not the one it was compiled in
# libmagic also has sysroot path contamination, so override it
+
+WRAPPER_TOOLS = " \
+ ${bindir}/rpm \
+ ${bindir}/rpm2archive \
+ ${bindir}/rpm2cpio \
+ ${bindir}/rpmbuild \
+ ${bindir}/rpmdb \
+ ${bindir}/rpmgraph \
+ ${bindir}/rpmkeys \
+ ${bindir}/rpmsign \
+ ${bindir}/rpmspec \
+ ${libdir}/rpm/rpmdeps \
+"
+
do_install_append_class-native() {
- tools="\
- ${bindir}/rpm \
- ${bindir}/rpm2archive \
- ${bindir}/rpm2cpio \
- ${bindir}/rpmbuild \
- ${bindir}/rpmdb \
- ${bindir}/rpmgraph \
- ${bindir}/rpmkeys \
- ${bindir}/rpmsign \
- ${bindir}/rpmspec \
- ${libdir}/rpm/rpmdeps \
- "
-
- for tool in $tools; do
+ for tool in ${WRAPPER_TOOLS}; do
create_wrapper ${D}$tool \
RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \
RPM_ETCCONFIGDIR=${STAGING_DIR_NATIVE} \
@@ -100,6 +102,18 @@ do_install_append_class-native() {
done
}
+do_install_append_class-nativesdk() {
+ for tool in ${WRAPPER_TOOLS}; do
+ create_wrapper ${D}$tool \
+ RPM_CONFIGDIR='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \
+ RPM_ETCCONFIGDIR='$'{RPM_ETCCONFIGDIR-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/..} \
+ MAGIC='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/misc/magic.mgc \
+ RPM_NO_CHROOT_FOR_SCRIPTS=1
+ done
+
+ rm -rf ${D}/var
+}
+
# Rpm's make install creates var/tmp which clashes with base-files packaging
do_install_append_class-target() {
rm -rf ${D}/var
--
2.7.4
^ permalink raw reply related [flat|nested] 40+ messages in thread
* Re: [PATCH 00/24] meta: various fixes
2018-05-25 2:48 [PATCH 00/24] meta: various fixes Robert Yang
` (23 preceding siblings ...)
2018-05-25 2:48 ` [PATCH 24/24] nativesdk-rpm: Add wrappers for nativesdk support Robert Yang
@ 2018-05-25 3:04 ` Robert Yang
24 siblings, 0 replies; 40+ messages in thread
From: Robert Yang @ 2018-05-25 3:04 UTC (permalink / raw)
To: openembedded-core
On 05/25/2018 10:48 AM, Robert Yang wrote:
> Hi RP and Ross,
>
> These are part of our local patches, most of them have been sent before, but
> didn't get reply, would you please help to review and merge/reject them? Thank
> you very much, All of them are good changes from my side.
>
> // Robert
>
> The following changes since commit 9da097b0de6425464ebd3f0539b7495b11d139b5:
>
> libnss-mdns: fix postinst and postrm (2018-05-22 13:09:04 +0100)
>
> are available in the git repository at:
>
> git://git.openembedded.org/openembedded-core-contrib rbt/24fixes
> http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/24fixes
Since there are only 22 fixes now, I put them to a more generic branch:
git://git.openembedded.org/openembedded-core-contrib rbt/fix_from_wr
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/fix_from_wr
// Robert
>
> Catalin Enache (1):
> init-install: add timeout for legacy grub
>
> Chen Qi (1):
> populate_sdk_ext.bbclass: add ESDK_MANIFEST_EXCLUDES
>
> Hu (1):
> shadow: fix pam configs for chpasswd, newusers
>
> Jackie Huang (3):
> rootfs-postcommands: split ssh_allow_empty_password
> dropbear: add default config file to disable root login
> glibc: re-package for libnss-db
>
> Jian Liu (1):
> lsof: fix LSOF_CCV in version.h
>
> Kai Kang (4):
> dbus: update build options when enable ptest
> dbus-test: sync x11 configure options with dbus
> toolchain-scripts.bbclass: do not extend dependency if extended
> already
> shadow: update ownership and permission of /var/spool/mail
>
> Li Wang (2):
> gawk: fix command location in ptest script
> rpcbind: add option to make user able to use fixed port number
>
> Mark Hatle (1):
> base.bbclass: Add buildcfg multilib values
>
> Mingli Yu (1):
> at: add libselinux to PACKAGECONFIG
>
> Ovidiu Panait (2):
> openssl-nativesdk: Fix "can't open config file" warning
> nativesdk-rpm: Add wrappers for nativesdk support
>
> Robert Yang (3):
> runqemu-extract-sdk: allow install debugfs on rootfs
> oe/copy_buildsystem.py: add SDK_LAYERS_EXCLUDE_PATTERN
> site/powerpc64-linux: add cvs_cv_func_printf_ptr
>
> Shan Hai (1):
> xinetd: add Init Script Actions to xinetd script
>
> Yadi.hu (1):
> busybox: handle syslog
>
> Yuanjie Huang (1):
> gcc-sanitizers: Fix libtool .la files
>
> Yue Tao (1):
> initscripts: Avoid starting rpcbind daemon twice
>
> meta/classes/base.bbclass | 16 ++-
> meta/classes/image.bbclass | 2 +-
> meta/classes/populate_sdk_ext.bbclass | 6 +
> meta/classes/rootfs-postcommands.bbclass | 25 +++-
> meta/classes/toolchain-scripts.bbclass | 13 ++-
> meta/conf/bitbake.conf | 2 +-
> meta/lib/oe/copy_buildsystem.py | 18 +++
> .../openssl/openssl/environment.d-openssl.sh | 1 +
> meta/recipes-connectivity/openssl/openssl10.inc | 7 ++
> .../recipes-connectivity/openssl/openssl_1.0.2o.bb | 5 +
> .../recipes-connectivity/openssl/openssl_1.1.0h.bb | 11 ++
> meta/recipes-core/busybox/busybox.inc | 14 ++-
> meta/recipes-core/dbus/dbus-test_1.12.8.bb | 6 +-
> meta/recipes-core/dbus/dbus_1.12.8.bb | 4 +-
> meta/recipes-core/dropbear/dropbear.inc | 3 +
> .../dropbear/dropbear/dropbear.default | 2 +
> meta/recipes-core/glibc/glibc-package.inc | 5 +-
> .../initrdscripts/files/init-install.sh | 2 +
> .../initscripts/initscripts-1.0/mountnfs.sh | 9 +-
> meta/recipes-devtools/gcc/gcc-sanitizers.inc | 2 +
> meta/recipes-devtools/rpm/rpm_4.14.1.bb | 42 ++++---
> meta/recipes-extended/at/at_3.1.20.bb | 6 +
> meta/recipes-extended/gawk/gawk_4.2.1.bb | 2 +
> .../files/Configure-fix-LSOF_CCV-assignment.patch | 31 +++++
> meta/recipes-extended/lsof/lsof_4.89.bb | 4 +-
> .../rpcbind_add_option_to_fix_port_number.patch | 130 +++++++++++++++++++++
> meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb | 1 +
> meta/recipes-extended/shadow/files/pam.d/chpasswd | 2 +
> meta/recipes-extended/shadow/files/pam.d/newusers | 2 +
> meta/recipes-extended/shadow/shadow.inc | 3 +-
> meta/recipes-extended/xinetd/xinetd/xinetd.init | 12 +-
> meta/site/powerpc64-linux | 2 +
> scripts/runqemu-extract-sdk | 4 +-
> 33 files changed, 355 insertions(+), 39 deletions(-)
> create mode 100644 meta/recipes-connectivity/openssl/openssl/environment.d-openssl.sh
> create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear.default
> create mode 100644 meta/recipes-extended/lsof/files/Configure-fix-LSOF_CCV-assignment.patch
> create mode 100644 meta/recipes-extended/rpcbind/rpcbind/rpcbind_add_option_to_fix_port_number.patch
>
^ permalink raw reply [flat|nested] 40+ messages in thread