Re: [OE-core] [PATCH 1/4] [v3] openssh: Add systemd support
On 08/20/2013 02:00 AM, Saul Wold wrote:
On 08/18/2013 11:40 PM, Khem Raj wrote:
On Sun, Aug 18, 2013 at 11:18 PM, Muhammad Shakeel
wrote:
/usr/sbin/ is being sed'ed with ${sbindir} in do_install_append of the
respective recipe file. /usr/bin/ and /bin/ is also taken care of.
i see, thats better. however I do see a need to have a generalized
way of specifying service files and a generic
processing engine which then takes care of it. Otherwise we have the
same code replicated in multiple recipes
Agreed, I think there should be a generalized solution here,
implemented in the systemd.bbclass.
This is not required for all of the systemd unit files. Packages which
have upstream systemd support, e.g. avahi, ofono they install service
file theirselves.
I have already discussed to move this 'sed' part into systemd.bbclass
but Ross Burton had other ideas.
http://patches.openembedded.org/patch/53489/
So what is your final recommendation here?
It also appears that this set is also creating a /lib dir that should
not be there for non-systemd builds.
ERROR: Task 25
(/home/sgw/yocto/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb,
do_package) failed with exit code '1'
ERROR: QA Issue: nfs-utils: Files/directories were installed but not
shipped
/lib
ERROR: QA run found fatal errors. Please consider fixing them.
ERROR: Function failed: do_package_qa
ERROR: Logfile of failure stored in:
/home/sgw/yocto/builds/world/tmp/work/x86_64-poky-linux/nfs-utils/1.2.8-r0/temp/log.do_package.17558
Sorry about this error, I will fix this in next version.
Regards
--Shakeel
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] shadown: backport a patch to make newgrp work
On 08/20/2013 02:44 PM, Saul Wold wrote:
Do you mean Shadow?
Please correct the spelling
Thanks
Sau!
Sorry, I will fix it
Thanks
-Roy
On 08/19/2013 10:26 PM, rongqing...@windriver.com wrote:
From: "Roy.Li"
Signed-off-by: Roy.Li
---
.../shadow/files/fix-etc-gshadow-reading.patch | 36
meta/recipes-extended/shadow/shadow_4.1.4.3.bb |1 +
2 files changed, 37 insertions(+)
create mode 100644
meta/recipes-extended/shadow/files/fix-etc-gshadow-reading.patch
diff --git
a/meta/recipes-extended/shadow/files/fix-etc-gshadow-reading.patch
b/meta/recipes-extended/shadow/files/fix-etc-gshadow-reading.patch
new file mode 100644
index 000..80ebdc2
--- /dev/null
+++ b/meta/recipes-extended/shadow/files/fix-etc-gshadow-reading.patch
@@ -0,0 +1,36 @@
+shadow: Fix parsing of gshadow entries
+
+Upstream-Status: Backport
[http://anonscm.debian.org/viewvc/pkg-shadow?view=revision&revision=3096]
+
+newgrp command does not function properly.
+Even with the valid password, it outputs: "'Invalid password'"
+
+Signed-off-by: Roy.Li
+
+2010-02-14 Michael Bunk
+
+* NEWS, lib/gshadow.c: Fix parsing of gshadow entries.
+
+diff -urpN a/lib/gshadow.c b/lib/gshadow.c
+--- a/lib/gshadow.c2013-07-11 10:18:15.745450428 +0800
b/lib/gshadow.c2013-07-11 10:17:30.465450280 +0800
+@@ -222,6 +222,7 @@ void endsgent (void)
+ if (NULL == buf) {
+ return NULL;
+ }
++buflen = BUFSIZ;
+ }
+
+ if (NULL == fp) {
+@@ -229,9 +230,9 @@ void endsgent (void)
+ }
+
+ #ifdefUSE_NIS
+-while (fgetsx (buf, (int) sizeof buf, fp) == buf)
++while (fgetsx (buf, (int) buflen, fp) == buf)
+ #else
+-if (fgetsx (buf, (int) sizeof buf, fp) == buf)
++if (fgetsx (buf, (int) buflen, fp) == buf)
+ #endif
+ {
+ while ( ((cp = strrchr (buf, '\n')) == NULL)
diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
index af67339..31cef20 100644
--- a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
@@ -24,6 +24,7 @@ SRC_URI =
"http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
file://shadow-update-pam-conf.patch \
file://shadow_fix_for_automake-1.12.patch \
file://slackware_fix_for_glib-2.17_crypt.patch \
+ file://fix-etc-gshadow-reading.patch \
"
SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79"
--
Best Reagrds,
Roy | RongQing Li
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] shadown: backport a patch to make newgrp work
Do you mean Shadow?
Please correct the spelling
Thanks
Sau!
On 08/19/2013 10:26 PM, rongqing...@windriver.com wrote:
From: "Roy.Li"
Signed-off-by: Roy.Li
---
.../shadow/files/fix-etc-gshadow-reading.patch | 36
meta/recipes-extended/shadow/shadow_4.1.4.3.bb |1 +
2 files changed, 37 insertions(+)
create mode 100644
meta/recipes-extended/shadow/files/fix-etc-gshadow-reading.patch
diff --git a/meta/recipes-extended/shadow/files/fix-etc-gshadow-reading.patch
b/meta/recipes-extended/shadow/files/fix-etc-gshadow-reading.patch
new file mode 100644
index 000..80ebdc2
--- /dev/null
+++ b/meta/recipes-extended/shadow/files/fix-etc-gshadow-reading.patch
@@ -0,0 +1,36 @@
+shadow: Fix parsing of gshadow entries
+
+Upstream-Status: Backport
[http://anonscm.debian.org/viewvc/pkg-shadow?view=revision&revision=3096]
+
+newgrp command does not function properly.
+Even with the valid password, it outputs: "'Invalid password'"
+
+Signed-off-by: Roy.Li
+
+2010-02-14 Michael Bunk
+
+ * NEWS, lib/gshadow.c: Fix parsing of gshadow entries.
+
+diff -urpN a/lib/gshadow.c b/lib/gshadow.c
+--- a/lib/gshadow.c2013-07-11 10:18:15.745450428 +0800
b/lib/gshadow.c2013-07-11 10:17:30.465450280 +0800
+@@ -222,6 +222,7 @@ void endsgent (void)
+ if (NULL == buf) {
+ return NULL;
+ }
++ buflen = BUFSIZ;
+ }
+
+ if (NULL == fp) {
+@@ -229,9 +230,9 @@ void endsgent (void)
+ }
+
+ #ifdefUSE_NIS
+- while (fgetsx (buf, (int) sizeof buf, fp) == buf)
++ while (fgetsx (buf, (int) buflen, fp) == buf)
+ #else
+- if (fgetsx (buf, (int) sizeof buf, fp) == buf)
++ if (fgetsx (buf, (int) buflen, fp) == buf)
+ #endif
+ {
+ while ( ((cp = strrchr (buf, '\n')) == NULL)
diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
index af67339..31cef20 100644
--- a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
@@ -24,6 +24,7 @@ SRC_URI =
"http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
file://shadow-update-pam-conf.patch \
file://shadow_fix_for_automake-1.12.patch \
file://slackware_fix_for_glib-2.17_crypt.patch \
+ file://fix-etc-gshadow-reading.patch \
"
SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79"
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/6] sysvinit: add init.d/bootlogd status command for LSB compliance
On Tue, 2013-08-20 at 11:25 +0800, jackie.hu...@windriver.com wrote: > @@ -37,6 +40,19 @@ case "$0" in > ;; > esac > > +# default /var/log/boot is not an option since /var/log becomes > +# /var/volatile/log > +logfile=/var/local/bootlogd.log > + > +# > +# Create initial log files > +# > +if [ ! -f "$logfile" ] && touch "$logfile" >/dev/null 2>&1; then > + echo "(Nothing has been logged yet.)" >| "$logfile" > + chown root:adm "$logfile" > + chmod 640 "$logfile" > +fi > + > case "$ACTION" in > start) > echo -n "Starting $DESC: " > @@ -44,9 +60,9 @@ case "$ACTION" in > then > umask 027 > start-stop-daemon --start --quiet \ > - --exec $DAEMON -- -r > + --exec $DAEMON -- -r -l $logfile > else > - $DAEMON -r > + $DAEMON -r -l $logfile > fi > echo "$NAME." > ;; It's not totally obvious that the changes are related to the "status" command. If you're creating new logfiles that didn't exist previously then I think the commit message ought to explain why. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/6] nfs-utils: add init.d/nfsserver status command for LSB compliance
On Tue, 2013-08-20 at 11:25 +0800, jackie.hu...@windriver.com wrote:
> @@ -23,6 +25,7 @@ test -r /etc/default/nfsd && . /etc/default/nfsd
> test -x "$NFS_MOUNTD" || NFS_MOUNTD=/usr/sbin/rpc.mountd
> test -x "$NFS_NFSD" || NFS_NFSD=/usr/sbin/rpc.nfsd
> test -x "$NFS_STATD" || NFS_STATD=/usr/sbin/rpc.statd
> +test -z "$STATD_PID" && STATD_PID=/var/run/rpc.statd.pid
> #
> # The user mode program must also exist (it just starts the kernel
> # threads using the kernel module code).
> @@ -75,6 +78,17 @@ stop_mountd(){
> #
> #nfsd
> start_nfsd(){
> +modprobe -q nfsd
> + grep -q nfsd /proc/filesystems || {
> + echo NFS daemon support not enabled in kernel
> + exit 1
> +}
> + grep -q nfsd /proc/mounts || mount -t nfsd nfsd /proc/fs/nfsd
> + grep -q nfsd /proc/mounts || {
> + echo nfsd filesystem could not be mounted at /proc/fs/nfsd
> + exit 1
> +}
> +
> echo -n "starting $1 nfsd kernel threads: "
> start-stop-daemon --start --exec "$NFS_NFSD" -- "$@"
> echo done
> @@ -113,14 +127,14 @@ stop_nfsd(){
> #statd
> start_statd(){
> echo -n "starting statd: "
> - start-stop-daemon --start --exec "$NFS_STATD"
> + start-stop-daemon --start --exec "$NFS_STATD" --pidfile "$STATD_PID"
> echo done
> }
> stop_statd(){
> # WARNING: this kills any process with the executable
> # name 'statd'.
> echo -n 'stopping statd: '
> - start-stop-daemon --stop --quiet --signal 1 --name statd
> + start-stop-daemon --stop --quiet --signal 1 --pidfile "$STATD_PID"
> echo done
> }
> #--
This stuff doesn't seem to e directly related to the "status" command.
p.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] cronie: upgrade to 1.4.11
Hi Paul, I saw the error today, yesterday I was ooo. Sorry for the mistake. Cristiana -Original Message- From: Paul Eggleton [mailto:paul.eggle...@linux.intel.com] Sent: Monday, August 19, 2013 11:31 AM To: Voicu, Cristiana Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH 1/2] cronie: upgrade to 1.4.11 On Monday 19 August 2013 09:24:54 Paul Eggleton wrote: > Hi Cristiana, > > On Friday 16 August 2013 11:30:49 Cristiana Voicu wrote: > > LIC_FILES_CHKSUM changed because cron.h doesn't exist anymore. > > Replaced it with cron.c. > > > >... > > A couple of people have reported this doesn't build, and I've > confirmed it this morning: Ah, I see Saul already sent a patch for this, sorry I didn't see it before. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] About PACKAGECONFIG audit
On 08/20/2013 04:46 AM, Randy MacLeod wrote: Add Joe Slater who owns US17463: PACKAGECONFIG clean-up. On 13-08-15 05:29 AM, wenzong fan wrote: Hi All, We have seen some problems like this: $ bitbake libcap ld: warning: libaudit.so.1, needed by .../lib64/libpam.so, not found .../lib64/libpam.so: undefined reference to `audit_open' .../lib64/libpam.so: undefined reference to `audit_close' .. The libaudit has been available and libpam build with it, after we run another build with sstate-cache and w/o libaudit, the error occurs. The solution in these cases is to use PACKAGECONFIG to lay out dependencies on optional packages and make them explicit. We need to run an audit and catch all of these issues. A probable ways maybe: 1) Run world build to generate the sysroots as much as possible; 2) Run 'configure --help' on each package to spot all of the optional dependencies, and convert them into PACKAGECONFIG specs/or any other prompts. We should try to automate or codify this step so that the output is a list of oe-core package names. 3) Run #1, #2 as an audit script periodically. Or could we run this check as part of a QA build step? Do you mean: scripts/test-dependencies.sh No, I mean some check steps that if PACKAGECONFIG should be used, not limit to the script. Thanks Wenzong // Randy Thanks Wenzong ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] shadown: backport a patch to make newgrp work
From: "Roy.Li"
Signed-off-by: Roy.Li
---
.../shadow/files/fix-etc-gshadow-reading.patch | 36
meta/recipes-extended/shadow/shadow_4.1.4.3.bb |1 +
2 files changed, 37 insertions(+)
create mode 100644
meta/recipes-extended/shadow/files/fix-etc-gshadow-reading.patch
diff --git a/meta/recipes-extended/shadow/files/fix-etc-gshadow-reading.patch
b/meta/recipes-extended/shadow/files/fix-etc-gshadow-reading.patch
new file mode 100644
index 000..80ebdc2
--- /dev/null
+++ b/meta/recipes-extended/shadow/files/fix-etc-gshadow-reading.patch
@@ -0,0 +1,36 @@
+shadow: Fix parsing of gshadow entries
+
+Upstream-Status: Backport
[http://anonscm.debian.org/viewvc/pkg-shadow?view=revision&revision=3096]
+
+newgrp command does not function properly.
+Even with the valid password, it outputs: "'Invalid password'"
+
+Signed-off-by: Roy.Li
+
+2010-02-14 Michael Bunk
+
+ * NEWS, lib/gshadow.c: Fix parsing of gshadow entries.
+
+diff -urpN a/lib/gshadow.c b/lib/gshadow.c
+--- a/lib/gshadow.c2013-07-11 10:18:15.745450428 +0800
b/lib/gshadow.c2013-07-11 10:17:30.465450280 +0800
+@@ -222,6 +222,7 @@ void endsgent (void)
+ if (NULL == buf) {
+ return NULL;
+ }
++ buflen = BUFSIZ;
+ }
+
+ if (NULL == fp) {
+@@ -229,9 +230,9 @@ void endsgent (void)
+ }
+
+ #ifdefUSE_NIS
+- while (fgetsx (buf, (int) sizeof buf, fp) == buf)
++ while (fgetsx (buf, (int) buflen, fp) == buf)
+ #else
+- if (fgetsx (buf, (int) sizeof buf, fp) == buf)
++ if (fgetsx (buf, (int) buflen, fp) == buf)
+ #endif
+ {
+ while ( ((cp = strrchr (buf, '\n')) == NULL)
diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
index af67339..31cef20 100644
--- a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
@@ -24,6 +24,7 @@ SRC_URI =
"http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
file://shadow-update-pam-conf.patch \
file://shadow_fix_for_automake-1.12.patch \
file://slackware_fix_for_glib-2.17_crypt.patch \
+ file://fix-etc-gshadow-reading.patch \
"
SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79"
--
1.7.10.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] shadown: backport a patch to make newgrp work
From: "Roy.Li" The following changes since commit 02e6f25c210b0628dc4ee4482474b0e6ce5606e4: sstate.bbclass: fix parallel building issue (2013-08-13 15:16:29 +0800) are available in the git repository at: git://git.pokylinux.org/poky-contrib roy/mewgrp http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=roy/mewgrp Roy.Li (1): shadown: backport a patch to make newgrp work .../shadow/files/fix-etc-gshadow-reading.patch | 36 meta/recipes-extended/shadow/shadow_4.1.4.3.bb |1 + 2 files changed, 37 insertions(+) create mode 100644 meta/recipes-extended/shadow/files/fix-etc-gshadow-reading.patch -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] openssl: avoid NULL pointer dereference in three places
On 08/20/2013 12:13 PM, Saul Wold wrote:
On 08/19/2013 06:59 PM, Xufeng Zhang wrote:
Hi All,
Anybody help me review this?
Thanks,
Xufeng
On 06/04/2013 02:15 PM, Xufeng Zhang wrote:
There are three potential NULL pointer dereference in
EVP_DigestInit_ex(), dh_pub_encode() and dsa_pub_encode()
functions.
Fix them by adding proper null pointer check.
[YOCTO #4600]
[ CQID: WIND00373257 ]
Signed-off-by: Xufeng Zhang
---
...-pointer-dereference-in-EVP_DigestInit_ex.patch | 16 +
...NULL-pointer-dereference-in-dh_pub_encode.patch | 34
meta/recipes-connectivity/openssl/openssl.inc |2 +-
.../recipes-connectivity/openssl/openssl_1.0.1e.bb |2 +
4 files changed, 53 insertions(+), 1 deletions(-)
create mode 100644
meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
create mode 100644
meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch
diff --git
a/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
new file mode 100644
index 000..69924a4
--- /dev/null
+++
b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
@@ -0,0 +1,16 @@
+openssl: avoid NULL pointer dereference in EVP_DigestInit_ex()
+
+We should avoid accessing the type pointer if it's NULL,
+this could happen if ctx->digest is not NULL.
These patches both need Upstream-Status: and Signed-off-by: Tags
Ok, I'll add these stuff when I send V2.
+---
+--- a/crypto/evp/digest.c
b/crypto/evp/digest.c
+@@ -199,7 +199,7 @@
+ return 0;
+ }
+ #endif
+-if (ctx->digest != type)
++if (type&& (ctx->digest != type))
+ {
+ if (ctx->digest&& ctx->digest->ctx_size)
+ OPENSSL_free(ctx->md_data);
I am more concerned about this patch as I do not know the code well,
but if ctx->digest is non-NULL and type is, this code would not be
executed which would be wrong, correct?
No, that's correct, if type is NULL, we should not execute the below
code as type pointer is accessed in the following code, see:
int EVP_DigestInit_ex()
{
...
if (ctx->digest != type)
{
if (ctx->digest && ctx->digest->ctx_size)
OPENSSL_free(ctx->md_data);
ctx->digest=type;
if (!(ctx->flags & EVP_MD_CTX_FLAG_NO_INIT) && type->ctx_size)
{
ctx->update = type->update;
...
}
...
}
Your changing the behavior of the code here.
But if we don't change, NULL pointer dereference would appear.
Also reading the code, it should be be possible for type to be NULL,
I think you are saying "it should not be possible"
unless some memory corruption occurs earlier as there is a check at
line 153 for !type, which should cause it to goto skip_to_init.
Yes, it's true, but such code is executed only when OPENSSL_NO_ENGINE is
not defined.
Please verify this patch is really needed.
diff --git
a/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch
b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch
new file mode 100644
index 000..642b0ea
--- /dev/null
+++
b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch
@@ -0,0 +1,34 @@
+openssl: avoid NULL pointer dereference in
dh_pub_encode()/dsa_pub_encode()
+
+We should avoid accessing the pointer if ASN1_STRING_new()
+allocates memory failed.
+---
+--- a/crypto/dh/dh_ameth.c
b/crypto/dh/dh_ameth.c
+@@ -139,6 +139,12 @@
+ dh=pkey->pkey.dh;
+
+ str = ASN1_STRING_new();
++if (!str)
++{
++DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
++goto err;
++}
++
+ str->length = i2d_DHparams(dh,&str->data);
+ if (str->length<= 0)
+ {
+--- a/crypto/dsa/dsa_ameth.c
b/crypto/dsa/dsa_ameth.c
+@@ -148,6 +148,11 @@
+ {
+ ASN1_STRING *str;
+ str = ASN1_STRING_new();
++if (!str)
++{
++DSAerr(DSA_F_DSA_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
++goto err;
++}
+ str->length = i2d_DSAparams(dsa,&str->data);
+ if (str->length<= 0)
+ {
diff --git a/meta/recipes-connectivity/openssl/openssl.inc
b/meta/recipes-connectivity/openssl/openssl.inc
index f5b2432..c753a27 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -5,7 +5,7 @@ BUGTRACKER =
"http://www.openssl.org/news/vulnerabilities.html";
SECTION = "libs/network"
# Big Jump for OpenSSL 1.0 support with meta-oe
-IN
Re: [OE-core] [PATCH] openssl: avoid NULL pointer dereference in three places
On 08/19/2013 06:59 PM, Xufeng Zhang wrote:
Hi All,
Anybody help me review this?
Thanks,
Xufeng
On 06/04/2013 02:15 PM, Xufeng Zhang wrote:
There are three potential NULL pointer dereference in
EVP_DigestInit_ex(), dh_pub_encode() and dsa_pub_encode()
functions.
Fix them by adding proper null pointer check.
[YOCTO #4600]
[ CQID: WIND00373257 ]
Signed-off-by: Xufeng Zhang
---
...-pointer-dereference-in-EVP_DigestInit_ex.patch | 16 +
...NULL-pointer-dereference-in-dh_pub_encode.patch | 34
meta/recipes-connectivity/openssl/openssl.inc |2 +-
.../recipes-connectivity/openssl/openssl_1.0.1e.bb |2 +
4 files changed, 53 insertions(+), 1 deletions(-)
create mode 100644
meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
create mode 100644
meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch
diff --git
a/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
new file mode 100644
index 000..69924a4
--- /dev/null
+++
b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
@@ -0,0 +1,16 @@
+openssl: avoid NULL pointer dereference in EVP_DigestInit_ex()
+
+We should avoid accessing the type pointer if it's NULL,
+this could happen if ctx->digest is not NULL.
These patches both need Upstream-Status: and Signed-off-by: Tags
+---
+--- a/crypto/evp/digest.c
b/crypto/evp/digest.c
+@@ -199,7 +199,7 @@
+ return 0;
+ }
+ #endif
+-if (ctx->digest != type)
++if (type&& (ctx->digest != type))
+ {
+ if (ctx->digest&& ctx->digest->ctx_size)
+ OPENSSL_free(ctx->md_data);
I am more concerned about this patch as I do not know the code well, but
if ctx->digest is non-NULL and type is, this code would not be executed
which would be wrong, correct? Your changing the behavior of the code
here. Also reading the code, it should be be possible for type to be
NULL, unless some memory corruption occurs earlier as there is a check
at line 153 for !type, which should cause it to goto skip_to_init.
Please verify this patch is really needed.
diff --git
a/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch
b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch
new file mode 100644
index 000..642b0ea
--- /dev/null
+++
b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch
@@ -0,0 +1,34 @@
+openssl: avoid NULL pointer dereference in
dh_pub_encode()/dsa_pub_encode()
+
+We should avoid accessing the pointer if ASN1_STRING_new()
+allocates memory failed.
+---
+--- a/crypto/dh/dh_ameth.c
b/crypto/dh/dh_ameth.c
+@@ -139,6 +139,12 @@
+ dh=pkey->pkey.dh;
+
+ str = ASN1_STRING_new();
++if (!str)
++{
++DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
++goto err;
++}
++
+ str->length = i2d_DHparams(dh,&str->data);
+ if (str->length<= 0)
+ {
+--- a/crypto/dsa/dsa_ameth.c
b/crypto/dsa/dsa_ameth.c
+@@ -148,6 +148,11 @@
+ {
+ ASN1_STRING *str;
+ str = ASN1_STRING_new();
++if (!str)
++{
++DSAerr(DSA_F_DSA_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
++goto err;
++}
+ str->length = i2d_DSAparams(dsa,&str->data);
+ if (str->length<= 0)
+ {
diff --git a/meta/recipes-connectivity/openssl/openssl.inc
b/meta/recipes-connectivity/openssl/openssl.inc
index f5b2432..c753a27 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -5,7 +5,7 @@ BUGTRACKER =
"http://www.openssl.org/news/vulnerabilities.html";
SECTION = "libs/network"
# Big Jump for OpenSSL 1.0 support with meta-oe
-INC_PR = "r15"
+INC_PR = "r16"
No PR or INC_PR Bump needed
# "openssl | SSLeay" dual license
LICENSE = "openssl"
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
index 61de3a6..afd5576 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
@@ -31,6 +31,8 @@ SRC_URI += "file://configure-targets.patch \
file://openssl_fix_for_x32.patch \
file://openssl-fix-doc.patch \
file://find.pl \
+
file://openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch \
+
file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
\
"
SRC_URI[md5sum] = "66bf6f10f060d561929de96f9dfe5b8c"
[OE-core] [PATCH 4/6] openssh: add init.d/sshd status command for LSB compliance
From: Jackie Huang
Signed-off-by: Li Wang
Signed-off-by: Jackie Huang
---
.../openssh/openssh-6.2p2/init | 15 ++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/init
b/meta/recipes-connectivity/openssh/openssh-6.2p2/init
index 6beec84..6bbc573 100644
--- a/meta/recipes-connectivity/openssh/openssh-6.2p2/init
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/init
@@ -1,6 +1,9 @@
#! /bin/sh
set -e
+# source function library
+. /etc/init.d/functions
+
# /etc/init.d/ssh: start and stop the OpenBSD "secure shell" daemon
test -x /usr/sbin/sshd || exit 0
@@ -46,6 +49,11 @@ check_keys() {
fi
}
+rh_status() {
+ status /usr/sbin/sshd;
+ return $?
+}
+
export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
case "$1" in
@@ -84,8 +92,13 @@ case "$1" in
echo "."
;;
+ status)
+ rh_status;
+ exit $?
+ ;;
+
*)
- echo "Usage: /etc/init.d/ssh {start|stop|reload|force-reload|restart}"
+ echo "Usage: /etc/init.d/ssh
{start|stop|status|reload|force-reload|restart}"
exit 1
esac
--
1.7.4.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/6] sysvinit: add init.d/bootlogd status command for LSB compliance
From: Jackie Huang
Signed-off-by: Li Wang
Signed-off-by: Jackie Huang
---
meta/recipes-core/sysvinit/sysvinit/bootlogd.init | 28 ++---
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/sysvinit/sysvinit/bootlogd.init
b/meta/recipes-core/sysvinit/sysvinit/bootlogd.init
index f8f07a0..455d001 100755
--- a/meta/recipes-core/sysvinit/sysvinit/bootlogd.init
+++ b/meta/recipes-core/sysvinit/sysvinit/bootlogd.init
@@ -13,6 +13,9 @@ DAEMON=/sbin/bootlogd
NAME=bootlogd
DESC="Bootlog daemon"
+# source function library
+. /etc/init.d/functions
+
test -f $DAEMON || exit 0
[ -r /etc/default/bootlogd ] && . /etc/default/bootlogd
@@ -37,6 +40,19 @@ case "$0" in
;;
esac
+# default /var/log/boot is not an option since /var/log becomes
+# /var/volatile/log
+logfile=/var/local/bootlogd.log
+
+#
+# Create initial log files
+#
+if [ ! -f "$logfile" ] && touch "$logfile" >/dev/null 2>&1; then
+ echo "(Nothing has been logged yet.)" >| "$logfile"
+ chown root:adm "$logfile"
+ chmod 640 "$logfile"
+fi
+
case "$ACTION" in
start)
echo -n "Starting $DESC: "
@@ -44,9 +60,9 @@ case "$ACTION" in
then
umask 027
start-stop-daemon --start --quiet \
- --exec $DAEMON -- -r
+ --exec $DAEMON -- -r -l $logfile
else
- $DAEMON -r
+ $DAEMON -r -l $logfile
fi
echo "$NAME."
;;
@@ -70,13 +86,17 @@ case "$ACTION" in
echo -n "Restarting $DESC: "
start-stop-daemon --stop --quiet --exec $DAEMON
sleep 1
- start-stop-daemon --start --quiet --exec $DAEMON
+ start-stop-daemon --start --quiet --exec $DAEMON -- -l $logfile
echo "$NAME."
;;
+ status)
+ status $DAEMON
+ exit $?
+ ;;
*)
N=${0##*/}
N=${N#[SK]??}
- echo "Usage: $N {start|stop|restart|force-reload}" >&2
+ echo "Usage: $N {start|stop|status|restart|force-reload}" >&2
exit 1
;;
esac
--
1.7.4.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/6] at: add init.d/atd status command for LSB compliance
From: Jackie Huang
Signed-off-by: Li Wang
Signed-off-by: Jackie Huang
---
meta/recipes-extended/at/files/S99at | 13 -
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/at/files/S99at
b/meta/recipes-extended/at/files/S99at
index 386f8a4..d2ba34b 100644
--- a/meta/recipes-extended/at/files/S99at
+++ b/meta/recipes-extended/at/files/S99at
@@ -5,6 +5,9 @@
umask 077
+# Source function library.
+. /etc/init.d/functions
+
start() {
echo -n "Starting atd: "
start-stop-daemon --start --quiet --pidfile /var/run/atd.pid
--background --exec /usr/sbin/atd -- -f
@@ -20,6 +23,11 @@ restart() {
start
}
+rh_status() {
+# run checks to determine if the service is running or use generic status
+status /usr/sbin/atd
+}
+
case "$1" in
start)
start
@@ -30,8 +38,11 @@ case "$1" in
restart|reload)
restart
;;
+ status)
+ rh_status
+ ;;
*)
- echo $"Usage: $0 {start|stop|restart}"
+ echo $"Usage: $0 {start|stop|restart|status}"
exit 1
esac
--
1.7.4.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/6] nfs-utils: add init.d/nfsserver status command for LSB compliance
From: Jackie Huang
Signed-off-by: Li Wang
Signed-off-by: Jackie Huang
---
.../nfs-utils/nfs-utils/nfsserver | 25 ++-
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
index e460e26..494af2e 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
@@ -14,6 +14,8 @@
#
# Startup script for nfs-utils
#
+# Source function library.
+. /etc/init.d/functions
#
# The environment variable NFS_SERVERS may be set in /etc/default/nfsd
# Other control variables may be overridden here too
@@ -23,6 +25,7 @@ test -r /etc/default/nfsd && . /etc/default/nfsd
test -x "$NFS_MOUNTD" || NFS_MOUNTD=/usr/sbin/rpc.mountd
test -x "$NFS_NFSD" || NFS_NFSD=/usr/sbin/rpc.nfsd
test -x "$NFS_STATD" || NFS_STATD=/usr/sbin/rpc.statd
+test -z "$STATD_PID" && STATD_PID=/var/run/rpc.statd.pid
#
# The user mode program must also exist (it just starts the kernel
# threads using the kernel module code).
@@ -75,6 +78,17 @@ stop_mountd(){
#
#nfsd
start_nfsd(){
+modprobe -q nfsd
+ grep -q nfsd /proc/filesystems || {
+ echo NFS daemon support not enabled in kernel
+ exit 1
+}
+ grep -q nfsd /proc/mounts || mount -t nfsd nfsd /proc/fs/nfsd
+ grep -q nfsd /proc/mounts || {
+ echo nfsd filesystem could not be mounted at /proc/fs/nfsd
+ exit 1
+}
+
echo -n "starting $1 nfsd kernel threads: "
start-stop-daemon --start --exec "$NFS_NFSD" -- "$@"
echo done
@@ -113,14 +127,14 @@ stop_nfsd(){
#statd
start_statd(){
echo -n "starting statd: "
- start-stop-daemon --start --exec "$NFS_STATD"
+ start-stop-daemon --start --exec "$NFS_STATD" --pidfile "$STATD_PID"
echo done
}
stop_statd(){
# WARNING: this kills any process with the executable
# name 'statd'.
echo -n 'stopping statd: '
- start-stop-daemon --stop --quiet --signal 1 --name statd
+ start-stop-daemon --stop --quiet --signal 1 --pidfile "$STATD_PID"
echo done
}
#--
@@ -141,6 +155,13 @@ stop) exportfs -ua
stop_statd
stop_mountd
stop_nfsd;;
+status)
+ status /usr/sbin/rpc.mountd;
+ RETVAL=$?
+ status nfsd;
+ rval=$?
+ [ $RETVAL -eq 0 ] && exit $rval
+ exit $RETVAL;;
reload)test -r /etc/exports && exportfs -r;;
restart)exportfs -ua
stop_mountd
--
1.7.4.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/6] sysklogd: add init.d/syslog status command for LSB compliance
From: Jackie Huang
Signed-off-by: Li Wang
Signed-off-by: Jackie Huang
---
meta/recipes-extended/sysklogd/files/sysklogd | 13 -
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/sysklogd/files/sysklogd
b/meta/recipes-extended/sysklogd/files/sysklogd
index dcbc81e..c966725 100755
--- a/meta/recipes-extended/sysklogd/files/sysklogd
+++ b/meta/recipes-extended/sysklogd/files/sysklogd
@@ -12,6 +12,9 @@
# Short-Description:System logger
### END INIT INFO
+# Source function library.
+. /etc/init.d/functions
+
PATH=/bin:/usr/bin:/sbin:/usr/sbin
pidfile_syslogd=/var/run/syslogd.pid
@@ -132,8 +135,16 @@ case "$1" in
$0 start
fi
;;
+ status)
+status syslogd;
+RETVAL=$?
+status klogd;
+rval=$?
+[ $RETVAL -eq 0 ] && exit $rval
+exit $RETVAL
+;;
*)
-log_success_msg "Usage: /etc/init.d/sysklogd
{start|stop|reload|restart|force-reload|reload-or-restart}"
+log_success_msg "Usage: /etc/init.d/sysklogd
{start|stop|reload|restart|force-reload|reload-or-restart|status}"
exit 1
esac
--
1.7.4.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/6] Add status command for LSB compliance for some packages
From: Jackie Huang test info: MACHINE ??= "qemux86-64" IMAGE_INSTALL_append = " at sysklogd" $ bitbake core-image-sato root@qemux86-64:~# /etc/init.d/atd status /usr/sbin/atd (pid 580) is running... root@qemux86-64:~# /etc/init.d/syslog status syslogd (pid 695) is running... klogd (pid 697) is running... root@qemux86-64:~# /etc/init.d/nfsserver status /usr/sbin/rpc.mountd (pid 685) is running... nfsd (pid 683 682 681 680 679 678 677 676) is running... root@qemux86-64:~# /etc/init.d/bootlogd status /sbin/bootlogd is stopped root@qemux86-64:~# /etc/init.d/dbus-1 status /usr/bin/dbus-daemon (pid 704 589) is running... root@qemux86-64:~# /etc/init.d/sshd status /usr/sbin/sshd (pid 627) is running... -- The following changes since commit 57662d4f813d5795cac1529633db80a09efdb089: meta-skeleton: Add busybox config fragment example (2013-08-13 23:03:44 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib jhuang0/r_status_for_daemons_0820_0 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/r_status_for_daemons_0820_0 Jackie Huang (6): dbus: add init.d/dbus-1 status command for LSB compliance sysvinit: add init.d/bootlogd status command for LSB compliance nfs-utils: add init.d/nfsserver status command for LSB compliance openssh: add init.d/sshd status command for LSB compliance sysklogd: add init.d/syslog status command for LSB compliance at: add init.d/atd status command for LSB compliance .../nfs-utils/nfs-utils/nfsserver | 25 - .../openssh/openssh-6.2p2/init | 15 ++- meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init |9 +- meta/recipes-core/sysvinit/sysvinit/bootlogd.init | 28 +--- meta/recipes-extended/at/files/S99at | 13 - meta/recipes-extended/sysklogd/files/sysklogd | 13 - 6 files changed, 93 insertions(+), 10 deletions(-) -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/6] dbus: add init.d/dbus-1 status command for LSB compliance
From: Jackie Huang
Signed-off-by: Li Wang
Signed-off-by: Jackie Huang
---
meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init |9 -
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init
b/meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init
index 0351190..04025e6 100644
--- a/meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init
+++ b/meta/recipes-core/dbus/dbus-1.6.10/dbus-1.init
@@ -16,6 +16,9 @@
set -e
+# Source function library.
+. /etc/init.d/functions
+
DAEMON=@bindir@/dbus-daemon
NAME=dbus
DAEMONUSER=messagebus # must match /etc/dbus-1/system.conf
@@ -99,6 +102,10 @@ case "$1" in
stop)
shut_it_down
;;
+ status)
+status $DAEMON
+exit $?
+ ;;
reload|force-reload)
reload_it
;;
@@ -108,7 +115,7 @@ case "$1" in
start_it_up
;;
*)
-echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}"
>&2
+echo "Usage: /etc/init.d/$NAME
{start|stop|status|restart|reload|force-reload}" >&2
exit 1
;;
esac
--
1.7.4.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] oe.types: add 'path' type
From: Christopher Larson
- path normalization ('normalize' flag, defaults to enabled)
- existence verification for paths we know should exist ('mustexist' flag)
- supports clean handling of relative paths ('relativeto' flag)
Signed-off-by: Christopher Larson
---
meta/lib/oe/types.py | 18 ++
1 file changed, 18 insertions(+)
diff --git a/meta/lib/oe/types.py b/meta/lib/oe/types.py
index 5dac9de..7f47c17 100644
--- a/meta/lib/oe/types.py
+++ b/meta/lib/oe/types.py
@@ -1,4 +1,7 @@
+import errno
import re
+import os
+
class OEList(list):
"""OpenEmbedded 'list' type
@@ -133,3 +136,18 @@ def float(value, fromhex='false'):
return _float.fromhex(value)
else:
return _float(value)
+
+def path(value, relativeto='', normalize='true', mustexist='false'):
+value = os.path.join(relativeto, value)
+
+if boolean(normalize):
+value = os.path.normpath(value)
+
+if boolean(mustexist):
+try:
+open(value, 'r')
+except IOError as exc:
+if exc.errno == errno.ENOENT:
+raise ValueError("{0}: {1}".format(value,
os.strerror(errno.ENOENT)))
+
+return value
--
1.8.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Fix bc segmentation fault.
The following changes since commit 6382979cca1d1c57467f983ba9611f91555b20a9: cronie: fix out of tree build (2013-08-19 11:25:23 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib kangkai/bc http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/bc Kai Kang (1): bc: fix segmentation fault meta/recipes-extended/bc/bc_1.06.bb| 3 ++- .../bc/files/fix-segment-fault.patch | 28 ++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/bc/files/fix-segment-fault.patch -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] bc: fix segmentation fault
When run 'bc -l', it segmentation faults. Apply patch from BLFS to fix it.
Ref:
http://www.mail-archive.com/blfs-support@linuxfromscratch.org/msg04601.html
Signed-off-by: Kai Kang
---
meta/recipes-extended/bc/bc_1.06.bb| 3 ++-
.../bc/files/fix-segment-fault.patch | 28 ++
2 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-extended/bc/files/fix-segment-fault.patch
diff --git a/meta/recipes-extended/bc/bc_1.06.bb
b/meta/recipes-extended/bc/bc_1.06.bb
index fe9c3f4..4b28fad 100644
--- a/meta/recipes-extended/bc/bc_1.06.bb
+++ b/meta/recipes-extended/bc/bc_1.06.bb
@@ -13,7 +13,8 @@ SECTION = "base"
DEPENDS = "flex"
PR = "r2"
-SRC_URI = "${GNU_MIRROR}/bc/bc-${PV}.tar.gz"
+SRC_URI = "${GNU_MIRROR}/bc/bc-${PV}.tar.gz \
+ file://fix-segment-fault.patch "
SRC_URI[md5sum] = "d44b5dddebd8a7a7309aea6c36fda117"
SRC_URI[sha256sum] =
"4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea72c0e33"
diff --git a/meta/recipes-extended/bc/files/fix-segment-fault.patch
b/meta/recipes-extended/bc/files/fix-segment-fault.patch
new file mode 100644
index 000..20c0da2
--- /dev/null
+++ b/meta/recipes-extended/bc/files/fix-segment-fault.patch
@@ -0,0 +1,28 @@
+Upstream-Status: Pending
+
+when run command such as 'echo "a = 13" | bc -l', it segmentation faults.
+This patch is from
http://www.mail-archive.com/blfs-support@linuxfromscratch.org/msg04602.html.
+
+Signed-off-by: Kai Kang
+
+--- bc-1.06/lib/number.c.orig 2003-09-26 21:14:02.0 +
bc-1.06/lib/number.c 2003-09-26 21:14:26.0 +
+@@ -34,6 +34,7 @@
+ #include
+ #include
+ #include
++#include
+ #include /* Prototypes needed for external utility routines. */
+
+ #define bc_rt_warn rt_warn
+--- bc-1.06/bc/load.c.orig 2003-09-26 21:14:14.0 +
bc-1.06/bc/load.c 2003-09-26 21:14:26.0 +
+@@ -156,7 +156,7 @@
+ long label_no;
+ long vaf_name; /* variable, array or function number. */
+ long func;
+- program_counter save_adr;
++ static program_counter save_adr;
+
+ /* Initialize. */
+ str = code;
--
1.8.1.2
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] openssl: avoid NULL pointer dereference in three places
Hi All,
Anybody help me review this?
Thanks,
Xufeng
On 06/04/2013 02:15 PM, Xufeng Zhang wrote:
There are three potential NULL pointer dereference in
EVP_DigestInit_ex(), dh_pub_encode() and dsa_pub_encode()
functions.
Fix them by adding proper null pointer check.
[YOCTO #4600]
[ CQID: WIND00373257 ]
Signed-off-by: Xufeng Zhang
---
...-pointer-dereference-in-EVP_DigestInit_ex.patch | 16 +
...NULL-pointer-dereference-in-dh_pub_encode.patch | 34
meta/recipes-connectivity/openssl/openssl.inc |2 +-
.../recipes-connectivity/openssl/openssl_1.0.1e.bb |2 +
4 files changed, 53 insertions(+), 1 deletions(-)
create mode 100644
meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
create mode 100644
meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch
diff --git
a/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
new file mode 100644
index 000..69924a4
--- /dev/null
+++
b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
@@ -0,0 +1,16 @@
+openssl: avoid NULL pointer dereference in EVP_DigestInit_ex()
+
+We should avoid accessing the type pointer if it's NULL,
+this could happen if ctx->digest is not NULL.
+---
+--- a/crypto/evp/digest.c
b/crypto/evp/digest.c
+@@ -199,7 +199,7 @@
+ return 0;
+ }
+ #endif
+- if (ctx->digest != type)
++ if (type&& (ctx->digest != type))
+ {
+ if (ctx->digest&& ctx->digest->ctx_size)
+ OPENSSL_free(ctx->md_data);
diff --git
a/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch
b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch
new file mode 100644
index 000..642b0ea
--- /dev/null
+++
b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch
@@ -0,0 +1,34 @@
+openssl: avoid NULL pointer dereference in dh_pub_encode()/dsa_pub_encode()
+
+We should avoid accessing the pointer if ASN1_STRING_new()
+allocates memory failed.
+---
+--- a/crypto/dh/dh_ameth.c
b/crypto/dh/dh_ameth.c
+@@ -139,6 +139,12 @@
+ dh=pkey->pkey.dh;
+
+ str = ASN1_STRING_new();
++ if (!str)
++ {
++ DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
++ goto err;
++ }
++
+ str->length = i2d_DHparams(dh,&str->data);
+ if (str->length<= 0)
+ {
+--- a/crypto/dsa/dsa_ameth.c
b/crypto/dsa/dsa_ameth.c
+@@ -148,6 +148,11 @@
+ {
+ ASN1_STRING *str;
+ str = ASN1_STRING_new();
++ if (!str)
++ {
++ DSAerr(DSA_F_DSA_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
++ goto err;
++ }
+ str->length = i2d_DSAparams(dsa,&str->data);
+ if (str->length<= 0)
+ {
diff --git a/meta/recipes-connectivity/openssl/openssl.inc
b/meta/recipes-connectivity/openssl/openssl.inc
index f5b2432..c753a27 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -5,7 +5,7 @@ BUGTRACKER = "http://www.openssl.org/news/vulnerabilities.html";
SECTION = "libs/network"
# Big Jump for OpenSSL 1.0 support with meta-oe
-INC_PR = "r15"
+INC_PR = "r16"
# "openssl | SSLeay" dual license
LICENSE = "openssl"
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
index 61de3a6..afd5576 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
@@ -31,6 +31,8 @@ SRC_URI += "file://configure-targets.patch \
file://openssl_fix_for_x32.patch \
file://openssl-fix-doc.patch \
file://find.pl \
+
file://openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch \
+
file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \
"
SRC_URI[md5sum] = "66bf6f10f060d561929de96f9dfe5b8c"
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] recipe whitespace style questions
On 08/14/2013 09:31 AM, Joe MacDonald wrote: [Re: [OE-core] recipe whitespace style questions] On 13.08.14 (Wed 16:13) Martin Jansa wrote: On Wed, Aug 14, 2013 at 08:51:40AM -0500, Peter A. Bigot wrote: SRC_URI = "file://skeleton \ file://skeleton_test.c \ file://COPYRIGHT \ " which I'll call "none", and; SRC_URI = "file://skeleton \ file://skeleton_test.c \ file://COPYRIGHT" which I'll call "joined". Again, for consistency's sake it would be nice to have a recommendation. I personally prefer "none", which matches the closing bracket style for functions. Next: I've also seen: SRC_URI = " \ file://skeleton \ file://skeleton_test.c \ file://COPYRIGHT \ " I prefer this one (especially for longer variables or entries) or "none", because with "none" it's easier to see where multiline variable ends. Worst is IMHO "joined" because when appending one more line you have to edit 2 lines to move '"' so the diff for review is longer and harder to read than just one added line. +1 To close this out: that's three votes for the style named "none" or the one with separated lines. No objections raised. I'd thought the style guide was part of the Yocto documentation so I could prepare a patch to it, but it appears to only exist (independently) on the Yocto (https://wiki.yoctoproject.org/wiki/Recipe_%26_Patch_Style_Guide) and OpenEmbedded (http://www.openembedded.org/wiki/Styleguide) wiki sites. In lieu of my applying for accounts on those sites and updating them I'll leave it that I think these additions would document the conclusions of this discussion, and are what I'll try to follow in my own Yocto-based recipe development: * Multiple-line continuations should be indented to the level of the content following the introductory quote symbol on the first line. * Alternatively, the first line of a multi-line value may be continued after the introductory quote symbol, with all subsequent content lines indented four spaces (or one tab if within a shell function) * Any closing quote of a multiple-line continuation should be placed at the indentation level of the first continued line. Peter ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/4] [v3] openssh: Add systemd support
On 08/18/2013 11:40 PM, Khem Raj wrote:
On Sun, Aug 18, 2013 at 11:18 PM, Muhammad Shakeel
wrote:
/usr/sbin/ is being sed'ed with ${sbindir} in do_install_append of the
respective recipe file. /usr/bin/ and /bin/ is also taken care of.
i see, thats better. however I do see a need to have a generalized
way of specifying service files and a generic
processing engine which then takes care of it. Otherwise we have the
same code replicated in multiple recipes
Agreed, I think there should be a generalized solution here, implemented
in the systemd.bbclass.
It also appears that this set is also creating a /lib dir that should
not be there for non-systemd builds.
ERROR: Task 25
(/home/sgw/yocto/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb,
do_package) failed with exit code '1'
ERROR: QA Issue: nfs-utils: Files/directories were installed but not shipped
/lib
ERROR: QA run found fatal errors. Please consider fixing them.
ERROR: Function failed: do_package_qa
ERROR: Logfile of failure stored in:
/home/sgw/yocto/builds/world/tmp/work/x86_64-poky-linux/nfs-utils/1.2.8-r0/temp/log.do_package.17558
Thanks
Sau!
___
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
Re: [OE-core] About PACKAGECONFIG audit
Add Joe Slater who owns US17463: PACKAGECONFIG clean-up. On 13-08-15 05:29 AM, wenzong fan wrote: Hi All, We have seen some problems like this: $ bitbake libcap ld: warning: libaudit.so.1, needed by .../lib64/libpam.so, not found .../lib64/libpam.so: undefined reference to `audit_open' .../lib64/libpam.so: undefined reference to `audit_close' .. The libaudit has been available and libpam build with it, after we run another build with sstate-cache and w/o libaudit, the error occurs. The solution in these cases is to use PACKAGECONFIG to lay out dependencies on optional packages and make them explicit. We need to run an audit and catch all of these issues. A probable ways maybe: 1) Run world build to generate the sysroots as much as possible; 2) Run 'configure --help' on each package to spot all of the optional dependencies, and convert them into PACKAGECONFIG specs/or any other prompts. We should try to automate or codify this step so that the output is a list of oe-core package names. 3) Run #1, #2 as an audit script periodically. Or could we run this check as part of a QA build step? Do you mean: scripts/test-dependencies.sh // Randy Thanks Wenzong -- # Randy MacLeod. SMTS, Linux, Wind River Direct: 613.963.1350 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [v2][PATCH 2/2] directfb: add fusion patch for hangs on exit with
directfb: add fusion patch for hangs on exit with
following tests: direct_test, fusion_skirmish
Signed-off-by: Lauren Post
---
meta/recipes-graphics/directfb/directfb.inc|3 +-
.../directfb/directfb/fusion.patch | 36
2 files changed, 38 insertions(+), 1 deletion(-)
create mode 100755 meta/recipes-graphics/directfb/directfb/fusion.patch
diff --git a/meta/recipes-graphics/directfb/directfb.inc
b/meta/recipes-graphics/directfb/directfb.inc
index 60b12f7..a23209f 100644
--- a/meta/recipes-graphics/directfb/directfb.inc
+++ b/meta/recipes-graphics/directfb/directfb.inc
@@ -14,7 +14,8 @@ DEPENDS = "jpeg libpng freetype zlib tslib"
INC_PR = "r0"
SRC_URI =
"http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${PV}.tar.gz \
- file://configurefix.patch"
+ file://configurefix.patch \
+ file://fusion.patch"
S = "${WORKDIR}/DirectFB-${PV}"
diff --git a/meta/recipes-graphics/directfb/directfb/fusion.patch
b/meta/recipes-graphics/directfb/directfb/fusion.patch
new file mode 100755
index 000..1f81a67
--- /dev/null
+++ b/meta/recipes-graphics/directfb/directfb/fusion.patch
@@ -0,0 +1,36 @@
+directfb: Fix for hangs in direct_test, fusion_skirmish on exit
+
+Upstream-Status: Pending
+Signed-off-by: Lauren Post
+
+--- a/lib/fusion/fusion.c 2013-01-18 22:57:11.0 +0800
b/lib/fusion/fusion.c 2013-07-04 10:42:56.502699119 +0800
+@@ -2853,9 +2853,14 @@
+ direct_mutex_lock( &world->event_dispatcher_mutex );
+
+ while (1) {
+- if (!world->event_dispatcher_buffers)
++ if (!world->event_dispatcher_buffers){
+ direct_waitqueue_wait( &world->event_dispatcher_cond,
&world->event_dispatcher_mutex );
+-
++if (world->dispatch_stop) {
++ D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING
(dispatch_stop!)\n" );
++ direct_mutex_unlock( &world->event_dispatcher_mutex
);
++ return NULL;
++}
++ }
+buf = (FusionEventDispatcherBuffer
*)world->event_dispatcher_buffers;
+D_MAGIC_ASSERT( buf, FusionEventDispatcherBuffer );
+
+@@ -2872,6 +2877,11 @@
+ //D_INFO("waiting...\n");
+ D_ASSERT( buf->read_pos == buf->write_pos );
+ direct_waitqueue_wait( &world->event_dispatcher_cond,
&world->event_dispatcher_mutex );
++if (world->dispatch_stop) {
++ D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING
(dispatch_stop!)\n" );
++ direct_mutex_unlock( &world->event_dispatcher_mutex
);
++ return NULL;
++}
+}
+
+buf = (FusionEventDispatcherBuffer
*)world->event_dispatcher_buffers;
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [v2][PATCH 1/2] directfb: Upgrade to 1.6.3
directfb: Upgrade to 1.6.3
Remove mesa patch as 1.6.3 provides compatibility with mesa
Signed-off-by: Lauren Post
---
meta/recipes-graphics/directfb/directfb.inc|3 +-
.../recipes-graphics/directfb/directfb/mesa9.patch | 29
meta/recipes-graphics/directfb/directfb_1.6.1.bb | 27 --
meta/recipes-graphics/directfb/directfb_1.6.3.bb | 26 ++
4 files changed, 27 insertions(+), 58 deletions(-)
delete mode 100644 meta/recipes-graphics/directfb/directfb/mesa9.patch
delete mode 100644 meta/recipes-graphics/directfb/directfb_1.6.1.bb
create mode 100755 meta/recipes-graphics/directfb/directfb_1.6.3.bb
diff --git a/meta/recipes-graphics/directfb/directfb.inc
b/meta/recipes-graphics/directfb/directfb.inc
index 7295c35..60b12f7 100644
--- a/meta/recipes-graphics/directfb/directfb.inc
+++ b/meta/recipes-graphics/directfb/directfb.inc
@@ -14,8 +14,7 @@ DEPENDS = "jpeg libpng freetype zlib tslib"
INC_PR = "r0"
SRC_URI =
"http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${PV}.tar.gz \
- file://configurefix.patch \
- file://mesa9.patch"
+ file://configurefix.patch"
S = "${WORKDIR}/DirectFB-${PV}"
diff --git a/meta/recipes-graphics/directfb/directfb/mesa9.patch
b/meta/recipes-graphics/directfb/directfb/mesa9.patch
deleted file mode 100644
index 43fd5c2..000
--- a/meta/recipes-graphics/directfb/directfb/mesa9.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Patch from upstream to fix build against Mesa 9.
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton
-
-From 54beba0715a4fead2a0aa5477977347f81fc2bc0 Mon Sep 17 00:00:00 2001
-From: Andreas Shimokawa
-Date: Wed, 24 Oct 2012 18:01:15 +0200
-Subject: [PATCH] mesa: fix compatibility with mesa 9.0
-
- systems/mesa/mesa_surface_pool.c |2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/systems/mesa/mesa_surface_pool.c
b/systems/mesa/mesa_surface_pool.c
-index 0a588bb..bfb5ff3 100644
a/systems/mesa/mesa_surface_pool.c
-+++ b/systems/mesa/mesa_surface_pool.c
-@@ -297,7 +297,7 @@ mesaAllocateBuffer( CoreSurfacePool *pool,
- alloc->bo = gbm_bo_create( mesa->gbm, surface->config.size.w,
surface->config.size.h, GBM_BO_FORMAT_ARGB,
-
GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING );
- alloc->handle = gbm_bo_get_handle( alloc->bo ).u32;
-- alloc->pitch = gbm_bo_get_pitch( alloc->bo );
-+ alloc->pitch = gbm_bo_get_stride( alloc->bo );
-
- alloc->image = eglCreateImageKHR( mesa->dpy, NULL,
EGL_NATIVE_PIXMAP_KHR, alloc->bo, NULL );
-
---
-1.7.9.5
diff --git a/meta/recipes-graphics/directfb/directfb_1.6.1.bb
b/meta/recipes-graphics/directfb/directfb_1.6.1.bb
deleted file mode 100644
index 1230d12..000
--- a/meta/recipes-graphics/directfb/directfb_1.6.1.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-require directfb.inc
-
-RV = "1.6-0"
-PR = "${INC_PR}.2"
-
-DEPENDS += "sysfsutils"
-
-SRC_URI += "file://fix-compilation-with-zlib.patch \
-file://rename-no-instrument-function-macro.patch \
-file://fixsepbuild.patch"
-
-EXTRA_OECONF = "\
- --enable-freetype=yes \
- --enable-zlib \
- --with-gfxdrivers=none \
- --disable-sdl \
- --disable-vnc \
- --disable-x11 \
- --disable-imlib2 \
- --disable-mesa \
-"
-
-LEAD_SONAME = "libdirectfb-1.6.so.0"
-
-SRC_URI[md5sum] = "76d3066e75664aa79204af545f2f3c65"
-SRC_URI[sha256sum] =
"f47575ea35dd8a30e548c04bf52d8565756d0bed45d1cf9f8afac1cf9b521c45"
-
diff --git a/meta/recipes-graphics/directfb/directfb_1.6.3.bb
b/meta/recipes-graphics/directfb/directfb_1.6.3.bb
new file mode 100755
index 000..277e9a9
--- /dev/null
+++ b/meta/recipes-graphics/directfb/directfb_1.6.3.bb
@@ -0,0 +1,26 @@
+require directfb.inc
+
+RV = "1.6-0"
+PR = "${INC_PR}.2"
+
+DEPENDS += "sysfsutils"
+
+SRC_URI += "file://fix-compilation-with-zlib.patch \
+file://rename-no-instrument-function-macro.patch \
+file://fixsepbuild.patch"
+
+EXTRA_OECONF = "\
+ --enable-freetype=yes \
+ --enable-zlib \
+ --with-gfxdrivers=none \
+ --disable-sdl \
+ --disable-vnc \
+ --disable-x11 \
+ --disable-imlib2 \
+ --disable-mesa \
+"
+
+LEAD_SONAME = "libdirectfb-1.6.so.0"
+
+SRC_URI[md5sum] = "641e8e999c017770da647f9b5b890906"
+SRC_URI[sha256sum] =
"7a96aced0f69b2ec0810e9923068e61c21e6b19dd593e09394c872414df75e70"
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] a sanity check fix for a better error
From: Nitin A Kamble Here is a commit to give a better error regarding missing required distro features. Thanks, Nitin The following changes since commit 6382979cca1d1c57467f983ba9611f91555b20a9: cronie: fix out of tree build (2013-08-19 11:25:23 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib nitin/misc http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=nitin/misc Nitin A Kamble (1): sanity.bbclass: a new check for required distro features meta/classes/sanity.bbclass | 7 +++ 1 file changed, 7 insertions(+) -- 1.8.1.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] sanity.bbclass: a new check for required distro features
From: Nitin A Kamble
Some BSPs need to have some specific distro_features enabled. These
BSPs fail to build when these required DISTRO features are not
enabled. And the issue is, there is no clue in the build error, about
why the build is failing.
This commit addresses the issue by adding a generic mechanism to
check for enablement of the required distro features.
Now these BSPs can specify in their BSP config, what distro features
are required, and if these are not enabled then appropriate build
error is thrown to help fix the issue.
Signed-off-by: Nitin A Kamble
---
meta/classes/sanity.bbclass | 7 +++
1 file changed, 7 insertions(+)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 4df3ca8..6f9ad5f 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -603,6 +603,13 @@ def check_sanity_everybuild(status, d):
if not ( check_conf_exists("conf/distro/${DISTRO}.conf", d) or
check_conf_exists("conf/distro/include/${DISTRO}.inc", d) ):
status.addresult("DISTRO '%s' not found. Please set a valid DISTRO
in your local.conf\n" % d.getVar("DISTRO", True))
+# check all the required DISTRO_FEATURES are enabled
+distro_features_split = (d.getVar('DISTRO_FEATURES', True) or "").split()
+required_distro_features_split = (d.getVar('REQUIRED_DISTRO_FEATURES',
True) or "").split()
+for rdf in required_distro_features_split:
+if rdf not in distro_features_split:
+status.addresult("%s is required in DISTRO_FEATURES" % rdf)
+
# Check that DL_DIR is set, exists and is writable. In theory, we should
never even hit the check if DL_DIR isn't
# set, since so much relies on it being set.
dldir = d.getVar('DL_DIR', True)
--
1.8.1.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kernel.bbclass, image.bbclass: Implement kernel INITRAMFS dependency and bundling
This patch aims to fix the following two cases for the INITRAMFS generation.
1) Allow an image recipe to specify a paired INITRAMFS recipe such
as core-image-minimal-initramfs. This allows building a base
image which always generates the needed initramfs image in one step
2) Allow building a single binary which contains a kernel and
the initramfs.
A key requirement of the initramfs is to be able to add kernel
modules. The current implementation of the INITRAMFS_IMAGE variable
has a circular dependency when using kernel modules in the initramfs
image.bb file that is caused by kernel.bbclass trying to build the
initramfs before the kernel's do_install rule.
The solution for this problem is to have the kernel's
do_bundle_initramfs_image task depend on the do_rootfs from the
INITRAMFS_IMAGE and not some intermediate point. The image.bbclass
will also sets up dependencies to make the initramfs creation task run
last.
The code to bundle the kernel and initramfs together has been added.
At a high level, all it is doing is invoking a second compilation of
the kernel but changing the value of CONFIG_INITRAMFS_SOURCE to point
to the generated initramfs from the image recipe.
Signed-off-by: Jason Wessel
---
meta/classes/image.bbclass | 12 ++
meta/classes/kernel.bbclass | 96 +--
meta/conf/local.conf.sample | 20 +
3 files changed, 116 insertions(+), 12 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 116bd22..78c25db 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -140,6 +140,10 @@ python () {
d.setVar('MULTILIB_VENDORS', ml_vendor_list)
check_image_features(d)
+initramfs_image = d.getVar('INITRAMFS_IMAGE', True) or ""
+if initramfs_image != "":
+d.appendVarFlag('do_build', 'depends', " %s:do_bundle_initramfs" %
d.getVar('PN', True))
+d.appendVarFlag('do_bundle_initramfs', 'depends', " %s:do_rootfs" %
initramfs_image)
}
#
@@ -614,3 +618,11 @@ do_package_write_deb[noexec] = "1"
do_package_write_rpm[noexec] = "1"
addtask rootfs before do_build
+# Allow the kernel to be repacked with the initramfs and boot image file as a
single file
+do_bundle_initramfs[depends] += "virtual/kernel:do_bundle_initramfs"
+do_bundle_initramfs[nostamp] = "1"
+do_bundle_initramfs[noexec] = "1"
+do_bundle_initramfs () {
+ :
+}
+addtask bundle_initramfs after do_rootfs
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index e039dfc..8cf66ce 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -9,6 +9,7 @@ INHIBIT_DEFAULT_DEPS = "1"
KERNEL_IMAGETYPE ?= "zImage"
INITRAMFS_IMAGE ?= ""
INITRAMFS_TASK ?= ""
+INITRAMFS_IMAGE_BUNDLE ?= ""
python __anonymous () {
kerneltype = d.getVar('KERNEL_IMAGETYPE', True) or ''
@@ -19,7 +20,15 @@ python __anonymous () {
image = d.getVar('INITRAMFS_IMAGE', True)
if image:
-d.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs')
+d.appendVarFlag('do_bundle_initramfs', 'depends', '
${INITRAMFS_IMAGE}:do_rootfs')
+
+# NOTE: setting INITRAMFS_TASK is for backward compatibility
+# The preferred method is to set INITRAMFS_IMAGE, because
+# this INITRAMFS_TASK has circular dependency problems
+# if the initramfs requires kernel modules
+image_task = d.getVar('INITRAMFS_TASK', True)
+if image_task:
+d.appendVarFlag('do_configure', 'depends', ' ${INITRAMFS_TASK}')
}
inherit kernel-arch deploy
@@ -72,9 +81,82 @@ KERNEL_SRC_PATH = "/usr/src/kernel"
KERNEL_IMAGETYPE_FOR_MAKE = "${@(lambda s: s[:-3] if s[-3:] == ".gz" else
s)(d.getVar('KERNEL_IMAGETYPE', True))}"
+copy_initramfs() {
+ echo "Copying initramfs into ./usr ..."
+ # Find and use the first initramfs image archive type we find
+ rm -f ${B}/usr/${INITRAMFS_IMAGE}-${MACHINE}.cpio
+ for img in cpio.gz cpio.lzo cpio.lzma cpio.xz; do
+ if [ -e
"${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" ]; then
+ cp
${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img ${B}/usr/.
+ case $img in
+ *gz)
+ echo "gzip decompressing image"
+ gunzip -f
${B}/usr/${INITRAMFS_IMAGE}-${MACHINE}.$img
+ break
+ ;;
+ *lzo)
+ echo "lzo decompressing image"
+ lzop -df
${B}/usr/${INITRAMFS_IMAGE}-${MACHINE}.$img
+ break
+ ;;
+ *lzma)
+ echo "lzma decompressing image"
+ lzmash -df
${B}/usr/${INITRAMFS_IMAGE}-${MACHINE}.$img
+ break
+ ;;
Re: [OE-core] [PATCH] mesa: add PACKAGECONFIG_DISTRO variable for distro specific options
Am 19.08.2013 18:58, schrieb Paul Eggleton: > On Monday 19 August 2013 18:28:02 Simon Busch wrote: >> Am 19.08.2013 18:09, schrieb Phil Blundell: >>> On Mon, 2013-08-19 at 18:04 +0200, Simon Busch wrote: In some cases as distribution just wants to extend the default PACKAGECONFIG instead of rewriting it completely. Therefor having a PACKAGECONFIG_DISTRO variable which is empty by default and included in PACKAGECONFIG helps a lot. >>> >>> Can't those distros just use PACKAGECONFIG_append? >> >> They can. I tried with PACKAGECONFIG += which didn't worked and I >> thought it would be the same with PACKAGECONFIG_append cause of >> PACKAGECONFIG being weak assignment in mesa.inc. But as it seems += >> takes higher than the weak assignment and overrides PACKAGECONFIG where >> _append only appends. > > It's being set in the recipe with ??= which is the weakest form of > assignment, > so this behaviour is expected. I just tested this in local.conf and it works: > > PACKAGECONFIG_append_pn-mesa = " something" > > BTW, outside of a recipe (or bbappend) you should always use a pn- override > with PACKAGECONFIG or you'll be affecting more than just the recipe you > intend > to. Thank you very much for the good explanation. regards, Simon -- Simon Busch - http://mm.gravedo.de/blog/ ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 08/11] opkg: Add --no-install-recommends option.
On 8/19/13 1:08 PM, Saul Wold wrote:
On 08/14/2013 01:30 PM, Mark Hatle wrote:
The new --no-install-recommends option is similar to the behavior of
apt-get's --no-install-recommedns. Only required packages will be
installed.
Signed-off-by: Mark Hatle
---
.../opkg/opkg/no-install-recommends.patch | 78
++
meta/recipes-devtools/opkg/opkg_svn.bb | 4 +-
2 files changed, 81 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-devtools/opkg/opkg/no-install-recommends.patch
diff --git a/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch
b/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch
new file mode 100644
index 000..f71b027
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch
@@ -0,0 +1,78 @@
+Add the ability to not install ANY recommended packages.
+
+Upstream-status: Pending
Upstream-Status: here, in add-exclude.patch and
smart-config-ignore-all-recommends.patch
I've updated these three and pushed to poky-contrib mhatle/oe-core-remove
(note, there are a few patches there that are NOT part of this set. So be sure
to take only the top 11.)
--Mark
Thanks
Sau!
+
+Signed-off-by: Mark Hatle
+
+Index: trunk/libopkg/opkg_conf.h
+===
+--- trunk.orig/libopkg/opkg_conf.h
trunk/libopkg/opkg_conf.h
+@@ -80,6 +80,7 @@ struct opkg_conf
+ int prefer_arch_to_version;
+ int check_signature;
+ int nodeps; /* do not follow dependencies */
++ int noinstall_recommends;
+ char *offline_root;
+ char *overlay_root;
+ int query_all;
+Index: trunk/libopkg/pkg_depends.c
+===
+--- trunk.orig/libopkg/pkg_depends.c
trunk/libopkg/pkg_depends.c
+@@ -19,6 +19,7 @@
+ #include
+
+ #include "pkg.h"
++#include "opkg_conf.h"
+ #include "opkg_utils.h"
+ #include "pkg_hash.h"
+ #include "opkg_message.h"
+@@ -204,7 +205,7 @@ pkg_hash_fetch_unsatisfied_dependencies(
+ /* user request overrides package recommendation */
+ if (satisfying_pkg != NULL
+ && (compound_depend->type == RECOMMEND ||
compound_depend->type == SUGGEST)
+- && (satisfying_pkg->state_want == SW_DEINSTALL ||
satisfying_pkg->state_want == SW_PURGE)) {
++ && (satisfying_pkg->state_want == SW_DEINSTALL ||
satisfying_pkg->state_want == SW_PURGE || conf->noinstall_recommends)) {
+opkg_msg(NOTICE, "%s: ignoring recommendation for "
+ "%s at user request\n",
+ pkg->name, satisfying_pkg->name);
+Index: trunk/src/opkg-cl.c
+===
+--- trunk.orig/src/opkg-cl.c
trunk/src/opkg-cl.c
+@@ -50,6 +50,7 @@ enum {
+ ARGS_OPT_NODEPS,
+ ARGS_OPT_AUTOREMOVE,
+ ARGS_OPT_CACHE,
++ ARGS_OPT_NOINSTALL_RECOMMENDS,
+ };
+
+ static struct option long_options[] = {
+@@ -89,6 +90,7 @@ static struct option long_options[] = {
+ {"noaction", 0, 0, ARGS_OPT_NOACTION},
+ {"download-only", 0, 0, ARGS_OPT_DOWNLOAD_ONLY},
+ {"nodeps", 0, 0, ARGS_OPT_NODEPS},
++ {"no-install-recommends", 0, 0, ARGS_OPT_NOINSTALL_RECOMMENDS},
+ {"offline", 1, 0, 'o'},
+ {"offline-root", 1, 0, 'o'},
+ {"add-arch", 1, 0, ARGS_OPT_ADD_ARCH},
+@@ -199,6 +201,9 @@ args_parse(int argc, char *argv[])
+ case ARGS_OPT_NOACTION:
+ conf->noaction = 1;
+ break;
++ case ARGS_OPT_NOINSTALL_RECOMMENDS:
++ conf->noinstall_recommends = 1;
++ break;
+ case ARGS_OPT_DOWNLOAD_ONLY:
+ conf->download_only = 1;
+ break;
+@@ -293,6 +298,8 @@ usage()
+ printf("\t--noaction No action -- test only\n");
+ printf("\t--download-only No action -- download only\n");
+ printf("\t--nodeps Do not follow dependencies\n");
++ printf("\t--no-install-recommends\n");
++ printf("\t Do not install any recommended
packages\n");
+ printf("\t--force-removal-of-dependent-packages\n");
+ printf("\t Remove package and all dependencies\n");
+ printf("\t--autoremove Remove packages that were
installed\n");
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb
b/meta/recipes-devtools/opkg/opkg_svn.bb
index 032578d..dbfca0f 100644
--- a/meta/recipes-devtools/opkg/opkg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
@@ -1,6 +1,8 @@
require opkg.inc
-SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;protocol=http"
+SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;protocol=http \
+ file://no-install-recommends.patch \
+"
S = "${WORKDIR}/trunk"
Re: [OE-core] [PATCH 08/11] opkg: Add --no-install-recommends option.
On 08/14/2013 01:30 PM, Mark Hatle wrote:
The new --no-install-recommends option is similar to the behavior of
apt-get's --no-install-recommedns. Only required packages will be
installed.
Signed-off-by: Mark Hatle
---
.../opkg/opkg/no-install-recommends.patch | 78 ++
meta/recipes-devtools/opkg/opkg_svn.bb | 4 +-
2 files changed, 81 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-devtools/opkg/opkg/no-install-recommends.patch
diff --git a/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch
b/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch
new file mode 100644
index 000..f71b027
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch
@@ -0,0 +1,78 @@
+Add the ability to not install ANY recommended packages.
+
+Upstream-status: Pending
Upstream-Status: here, in add-exclude.patch and
smart-config-ignore-all-recommends.patch
Thanks
Sau!
+
+Signed-off-by: Mark Hatle
+
+Index: trunk/libopkg/opkg_conf.h
+===
+--- trunk.orig/libopkg/opkg_conf.h
trunk/libopkg/opkg_conf.h
+@@ -80,6 +80,7 @@ struct opkg_conf
+ int prefer_arch_to_version;
+ int check_signature;
+ int nodeps; /* do not follow dependencies */
++ int noinstall_recommends;
+ char *offline_root;
+ char *overlay_root;
+ int query_all;
+Index: trunk/libopkg/pkg_depends.c
+===
+--- trunk.orig/libopkg/pkg_depends.c
trunk/libopkg/pkg_depends.c
+@@ -19,6 +19,7 @@
+ #include
+
+ #include "pkg.h"
++#include "opkg_conf.h"
+ #include "opkg_utils.h"
+ #include "pkg_hash.h"
+ #include "opkg_message.h"
+@@ -204,7 +205,7 @@ pkg_hash_fetch_unsatisfied_dependencies(
+ /* user request overrides package recommendation */
+ if (satisfying_pkg != NULL
+ && (compound_depend->type == RECOMMEND ||
compound_depend->type == SUGGEST)
+- && (satisfying_pkg->state_want == SW_DEINSTALL ||
satisfying_pkg->state_want == SW_PURGE)) {
++ && (satisfying_pkg->state_want == SW_DEINSTALL ||
satisfying_pkg->state_want == SW_PURGE || conf->noinstall_recommends)) {
+opkg_msg(NOTICE, "%s: ignoring recommendation for "
+ "%s at user request\n",
+ pkg->name, satisfying_pkg->name);
+Index: trunk/src/opkg-cl.c
+===
+--- trunk.orig/src/opkg-cl.c
trunk/src/opkg-cl.c
+@@ -50,6 +50,7 @@ enum {
+ ARGS_OPT_NODEPS,
+ ARGS_OPT_AUTOREMOVE,
+ ARGS_OPT_CACHE,
++ ARGS_OPT_NOINSTALL_RECOMMENDS,
+ };
+
+ static struct option long_options[] = {
+@@ -89,6 +90,7 @@ static struct option long_options[] = {
+ {"noaction", 0, 0, ARGS_OPT_NOACTION},
+ {"download-only", 0, 0, ARGS_OPT_DOWNLOAD_ONLY},
+ {"nodeps", 0, 0, ARGS_OPT_NODEPS},
++ {"no-install-recommends", 0, 0, ARGS_OPT_NOINSTALL_RECOMMENDS},
+ {"offline", 1, 0, 'o'},
+ {"offline-root", 1, 0, 'o'},
+ {"add-arch", 1, 0, ARGS_OPT_ADD_ARCH},
+@@ -199,6 +201,9 @@ args_parse(int argc, char *argv[])
+ case ARGS_OPT_NOACTION:
+ conf->noaction = 1;
+ break;
++ case ARGS_OPT_NOINSTALL_RECOMMENDS:
++ conf->noinstall_recommends = 1;
++ break;
+ case ARGS_OPT_DOWNLOAD_ONLY:
+ conf->download_only = 1;
+ break;
+@@ -293,6 +298,8 @@ usage()
+ printf("\t--noaction No action -- test only\n");
+ printf("\t--download-only No action -- download only\n");
+ printf("\t--nodeps Do not follow dependencies\n");
++ printf("\t--no-install-recommends\n");
++ printf("\t Do not install any recommended
packages\n");
+ printf("\t--force-removal-of-dependent-packages\n");
+ printf("\t Remove package and all dependencies\n");
+ printf("\t--autoremove Remove packages that were
installed\n");
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb
b/meta/recipes-devtools/opkg/opkg_svn.bb
index 032578d..dbfca0f 100644
--- a/meta/recipes-devtools/opkg/opkg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
@@ -1,6 +1,8 @@
require opkg.inc
-SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;protocol=http"
+SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;protocol=http \
+ file://no-install-recommends.patch \
+"
S = "${WORKDIR}/trunk"
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] mesa: add PACKAGECONFIG_DISTRO variable for distro specific options
On Monday 19 August 2013 18:28:02 Simon Busch wrote: > Am 19.08.2013 18:09, schrieb Phil Blundell: > > On Mon, 2013-08-19 at 18:04 +0200, Simon Busch wrote: > >> In some cases as distribution just wants to extend the default > >> PACKAGECONFIG instead of rewriting it completely. Therefor having a > >> PACKAGECONFIG_DISTRO variable which is empty by default and included in > >> PACKAGECONFIG helps a lot. > > > > Can't those distros just use PACKAGECONFIG_append? > > They can. I tried with PACKAGECONFIG += which didn't worked and I > thought it would be the same with PACKAGECONFIG_append cause of > PACKAGECONFIG being weak assignment in mesa.inc. But as it seems += > takes higher than the weak assignment and overrides PACKAGECONFIG where > _append only appends. It's being set in the recipe with ??= which is the weakest form of assignment, so this behaviour is expected. I just tested this in local.conf and it works: PACKAGECONFIG_append_pn-mesa = " something" BTW, outside of a recipe (or bbappend) you should always use a pn- override with PACKAGECONFIG or you'll be affecting more than just the recipe you intend to. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/25] Review and ACK
On 08/19/2013 09:36 AM, Paul Eggleton wrote: On Monday 19 August 2013 09:19:55 Saul Wold wrote: Here is the latest C-Pull, I built this over the weekend with other bits. The build resulted with some issues, so I removed the offending bits (Python3). The libxext-native, I put in and then took out, but we do have a F19 issue that needs resolution There is a poky.conf change that matches with Otavio's DISTRO_FEATURES patch, please review that also. Thanks Sau! The following changes since commit fd9e591f266e1a6c183e77f24e50d31e0d52bdd5: cronie: fix out of tree build (2013-08-19 11:24:51 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib sgw/stage http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/ stage Bruce Ashfield (2): linux-yocto-3.8/meta: update drm and intel power management settings linux-yocto-3.8/meta: enable ALTIVEC for qemuppc Chen Qi (4): useradd.bbclass: add missing functions to preinst init-install.sh: improve hard drive searching process init-install.sh: fix to handle the boot partition correctly initscripts: remove obsolete device_table.txt Chunrong Guo (1): genext2fs: fix memory corruption on powerpc This is the earlier version that doesn't use the correct Upstream-Status (Chunrong posted a v2). Updated in the branch Jackie Huang (1): texinfo: handle correctly @enumerate specification greater than 10 Joe Slater (2): coreutils: add PACKAGECONFIG info for acl support act -> acl in commit message Fixed in the branch. coreutils: allow for acl support Khem Raj (3): qemuppc: Change default tune to 74xx uclibc: Upgrade to latest on git tune-ppc7400.inc: Add tune file Mark Hatle (1): prelink: update to latest cross-prelink Marko Lindqvist (6): glib-2.0: use trim_version() to get the source directory pixman: update to upstream version 0.30.2 curl: update to upstream version 7.32.0 glib-2.0: update to upstream version 2.36.4 gtk+: update to upstream version 2.24.20 gettext: update to upstream version 0.18.3 Otavio Salvador (2): default-distrovars.inc: Add 'DISTRO_FEATURES_DEFAULT' variable linux-dtb.inc: Fix dtb generation for kernels newer than 3.8 Paul Eggleton (1): tslib: update to 1.1 Yang Shi (2): Revert "hello-mod: Ensure the produced package name begins with kernel-module-" hello-mod: Add comment for kernel module package naming Everything else looks OK. Cheers, Paul ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/25] Review and ACK
On Monday 19 August 2013 09:19:55 Saul Wold wrote: > Here is the latest C-Pull, I built this over the weekend with > other bits. The build resulted with some issues, so I removed > the offending bits (Python3). > > The libxext-native, I put in and then took out, but we do have a > F19 issue that needs resolution > > There is a poky.conf change that matches with Otavio's DISTRO_FEATURES > patch, please review that also. > > Thanks > Sau! > > The following changes since commit fd9e591f266e1a6c183e77f24e50d31e0d52bdd5: > > cronie: fix out of tree build (2013-08-19 11:24:51 +0100) > > are available in the git repository at: > > git://git.openembedded.org/openembedded-core-contrib sgw/stage > > http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/ > stage > > Bruce Ashfield (2): > linux-yocto-3.8/meta: update drm and intel power management settings > linux-yocto-3.8/meta: enable ALTIVEC for qemuppc > > Chen Qi (4): > useradd.bbclass: add missing functions to preinst > init-install.sh: improve hard drive searching process > init-install.sh: fix to handle the boot partition correctly > initscripts: remove obsolete device_table.txt > > Chunrong Guo (1): > genext2fs: fix memory corruption on powerpc This is the earlier version that doesn't use the correct Upstream-Status (Chunrong posted a v2). > Jackie Huang (1): > texinfo: handle correctly @enumerate specification greater than 10 > > Joe Slater (2): > coreutils: add PACKAGECONFIG info for acl support act -> acl in commit message > coreutils: allow for acl support > > Khem Raj (3): > qemuppc: Change default tune to 74xx > uclibc: Upgrade to latest on git > tune-ppc7400.inc: Add tune file > > Mark Hatle (1): > prelink: update to latest cross-prelink > > Marko Lindqvist (6): > glib-2.0: use trim_version() to get the source directory > pixman: update to upstream version 0.30.2 > curl: update to upstream version 7.32.0 > glib-2.0: update to upstream version 2.36.4 > gtk+: update to upstream version 2.24.20 > gettext: update to upstream version 0.18.3 > > Otavio Salvador (2): > default-distrovars.inc: Add 'DISTRO_FEATURES_DEFAULT' variable > linux-dtb.inc: Fix dtb generation for kernels newer than 3.8 > > Paul Eggleton (1): > tslib: update to 1.1 > > Yang Shi (2): > Revert "hello-mod: Ensure the produced package name begins with > kernel-module-" > hello-mod: Add comment for kernel module package naming Everything else looks OK. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] mesa: add PACKAGECONFIG_DISTRO variable for distro specific options
Am 19.08.2013 18:09, schrieb Phil Blundell: > On Mon, 2013-08-19 at 18:04 +0200, Simon Busch wrote: >> In some cases as distribution just wants to extend the default PACKAGECONFIG >> instead of >> rewriting it completely. Therefor having a PACKAGECONFIG_DISTRO variable >> which is empty >> by default and included in PACKAGECONFIG helps a lot. > > Can't those distros just use PACKAGECONFIG_append? They can. I tried with PACKAGECONFIG += which didn't worked and I thought it would be the same with PACKAGECONFIG_append cause of PACKAGECONFIG being weak assignment in mesa.inc. But as it seems += takes higher than the weak assignment and overrides PACKAGECONFIG where _append only appends. regards, Simon -- Simon Busch - http://mm.gravedo.de/blog/ ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED PULL 00/25] Review and ACK
Paul, Ross:
Here is the latest C-Pull, I built this over the weekend with
other bits. The build resulted with some issues, so I removed
the offending bits (Python3).
The libxext-native, I put in and then took out, but we do have a
F19 issue that needs resolution
There is a poky.conf change that matches with Otavio's DISTRO_FEATURES
patch, please review that also.
Thanks
Sau!
The following changes since commit fd9e591f266e1a6c183e77f24e50d31e0d52bdd5:
cronie: fix out of tree build (2013-08-19 11:24:51 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/stage
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
Bruce Ashfield (2):
linux-yocto-3.8/meta: update drm and intel power management settings
linux-yocto-3.8/meta: enable ALTIVEC for qemuppc
Chen Qi (4):
useradd.bbclass: add missing functions to preinst
init-install.sh: improve hard drive searching process
init-install.sh: fix to handle the boot partition correctly
initscripts: remove obsolete device_table.txt
Chunrong Guo (1):
genext2fs: fix memory corruption on powerpc
Jackie Huang (1):
texinfo: handle correctly @enumerate specification greater than 10
Joe Slater (2):
coreutils: add PACKAGECONFIG info for acl support
coreutils: allow for acl support
Khem Raj (3):
qemuppc: Change default tune to 74xx
uclibc: Upgrade to latest on git
tune-ppc7400.inc: Add tune file
Mark Hatle (1):
prelink: update to latest cross-prelink
Marko Lindqvist (6):
glib-2.0: use trim_version() to get the source directory
pixman: update to upstream version 0.30.2
curl: update to upstream version 7.32.0
glib-2.0: update to upstream version 2.36.4
gtk+: update to upstream version 2.24.20
gettext: update to upstream version 0.18.3
Otavio Salvador (2):
default-distrovars.inc: Add 'DISTRO_FEATURES_DEFAULT' variable
linux-dtb.inc: Fix dtb generation for kernels newer than 3.8
Paul Eggleton (1):
tslib: update to 1.1
Yang Shi (2):
Revert "hello-mod: Ensure the produced package name begins with
kernel-module-"
hello-mod: Add comment for kernel module package naming
.../recipes-kernel/hello-mod/hello-mod_0.1.bb | 9 +-
meta/classes/useradd.bbclass | 3 +
meta/conf/distro/include/default-distrovars.inc| 3 +-
meta/conf/machine/include/tune-ppc7400.inc | 14 +
meta/conf/machine/qemuppc.conf | 2 +-
meta/recipes-bsp/grub/grub-2.00/40_custom | 2 +-
meta/recipes-core/coreutils/coreutils_6.9.bb | 11 +
meta/recipes-core/coreutils/coreutils_8.21.bb | 12 +-
.../parallel.patch | 0
.../gettext/gettext-minimal-0.18.2/aclocal.tgz | Bin 37504 -> 0 bytes
.../COPYING| 0
.../Makefile.in.in | 3 +-
.../Makevars.template | 0
.../gettext/gettext-minimal-0.18.3/aclocal.tgz | Bin 0 -> 37586 bytes
.../config.rpath | 2 +-
.../remove-potcdate.sin| 0
..._0.18.2.bb => gettext-minimal-native_0.18.3.bb} | 0
.../{gettext_0.18.2.bb => gettext_0.18.3.bb} | 5 +-
.../{glib-2.0_2.36.3.bb => glib-2.0_2.36.4.bb} | 6 +-
.../initrdscripts/files/init-install.sh| 160 ++--
.../initscripts/initscripts-1.0/device_table.txt | 197 -
meta/recipes-core/initscripts/initscripts_1.0.bb | 2 -
meta/recipes-core/uclibc/uclibc-git.inc| 3 +-
meta/recipes-core/uclibc/uclibc.inc| 2 +-
.../fix-memory-corruption-on-powerpc.patch | 76 ++
meta/recipes-devtools/genext2fs/genext2fs_1.4.1.bb | 3 +-
meta/recipes-devtools/prelink/prelink_git.bb | 3 +-
.../texinfo-5.1/enumerate_greater_than_ten.patch | 51 ++
meta/recipes-extended/texinfo/texinfo_5.1.bb | 1 +
...utton-do-not-prelight-in-touchscreen-mode.patch | 0
...Duplicate-the-exec-string-returned-by-gtk.patch | 0
.../cellrenderer-cairo.patch | 0
.../configure-nm.patch | 0
.../configurefix.patch | 0
.../{gtk+-2.24.18 => gtk+-2.24.20}/doc-fixes.patch | 0
.../entry-cairo.patch | 0
.../hardcoded_libtool.patch| 0
.../{gtk+-2.24.18 => gtk+-2.24.20}/no-demos.patch | 0
.../run-iconcache.patch| 0
.../toggle-font.diff | 0
.../{gtk+-2.24.18 => gtk+-2.24.20}/xsettings.patch | 0
.../gtk+/{gtk+_2.24.18.bb => gtk+_2.24.20.bb} | 8 +-
.../tslib/0001-Link-plugins-against-libts.patch| 57 --
.../tslib/tslib/32bitBE-support.patch | 55 --
.../recipes-graphics/tslib/tslib/fix_version.patch | 34 -
meta/recipes-graphics/tslib/tslib/multievent.patch | 845 -
.../ts
Re: [OE-core] [PATCH] mesa: add PACKAGECONFIG_DISTRO variable for distro specific options
On Mon, 2013-08-19 at 18:04 +0200, Simon Busch wrote: > In some cases as distribution just wants to extend the default PACKAGECONFIG > instead of > rewriting it completely. Therefor having a PACKAGECONFIG_DISTRO variable > which is empty > by default and included in PACKAGECONFIG helps a lot. Can't those distros just use PACKAGECONFIG_append? p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] mesa: add PACKAGECONFIG_DISTRO variable for distro specific options
In some cases as distribution just wants to extend the default PACKAGECONFIG
instead of
rewriting it completely. Therefor having a PACKAGECONFIG_DISTRO variable which
is empty
by default and included in PACKAGECONFIG helps a lot.
Signed-off-by: Simon Busch
---
meta/recipes-graphics/mesa/mesa.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-graphics/mesa/mesa.inc
b/meta/recipes-graphics/mesa/mesa.inc
index 447e186..2875158 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -23,9 +23,11 @@ inherit autotools pkgconfig pythonnative gettext
EXTRA_OECONF = "--enable-shared-glapi"
+PACKAGECONFIG_DISTRO ??= ""
PACKAGECONFIG ??= "egl gles dri \
${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\
${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '',
d)}\
+ ${PACKAGECONFIG_DISTRO} \
"
X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage
libxfixes"
--
1.8.1.2
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] directfb: add fusion patch to fix hangs
On 08/19/2013 07:02 AM, Lauren Post wrote:
Fixes test cases in 1.6.3 that had incomplete rendering
caused by hangs
Upstream-Status: Pending
Signed-off-by: Lauren Post
---
meta/recipes-graphics/directfb/directfb.inc|3 +-
.../directfb/directfb/fusion.patch | 31
2 files changed, 33 insertions(+), 1 deletion(-)
create mode 100755 meta/recipes-graphics/directfb/directfb/fusion.patch
diff --git a/meta/recipes-graphics/directfb/directfb.inc
b/meta/recipes-graphics/directfb/directfb.inc
index 60b12f7..a23209f 100644
--- a/meta/recipes-graphics/directfb/directfb.inc
+++ b/meta/recipes-graphics/directfb/directfb.inc
@@ -14,7 +14,8 @@ DEPENDS = "jpeg libpng freetype zlib tslib"
INC_PR = "r0"
SRC_URI =
"http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${PV}.tar.gz \
- file://configurefix.patch"
+ file://configurefix.patch \
+ file://fusion.patch"
S = "${WORKDIR}/DirectFB-${PV}"
diff --git a/meta/recipes-graphics/directfb/directfb/fusion.patch
b/meta/recipes-graphics/directfb/directfb/fusion.patch
new file mode 100755
index 000..f2a095a
--- /dev/null
+++ b/meta/recipes-graphics/directfb/directfb/fusion.patch
The Upstream-Status: tag goes here along with a patch sign-off, the
commit itself also needs a signoff.
Thanks
Sau!
@@ -0,0 +1,31 @@
+--- a/lib/fusion/fusion.c 2013-01-18 22:57:11.0 +0800
b/lib/fusion/fusion.c 2013-07-04 10:42:56.502699119 +0800
+@@ -2853,9 +2853,14 @@
+ direct_mutex_lock( &world->event_dispatcher_mutex );
+
+ while (1) {
+- if (!world->event_dispatcher_buffers)
++ if (!world->event_dispatcher_buffers){
+ direct_waitqueue_wait( &world->event_dispatcher_cond,
&world->event_dispatcher_mutex );
+-
++if (world->dispatch_stop) {
++ D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING
(dispatch_stop!)\n" );
++ direct_mutex_unlock( &world->event_dispatcher_mutex
);
++ return NULL;
++}
++ }
+buf = (FusionEventDispatcherBuffer
*)world->event_dispatcher_buffers;
+D_MAGIC_ASSERT( buf, FusionEventDispatcherBuffer );
+
+@@ -2872,6 +2877,11 @@
+ //D_INFO("waiting...\n");
+ D_ASSERT( buf->read_pos == buf->write_pos );
+ direct_waitqueue_wait( &world->event_dispatcher_cond,
&world->event_dispatcher_mutex );
++if (world->dispatch_stop) {
++ D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING
(dispatch_stop!)\n" );
++ direct_mutex_unlock( &world->event_dispatcher_mutex
);
++ return NULL;
++}
+}
+
+buf = (FusionEventDispatcherBuffer
*)world->event_dispatcher_buffers;
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] directfb: add fusion patch to fix hangs
Fixes test cases in 1.6.3 that had incomplete rendering
caused by hangs
Upstream-Status: Pending
Signed-off-by: Lauren Post
---
meta/recipes-graphics/directfb/directfb.inc|3 +-
.../directfb/directfb/fusion.patch | 31
2 files changed, 33 insertions(+), 1 deletion(-)
create mode 100755 meta/recipes-graphics/directfb/directfb/fusion.patch
diff --git a/meta/recipes-graphics/directfb/directfb.inc
b/meta/recipes-graphics/directfb/directfb.inc
index 60b12f7..a23209f 100644
--- a/meta/recipes-graphics/directfb/directfb.inc
+++ b/meta/recipes-graphics/directfb/directfb.inc
@@ -14,7 +14,8 @@ DEPENDS = "jpeg libpng freetype zlib tslib"
INC_PR = "r0"
SRC_URI =
"http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${PV}.tar.gz \
- file://configurefix.patch"
+ file://configurefix.patch \
+ file://fusion.patch"
S = "${WORKDIR}/DirectFB-${PV}"
diff --git a/meta/recipes-graphics/directfb/directfb/fusion.patch
b/meta/recipes-graphics/directfb/directfb/fusion.patch
new file mode 100755
index 000..f2a095a
--- /dev/null
+++ b/meta/recipes-graphics/directfb/directfb/fusion.patch
@@ -0,0 +1,31 @@
+--- a/lib/fusion/fusion.c 2013-01-18 22:57:11.0 +0800
b/lib/fusion/fusion.c 2013-07-04 10:42:56.502699119 +0800
+@@ -2853,9 +2853,14 @@
+ direct_mutex_lock( &world->event_dispatcher_mutex );
+
+ while (1) {
+- if (!world->event_dispatcher_buffers)
++ if (!world->event_dispatcher_buffers){
+ direct_waitqueue_wait( &world->event_dispatcher_cond,
&world->event_dispatcher_mutex );
+-
++if (world->dispatch_stop) {
++ D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING
(dispatch_stop!)\n" );
++ direct_mutex_unlock( &world->event_dispatcher_mutex
);
++ return NULL;
++}
++ }
+buf = (FusionEventDispatcherBuffer
*)world->event_dispatcher_buffers;
+D_MAGIC_ASSERT( buf, FusionEventDispatcherBuffer );
+
+@@ -2872,6 +2877,11 @@
+ //D_INFO("waiting...\n");
+ D_ASSERT( buf->read_pos == buf->write_pos );
+ direct_waitqueue_wait( &world->event_dispatcher_cond,
&world->event_dispatcher_mutex );
++if (world->dispatch_stop) {
++ D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING
(dispatch_stop!)\n" );
++ direct_mutex_unlock( &world->event_dispatcher_mutex
);
++ return NULL;
++}
+}
+
+buf = (FusionEventDispatcherBuffer
*)world->event_dispatcher_buffers;
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] directfb: Upgrade to 1.6.3
Remove mesa patch as 1.6.3 provides compatibility with mesa
Signed-off-by: Lauren Post
---
meta/recipes-graphics/directfb/directfb.inc|3 +-
.../recipes-graphics/directfb/directfb/mesa9.patch | 29
.../{directfb_1.6.1.bb => directfb_1.6.3.bb} |5 ++--
3 files changed, 3 insertions(+), 34 deletions(-)
delete mode 100644 meta/recipes-graphics/directfb/directfb/mesa9.patch
rename meta/recipes-graphics/directfb/{directfb_1.6.1.bb => directfb_1.6.3.bb}
(76%)
mode change 100644 => 100755
diff --git a/meta/recipes-graphics/directfb/directfb.inc
b/meta/recipes-graphics/directfb/directfb.inc
index 7295c35..60b12f7 100644
--- a/meta/recipes-graphics/directfb/directfb.inc
+++ b/meta/recipes-graphics/directfb/directfb.inc
@@ -14,8 +14,7 @@ DEPENDS = "jpeg libpng freetype zlib tslib"
INC_PR = "r0"
SRC_URI =
"http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${PV}.tar.gz \
- file://configurefix.patch \
- file://mesa9.patch"
+ file://configurefix.patch"
S = "${WORKDIR}/DirectFB-${PV}"
diff --git a/meta/recipes-graphics/directfb/directfb/mesa9.patch
b/meta/recipes-graphics/directfb/directfb/mesa9.patch
deleted file mode 100644
index 43fd5c2..000
--- a/meta/recipes-graphics/directfb/directfb/mesa9.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Patch from upstream to fix build against Mesa 9.
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton
-
-From 54beba0715a4fead2a0aa5477977347f81fc2bc0 Mon Sep 17 00:00:00 2001
-From: Andreas Shimokawa
-Date: Wed, 24 Oct 2012 18:01:15 +0200
-Subject: [PATCH] mesa: fix compatibility with mesa 9.0
-
- systems/mesa/mesa_surface_pool.c |2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/systems/mesa/mesa_surface_pool.c
b/systems/mesa/mesa_surface_pool.c
-index 0a588bb..bfb5ff3 100644
a/systems/mesa/mesa_surface_pool.c
-+++ b/systems/mesa/mesa_surface_pool.c
-@@ -297,7 +297,7 @@ mesaAllocateBuffer( CoreSurfacePool *pool,
- alloc->bo = gbm_bo_create( mesa->gbm, surface->config.size.w,
surface->config.size.h, GBM_BO_FORMAT_ARGB,
-
GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING );
- alloc->handle = gbm_bo_get_handle( alloc->bo ).u32;
-- alloc->pitch = gbm_bo_get_pitch( alloc->bo );
-+ alloc->pitch = gbm_bo_get_stride( alloc->bo );
-
- alloc->image = eglCreateImageKHR( mesa->dpy, NULL,
EGL_NATIVE_PIXMAP_KHR, alloc->bo, NULL );
-
---
-1.7.9.5
diff --git a/meta/recipes-graphics/directfb/directfb_1.6.1.bb
b/meta/recipes-graphics/directfb/directfb_1.6.3.bb
old mode 100644
new mode 100755
similarity index 76%
rename from meta/recipes-graphics/directfb/directfb_1.6.1.bb
rename to meta/recipes-graphics/directfb/directfb_1.6.3.bb
index 1230d12..277e9a9
--- a/meta/recipes-graphics/directfb/directfb_1.6.1.bb
+++ b/meta/recipes-graphics/directfb/directfb_1.6.3.bb
@@ -22,6 +22,5 @@ EXTRA_OECONF = "\
LEAD_SONAME = "libdirectfb-1.6.so.0"
-SRC_URI[md5sum] = "76d3066e75664aa79204af545f2f3c65"
-SRC_URI[sha256sum] =
"f47575ea35dd8a30e548c04bf52d8565756d0bed45d1cf9f8afac1cf9b521c45"
-
+SRC_URI[md5sum] = "641e8e999c017770da647f9b5b890906"
+SRC_URI[sha256sum] =
"7a96aced0f69b2ec0810e9923068e61c21e6b19dd593e09394c872414df75e70"
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] cronie: upgrade to 1.4.11
On Monday 19 August 2013 09:24:54 Paul Eggleton wrote: > Hi Cristiana, > > On Friday 16 August 2013 11:30:49 Cristiana Voicu wrote: > > LIC_FILES_CHKSUM changed because cron.h doesn't exist anymore. > > Replaced it with cron.c. > > > >... > > A couple of people have reported this doesn't build, and I've confirmed it > this morning: Ah, I see Saul already sent a patch for this, sorry I didn't see it before. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] cronie: upgrade to 1.4.11
Hi Cristiana, On Friday 16 August 2013 11:30:49 Cristiana Voicu wrote: > LIC_FILES_CHKSUM changed because cron.h doesn't exist anymore. > Replaced it with cron.c. >... A couple of people have reported this doesn't build, and I've confirmed it this morning: | mips-poky-linux-gcc -meb -mabi=32 -mhard-float -march=mips32 --sysroot=/media/large/tmp/sysroots/qemumips -DHAVE_CONFIG_H -I. -I/media/large/tmp/work/mips32-poky-linux/cronie/1.4.11-r0/cronie-1.4.11/src -I.. -O2 -pipe -g -feliminate-unused-debug-types -c /media/large/tmp/work/mips32-poky-linux/cronie/1.4.11-r0/cronie-1.4.11/src/database.c | /media/large/tmp/work/mips32-poky-linux/cronie/1.4.11-r0/cronie-1.4.11/src/security.c:32:27: fatal error: cronie_common.h: No such file or directory | #include "cronie_common.h" |^ | compilation terminated. | /media/large/tmp/work/mips32-poky-linux/cronie/1.4.11-r0/cronie-1.4.11/src/crontab.c:59:27: fatal error: cronie_common.h: No such file or directory | #include "cronie_common.h" |^ | compilation terminated. | make[3]: *** [security.o] Error 1 | make[3]: *** Waiting for unfinished jobs | make[3]: *** [crontab.o] Error 1 | /media/large/tmp/work/mips32-poky-linux/cronie/1.4.11-r0/cronie-1.4.11/src/cron.c:52:27: fatal error: cronie_common.h: No such file or directory | #include "cronie_common.h" |^ | compilation terminated. | make[3]: *** [cron.o] Error 1 | make[3]: Leaving directory `/media/large/tmp/work/mips32-poky-linux/cronie/1.4.11-r0/build/src' | make[2]: *** [all] Error 2 | make[2]: Leaving directory `/media/large/tmp/work/mips32-poky-linux/cronie/1.4.11-r0/build/src' | make[1]: *** [all-recursive] Error 1 | make[1]: Leaving directory `/media/large/tmp/work/mips32-poky-linux/cronie/1.4.11-r0/build' | make: *** [all] Error 2 | ERROR: oe_runmake failed | ERROR: Function failed: do_compile (log file is located at /media/large/tmp/work/mips32-poky-linux/cronie/1.4.11-r0/temp/log.do_compile.22142) Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
