* [CONSOLIDATED PULL 01/25] xorg-lib: don't build libs unless requested by DISTRO_FEATURES
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 02/25] initscripts: Make /etc/timestamp consistent again Saul Wold
` (24 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
From: Andreas Oberritter <obi@opendreambox.org>
* If 'x11' is not set in DISTRO_FEATURES, then skip all
recipes using xorg-lib-common.inc instead of only those
using libx11.inc.
* One exception: pixman, which is not only used by xorg,
but also by cairo.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/recipes-graphics/xorg-lib/libx11.inc | 5 -----
meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 6 ++++++
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index 748a48c..9057edc 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -49,8 +49,3 @@ do_compile_prepend() {
# Multiple libx11 derivatives from from this file and are selected by virtual/libx11
# A world build should only build the correct version, not all of them.
EXCLUDE_FROM_WORLD = "1"
-
-python () {
- if not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d):
- raise bb.parse.SkipPackage("X11 not enabled for this DISTRO")
-}
diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
index d106054..3d5d378 100644
--- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
+++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
@@ -14,3 +14,9 @@ S = "${WORKDIR}/${XORG_PN}-${PV}"
inherit autotools pkgconfig
EXTRA_OECONF = "--enable-malloc0returnsnull --with-fop=no --without-xmlto"
+
+python () {
+ whitelist = [ "pixman" ]
+ if not d.getVar('BPN', True) in whitelist and not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d):
+ raise bb.parse.SkipPackage("X11 not enabled for this DISTRO")
+}
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 02/25] initscripts: Make /etc/timestamp consistent again.
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 01/25] xorg-lib: don't build libs unless requested by DISTRO_FEATURES Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 03/25] wireless-tools: remove ldconfig call from install-libs Saul Wold
` (23 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
From: Gary Thomas <gary@mlbassoc.com>
Commit cc8695 changed the way timestamps were handled
and added some extra munging to be able to compare them
reliably. This change makes the timestamp value the same
everywhere and simplifies how the check to set the system
clock based on the timestamp is done.
Also, if the value stored in /etc/timestamp is newer
[at all] than the current system time, set the system clock
from the stored value, down to the minute, not just the day.
Signed-off-by: Gary Thomas <gary@mlbassoc.com>
---
.../initscripts/initscripts-1.0/bootmisc.sh | 4 ++--
.../initscripts/initscripts-1.0/save-rtc.sh | 2 +-
meta/recipes-core/initscripts/initscripts_1.0.bb | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
index d9e8ffa..20ec0a0 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
@@ -68,9 +68,9 @@ fi
/etc/init.d/hwclock.sh start
if test -e /etc/timestamp
then
- SYSTEMDATE=`date -u +%4Y%2m%2d`
+ SYSTEMDATE=`date -u +%4Y%2m%2d%2H%2M`
read TIMESTAMP < /etc/timestamp
- if [ ${TIMESTAMP#????????}${TIMESTAMP%????????} -gt $SYSTEMDATE ]; then
+ if [ ${TIMESTAMP} -gt $SYSTEMDATE ]; then
date -u $TIMESTAMP
/etc/init.d/hwclock.sh stop
fi
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh b/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
index 3d8e850..1f804e2 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
@@ -10,4 +10,4 @@
### END INIT INFO
# Update the timestamp
-date -u +%2m%2d%2H%2M%4Y > /etc/timestamp
+date -u +%4Y%2m%2d%2H%2M > /etc/timestamp
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index 203c605..b56c55c 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Initscripts provide the basic system startup initialization scrip
SECTION = "base"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-PR = "r129"
+PR = "r130"
INHIBIT_DEFAULT_DEPS = "1"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 03/25] wireless-tools: remove ldconfig call from install-libs
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 01/25] xorg-lib: don't build libs unless requested by DISTRO_FEATURES Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 02/25] initscripts: Make /etc/timestamp consistent again Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 04/25] autotools.bbclass: Don't copy into non-existant directory Saul Wold
` (22 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
From: Martin Jansa <martin.jansa@gmail.com>
* and drop apply=yes param as it's not needed
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../wireless-tools/remove.ldconfig.call.patch | 19 +++++++++++++++++++
.../wireless-tools/wireless-tools_29.bb | 5 +++--
2 files changed, 22 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch b/meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch
new file mode 100644
index 0000000..3a22c3f
--- /dev/null
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch
@@ -0,0 +1,19 @@
+When /etc/ld.so.cache is writeable by user running bitbake then it creates invalid cache
+(in my case libstdc++.so cannot be found after building zlib(-native) and I have to call
+touch */libstdc++.so && /sbin/ldconfig to fix it.
+
+So remove ldconfig call from make install-libs
+
+Upstream-Status: Inappropriate [disable feature]
+
+diff -uNr wireless_tools.29.orig/Makefile wireless_tools.29/Makefile
+--- wireless_tools.29.orig/Makefile 2007-09-18 01:56:46.000000000 +0200
++++ wireless_tools.29/Makefile 2012-02-15 20:46:41.780763514 +0100
+@@ -163,7 +163,6 @@
+ install -m 755 $(DYNAMIC) $(INSTALL_LIB)
+ ln -sfn $(DYNAMIC) $(INSTALL_LIB)/$(DYNAMIC_LINK)
+ @echo "*** Don't forget to add $(INSTALL_LIB) to /etc/ld.so.conf, and run ldconfig as root. ***"
+- @$(LDCONFIG) || echo "*** Could not run ldconfig ! ***"
+
+ # Install the static library
+ install-static:: $(STATIC)
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
index cc51dec..c6235d6 100644
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
@@ -7,10 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://sample_enc.c;beginline=1;endline=4;md5=838372be07874260b566bae2f6ed33b6"
SECTION = "base"
PE = "1"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.tar.gz \
- file://man.patch;apply=yes \
+ file://remove.ldconfig.call.patch \
+ file://man.patch \
file://wireless-tools.if-pre-up \
file://zzz-wireless.if-pre-up \
file://avoid_strip.patch"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 04/25] autotools.bbclass: Don't copy into non-existant directory
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
` (2 preceding siblings ...)
2012-02-23 15:58 ` [CONSOLIDATED PULL 03/25] wireless-tools: remove ldconfig call from install-libs Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 05/25] dhcp: Update to 4.2.3-P2 Saul Wold
` (21 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
From: Andreas Oberritter <obi@opendreambox.org>
* If configure.ac contains AM_GNU_GETTEXT and po/Makefile.in.in
doesn't exist, autotools_do_configure() copies a local
version of Makefile.in.in to this location. If the directory
'po' doesn't exist, the function aborts.
* This patch verifies that the directory exists before copying
a file to it. This fixes libcddb, which uses AM_GNU_GETTEXT,
but has no 'po' directory.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/classes/autotools.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 5d74333..e22ea68 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -149,7 +149,7 @@ autotools_do_configure() {
else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
# We'd call gettextize here if it wasn't so broken...
cp ${STAGING_DATADIR}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/
- if [ ! -e ${S}/po/Makefile.in.in ]; then
+ if [ -d ${S}/po/ -a ! -e ${S}/po/Makefile.in.in ]; then
cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/
fi
fi
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 05/25] dhcp: Update to 4.2.3-P2
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
` (3 preceding siblings ...)
2012-02-23 15:58 ` [CONSOLIDATED PULL 04/25] autotools.bbclass: Don't copy into non-existant directory Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 06/25] nspr: Integrate version 4.8.9 Saul Wold
` (20 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
From: Andrei Gherzan <andrei@gherzan.ro>
1. Update to 4.2.3-P2
2. From 4.2.0 final release, -lcrypto check was removed and we compile static libraries
from bind that are linked to libcrypto. This is why i added a patch in order to add
-lcrypto to LIBS.
3. Add openssl in DEPENDS as we need libcrypto from this package
4. Drop installing /var/lib/dhcp/ as it is handled in pkg_postinst
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
.../dhcp-3.0.3-dhclient-dbus.patch | 0
.../fix-client-path.patch | 0
.../fix-external-bind.patch | 0
.../fixincludes.patch | 0
.../dhcp/dhcp-4.2.3-P2/link-with-lcrypto.patch | 25 ++++++++++++++++++++
.../{dhcp-4.2.0 => dhcp-4.2.3-P2}/noattrmode.patch | 0
.../dhcp/{dhcp-4.2.0 => dhcp-4.2.3-P2}/site.h | 0
meta/recipes-connectivity/dhcp/dhcp.inc | 6 +---
.../dhcp/{dhcp_4.2.0.bb => dhcp_4.2.3-P2.bb} | 8 +++---
9 files changed, 31 insertions(+), 8 deletions(-)
rename meta/recipes-connectivity/dhcp/{dhcp-4.2.0 => dhcp-4.2.3-P2}/dhcp-3.0.3-dhclient-dbus.patch (100%)
rename meta/recipes-connectivity/dhcp/{dhcp-4.2.0 => dhcp-4.2.3-P2}/fix-client-path.patch (100%)
rename meta/recipes-connectivity/dhcp/{dhcp-4.2.0 => dhcp-4.2.3-P2}/fix-external-bind.patch (100%)
rename meta/recipes-connectivity/dhcp/{dhcp-4.2.0 => dhcp-4.2.3-P2}/fixincludes.patch (100%)
create mode 100644 meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/link-with-lcrypto.patch
rename meta/recipes-connectivity/dhcp/{dhcp-4.2.0 => dhcp-4.2.3-P2}/noattrmode.patch (100%)
rename meta/recipes-connectivity/dhcp/{dhcp-4.2.0 => dhcp-4.2.3-P2}/site.h (100%)
rename meta/recipes-connectivity/dhcp/{dhcp_4.2.0.bb => dhcp_4.2.3-P2.bb} (48%)
diff --git a/meta/recipes-connectivity/dhcp/dhcp-4.2.0/dhcp-3.0.3-dhclient-dbus.patch b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/dhcp-3.0.3-dhclient-dbus.patch
similarity index 100%
rename from meta/recipes-connectivity/dhcp/dhcp-4.2.0/dhcp-3.0.3-dhclient-dbus.patch
rename to meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/dhcp-3.0.3-dhclient-dbus.patch
diff --git a/meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-client-path.patch b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/fix-client-path.patch
similarity index 100%
rename from meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-client-path.patch
rename to meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/fix-client-path.patch
diff --git a/meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-external-bind.patch b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/fix-external-bind.patch
similarity index 100%
rename from meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-external-bind.patch
rename to meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/fix-external-bind.patch
diff --git a/meta/recipes-connectivity/dhcp/dhcp-4.2.0/fixincludes.patch b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/fixincludes.patch
similarity index 100%
rename from meta/recipes-connectivity/dhcp/dhcp-4.2.0/fixincludes.patch
rename to meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/fixincludes.patch
diff --git a/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/link-with-lcrypto.patch b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/link-with-lcrypto.patch
new file mode 100644
index 0000000..57e10b0
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/link-with-lcrypto.patch
@@ -0,0 +1,25 @@
+Author: Andrei Gherzan <andrei@gherzan.ro>
+Date: Thu Feb 2 23:59:11 2012 +0200
+
+From 4.2.0 final release, -lcrypto check was removed and we compile static libraries
+from bind that are linked to libcrypto. This is why i added a patch in order to add
+-lcrypto to LIBS.
+
+Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
+Upstream-Status: Pending
+
+Index: dhcp-4.2.3-P2-r0/dhcp-4.2.3-P2/configure.ac
+===================================================================
+--- dhcp-4.2.3-P2.orig/configure.ac 2012-02-02 18:04:20.843023196 +0200
++++ dhcp-4.2.3-P2/configure.ac 2012-02-02 17:58:16.000000000 +0200
+@@ -456,6 +456,10 @@
+ # Look for optional headers.
+ AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
+
++# find an MD5 library
++AC_SEARCH_LIBS(MD5_Init, [crypto])
++AC_SEARCH_LIBS(MD5Init, [crypto])
++
+ # Solaris needs some libraries for functions
+ AC_SEARCH_LIBS(socket, [socket])
+ AC_SEARCH_LIBS(inet_ntoa, [nsl])
diff --git a/meta/recipes-connectivity/dhcp/dhcp-4.2.0/noattrmode.patch b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/noattrmode.patch
similarity index 100%
rename from meta/recipes-connectivity/dhcp/dhcp-4.2.0/noattrmode.patch
rename to meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/noattrmode.patch
diff --git a/meta/recipes-connectivity/dhcp/dhcp-4.2.0/site.h b/meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/site.h
similarity index 100%
rename from meta/recipes-connectivity/dhcp/dhcp-4.2.0/site.h
rename to meta/recipes-connectivity/dhcp/dhcp-4.2.3-P2/site.h
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index f66dfba..8ead016 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -10,9 +10,9 @@ HOMEPAGE = "http://www.isc.org/"
LICENSE = "ISC"
LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=bb6fd41f5895b67088ebea61ad365e74"
-DEPENDS = "bind"
+DEPENDS = "openssl bind"
-SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-${PV}.tar.gz \
+SRC_URI = "ftp://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
file://site.h \
file://init-relay file://default-relay \
file://init-server file://default-server \
@@ -51,8 +51,6 @@ do_install_append () {
mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/
fi
install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script
-
- install -d ${D}${localstatedir}/lib/dhcp/
}
PACKAGES += "dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell"
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb b/meta/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bb
similarity index 48%
rename from meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
rename to meta/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bb
index 3b1c0e2..24b50ba 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bb
@@ -1,12 +1,12 @@
require dhcp.inc
-PR = "r7"
+PR = "r0"
SRC_URI += "file://fixincludes.patch \
file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
- file://fix-client-path.patch \
file://fix-external-bind.patch \
+ file://link-with-lcrypto.patch \
"
-SRC_URI[md5sum] = "83abd7c4f9c24d8dd024ca5a71380c0a"
-SRC_URI[sha256sum] = "6260d43423e4c406ba63cd7199502a395e952b13c80a955026c4b82a4e9d4943"
+SRC_URI[md5sum] = "14f57fd580d01633d0fad4809007a801"
+SRC_URI[sha256sum] = "5cf7ae2cad9c4ca0103748b2476ec8ea78484e408f8fe597e4e0a4afb051b469"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 06/25] nspr: Integrate version 4.8.9
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
` (4 preceding siblings ...)
2012-02-23 15:58 ` [CONSOLIDATED PULL 05/25] dhcp: Update to 4.2.3-P2 Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 07/25] nspr: Compile nspr with tests Saul Wold
` (19 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
From: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Sergey 'Jin' Bostandzhyan <jin@mediatomb.cc>
---
meta/recipes-support/nspr/files/nspr.pc.in | 11 ++++++++
meta/recipes-support/nspr/nspr_4.8.9.bb | 37 ++++++++++++++++++++++++++++
2 files changed, 48 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-support/nspr/files/nspr.pc.in
create mode 100644 meta/recipes-support/nspr/nspr_4.8.9.bb
diff --git a/meta/recipes-support/nspr/files/nspr.pc.in b/meta/recipes-support/nspr/files/nspr.pc.in
new file mode 100644
index 0000000..e7af08d
--- /dev/null
+++ b/meta/recipes-support/nspr/files/nspr.pc.in
@@ -0,0 +1,11 @@
+os_libs=-lpthread -ldl
+prefix=OEPREFIX
+exec_prefix=OEEXECPREFIX
+libdir=OELIBDIR
+includedir=OEINCDIR
+
+Name: NSPR
+Description: The Netscape Portable Runtime
+Version: 4.8.9
+Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl
+Cflags:
diff --git a/meta/recipes-support/nspr/nspr_4.8.9.bb b/meta/recipes-support/nspr/nspr_4.8.9.bb
new file mode 100644
index 0000000..da324fc
--- /dev/null
+++ b/meta/recipes-support/nspr/nspr_4.8.9.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "Netscape Portable Runtime Library"
+HOMEPAGE = "http://www.mozilla.org/projects/nspr/"
+LICENSE = "GPL-2.0 | MPL-1.1 | LGPL-2.1"
+LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=40;md5=99d4d7d68bbc4bc60ebf8c15ed295f28 \
+ file://Makefile.in;beginline=4;endline=38;md5=c2b512182a334e1bfa1edc4d1c84a298 "
+SECTION = "libs/network"
+
+PR = "r0"
+
+SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz"
+
+SRC_URI += "file://nspr.pc.in "
+
+SRC_URI[md5sum] = "60770d45dc08c0f181b22cdfce5be3e8"
+SRC_URI[sha256sum] = "ff43c7c819e72f03bb908e7652c5d5f59a5d31ee86c333e692650207103d1cce"
+
+S = "${WORKDIR}/nspr-${PV}/mozilla/nsprpub"
+
+inherit autotools
+
+do_configure() {
+ oe_runconf
+}
+
+do_compile_prepend() {
+ oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX" LDFLAGS="" CC=gcc -C config export
+}
+
+do_install_append() {
+ install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc
+ sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nspr.pc
+ sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nspr.pc
+ sed -i s:OEINCDIR:${includedir}:g ${D}${libdir}/pkgconfig/nspr.pc
+ sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nspr.pc
+}
+
+
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 07/25] nspr: Compile nspr with tests
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
` (5 preceding siblings ...)
2012-02-23 15:58 ` [CONSOLIDATED PULL 06/25] nspr: Integrate version 4.8.9 Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 08/25] nspr: Add patch in order to remove rpath from binaries Saul Wold
` (18 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
From: Andrei Gherzan <andrei@gherzan.ro>
1. Compile package tests suite
2. Add tests to -dev rpm as it needs dev libraries
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
meta/recipes-support/nspr/nspr_4.8.9.bb | 135 ++++++++++++++++++++++++++++++-
1 files changed, 131 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-support/nspr/nspr_4.8.9.bb b/meta/recipes-support/nspr/nspr_4.8.9.bb
index da324fc..74bfe6b 100644
--- a/meta/recipes-support/nspr/nspr_4.8.9.bb
+++ b/meta/recipes-support/nspr/nspr_4.8.9.bb
@@ -5,17 +5,135 @@ LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=40;md5=99d4d7d68bbc4
file://Makefile.in;beginline=4;endline=38;md5=c2b512182a334e1bfa1edc4d1c84a298 "
SECTION = "libs/network"
-PR = "r0"
+PR = "r1"
-SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz"
+SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \
+ "
-SRC_URI += "file://nspr.pc.in "
+SRC_URI += "file://nspr.pc.in"
SRC_URI[md5sum] = "60770d45dc08c0f181b22cdfce5be3e8"
SRC_URI[sha256sum] = "ff43c7c819e72f03bb908e7652c5d5f59a5d31ee86c333e692650207103d1cce"
S = "${WORKDIR}/nspr-${PV}/mozilla/nsprpub"
+TESTS = "runtests.pl \
+ runtests.sh \
+ accept \
+ acceptread \
+ acceptreademu \
+ affinity \
+ alarm \
+ anonfm \
+ atomic \
+ attach \
+ bigfile \
+ cleanup \
+ cltsrv \
+ concur \
+ cvar \
+ cvar2 \
+ dlltest \
+ dtoa \
+ errcodes \
+ exit \
+ fdcach \
+ fileio \
+ foreign \
+ formattm \
+ fsync \
+ gethost \
+ getproto \
+ i2l \
+ initclk \
+ inrval \
+ instrumt \
+ intrio \
+ intrupt \
+ io_timeout \
+ ioconthr \
+ join \
+ joinkk \
+ joinku \
+ joinuk \
+ joinuu \
+ layer \
+ lazyinit \
+ libfilename \
+ lltest \
+ lock \
+ lockfile \
+ logfile \
+ logger \
+ many_cv \
+ multiwait \
+ nameshm1 \
+ nblayer \
+ nonblock \
+ ntioto \
+ ntoh \
+ op_2long \
+ op_excl \
+ op_filnf \
+ op_filok \
+ op_nofil \
+ parent \
+ parsetm \
+ peek \
+ perf \
+ pipeping \
+ pipeping2 \
+ pipeself \
+ poll_nm \
+ poll_to \
+ pollable \
+ prftest \
+ primblok \
+ provider \
+ prpollml \
+ ranfile \
+ randseed \
+ reinit \
+ rwlocktest \
+ sel_spd \
+ selct_er \
+ selct_nm \
+ selct_to \
+ selintr \
+ sema \
+ semaerr \
+ semaping \
+ sendzlf \
+ server_test \
+ servr_kk \
+ servr_uk \
+ servr_ku \
+ servr_uu \
+ short_thread \
+ sigpipe \
+ socket \
+ sockopt \
+ sockping \
+ sprintf \
+ stack \
+ stdio \
+ str2addr \
+ strod \
+ switch \
+ system \
+ testbit \
+ testfile \
+ threads \
+ timemac \
+ timetest \
+ tpd \
+ udpsrv \
+ vercheck \
+ version \
+ writev \
+ xnotify \
+ zerolen"
+
inherit autotools
do_configure() {
@@ -26,12 +144,21 @@ do_compile_prepend() {
oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX" LDFLAGS="" CC=gcc -C config export
}
+do_compile_append() {
+ oe_runmake -C pr/tests
+}
+
do_install_append() {
install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc
sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nspr.pc
sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nspr.pc
sed -i s:OEINCDIR:${includedir}:g ${D}${libdir}/pkgconfig/nspr.pc
sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nspr.pc
+ cd ${S}/pr/tests
+ mkdir -p ${D}${libdir}/nspr/tests
+ install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests
}
-
+FILES_${PN} = ${bindir}/*
+FILES_${PN}-dev += "${libdir}/nspr/tests/*"
+FILES_${PN}-dbg += "${libdir}/nspr/tests/.debug/*"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 08/25] nspr: Add patch in order to remove rpath from binaries
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
` (6 preceding siblings ...)
2012-02-23 15:58 ` [CONSOLIDATED PULL 07/25] nspr: Compile nspr with tests Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 09/25] e2fsprogs: e2initrd_helper was moved in libdir but not packaged correctly in FILES_libext2fs Saul Wold
` (17 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
From: Andrei Gherzan <andrei@gherzan.ro>
This patch was created in order to avoid QA warnings.
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
.../nspr/files/remove-rpath-from-tests.patch | 26 ++++++++++++++++++++
meta/recipes-support/nspr/nspr_4.8.9.bb | 3 +-
2 files changed, 28 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-support/nspr/files/remove-rpath-from-tests.patch
diff --git a/meta/recipes-support/nspr/files/remove-rpath-from-tests.patch b/meta/recipes-support/nspr/files/remove-rpath-from-tests.patch
new file mode 100644
index 0000000..a7e7853
--- /dev/null
+++ b/meta/recipes-support/nspr/files/remove-rpath-from-tests.patch
@@ -0,0 +1,26 @@
+Author: Andrei Gherzan <andrei@gherzan.ro>
+Date: Thu Feb 9 00:03:38 2012 +0200
+
+Avoid QA warnings by removing hardcoded rpath from binaries.
+
+[...]
+WARNING: QA Issue: package nspr contains bad RPATH {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/nspr-4.8.9/mozilla/nsprpub/pr/tests/../../dist/lib
+in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-split/nspr/usr/lib/nspr/tests/multiwait
+[...]
+
+Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
+Upstream-Status: Pending
+
+Index: nspr-4.8.9/mozilla/nsprpub/pr/tests/Makefile.in
+===================================================================
+--- nsprpub.orig/pr/tests/Makefile.in 2012-02-11 00:01:10.476220505 +0200
++++ nsprpub/pr/tests/Makefile.in 2012-02-10 23:57:40.000000000 +0200
+@@ -379,7 +379,7 @@
+ endif
+
+ ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH)))
+- LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR)
++ LDOPTS += -Xlinker
+ ifeq ($(USE_PTHREADS),1)
+ EXTRA_LIBS = -lpthread
+ endif
diff --git a/meta/recipes-support/nspr/nspr_4.8.9.bb b/meta/recipes-support/nspr/nspr_4.8.9.bb
index 74bfe6b..0607c32 100644
--- a/meta/recipes-support/nspr/nspr_4.8.9.bb
+++ b/meta/recipes-support/nspr/nspr_4.8.9.bb
@@ -5,9 +5,10 @@ LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=40;md5=99d4d7d68bbc4
file://Makefile.in;beginline=4;endline=38;md5=c2b512182a334e1bfa1edc4d1c84a298 "
SECTION = "libs/network"
-PR = "r1"
+PR = "r2"
SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \
+ file://remove-rpath-from-tests.patch \
"
SRC_URI += "file://nspr.pc.in"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 09/25] e2fsprogs: e2initrd_helper was moved in libdir but not packaged correctly in FILES_libext2fs
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
` (7 preceding siblings ...)
2012-02-23 15:58 ` [CONSOLIDATED PULL 08/25] nspr: Add patch in order to remove rpath from binaries Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 10/25] dbus: Remove empty ${lindir}dbus-1.0/test directory as we don't build tests Saul Wold
` (16 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
From: Andrei Gherzan <andrei@gherzan.ro>
The new install path of e2initrd_helper is %{libdir}. FILES_libext2fs modified accordigly to
avoid QA warnings.
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
index 2289211..793393e 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
@@ -1,6 +1,6 @@
require e2fsprogs.inc
-PR = "r2"
+PR = "r3"
SRC_URI += "file://fallocate.patch \
file://acinclude.m4"
@@ -54,7 +54,7 @@ FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
FILES_libcomerr = "${base_libdir}/libcom_err.so.*"
FILES_libss = "${base_libdir}/libss.so.*"
FILES_libe2p = "${base_libdir}/libe2p.so.*"
-FILES_libext2fs = "${base_libdir}/e2initrd_helper ${libdir}/libext2fs.so.*"
+FILES_libext2fs = "${libdir}/e2initrd_helper ${libdir}/libext2fs.so.*"
FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so"
BBCLASSEXTEND = "native"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 10/25] dbus: Remove empty ${lindir}dbus-1.0/test directory as we don't build tests
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
` (8 preceding siblings ...)
2012-02-23 15:58 ` [CONSOLIDATED PULL 09/25] e2fsprogs: e2initrd_helper was moved in libdir but not packaged correctly in FILES_libext2fs Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 11/25] busybox: don't create /etc/default Saul Wold
` (15 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
From: Andrei Gherzan <andrei@gherzan.ro>
This empty directory generates a QA warning of unshippped files/dirs.
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
meta/recipes-core/dbus/dbus.inc | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 2a25256..588209f 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -10,7 +10,7 @@ DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X
DEPENDS_virtclass-native = "expat-native virtual/libintl-native"
DEPENDS_virtclass-nativesdk = "expat-nativesdk virtual/libintl-nativesdk virtual/libx11"
-INC_PR = "r1"
+INC_PR = "r2"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://tmpdir.patch; \
@@ -91,6 +91,9 @@ do_install() {
# Remove Red Hat initscript
rm -rf ${D}${sysconfdir}/rc.d
+ # Remove empty testexec directory as we don't build tests
+ rm -rf ${D}${libdir}/dbus-1.0/test
+
# disable dbus-1 sysv script on systemd installs
# nearly all distros call the initscript plain 'dbus', but OE-core is different
ln -sf /dev/null ${D}/${base_libdir}/systemd/system/dbus-1.service
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 11/25] busybox: don't create /etc/default
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
` (9 preceding siblings ...)
2012-02-23 15:58 ` [CONSOLIDATED PULL 10/25] dbus: Remove empty ${lindir}dbus-1.0/test directory as we don't build tests Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 12/25] e2fsprogs: Cope with ${libdir} and ${base_libdir} being the same Saul Wold
` (14 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
From: Andreas Oberritter <obi@opendreambox.org>
* It's not used by the recipe and its creation
currently depends on CONFIG_HWCLOCK=y.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/recipes-core/busybox/busybox.inc | 1 -
meta/recipes-core/busybox/busybox_1.19.3.bb | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 5fb436e..fc69d65 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -179,7 +179,6 @@ do_install () {
install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
fi
if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
- install -d ${D}${sysconfdir}/default
install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
fi
if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then
diff --git a/meta/recipes-core/busybox/busybox_1.19.3.bb b/meta/recipes-core/busybox/busybox_1.19.3.bb
index a075407..45e284f 100644
--- a/meta/recipes-core/busybox/busybox_1.19.3.bb
+++ b/meta/recipes-core/busybox/busybox_1.19.3.bb
@@ -1,5 +1,5 @@
require busybox.inc
-PR = "r3"
+PR = "r4"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://udhcpscript.patch \
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 12/25] e2fsprogs: Cope with ${libdir} and ${base_libdir} being the same
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
` (10 preceding siblings ...)
2012-02-23 15:58 ` [CONSOLIDATED PULL 11/25] busybox: don't create /etc/default Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 13/25] gst-plugins-base: depend on libx11 and libxv conditionally Saul Wold
` (13 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
From: Mike Crowe <mac@mcrowe.com>
${libdir} and ${base_libdir} may be the same. If they are don't try and
move files onto themselves.
Signed-off-by: Mike Crowe <mac@mcrowe.com>
---
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
index 793393e..aea7d79 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
@@ -1,6 +1,6 @@
require e2fsprogs.inc
-PR = "r3"
+PR = "r4"
SRC_URI += "file://fallocate.patch \
file://acinclude.m4"
@@ -32,9 +32,11 @@ do_install () {
do_install_append () {
# e2initrd_helper and the pkgconfig files belong in libdir
- install -d ${D}${libdir}
- mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir}
- mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
+ if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
+ install -d ${D}${libdir}
+ mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir}
+ mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
+ fi
}
# blkid used to be part of e2fsprogs but is useful outside, add it
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 13/25] gst-plugins-base: depend on libx11 and libxv conditionally
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
` (11 preceding siblings ...)
2012-02-23 15:58 ` [CONSOLIDATED PULL 12/25] e2fsprogs: Cope with ${libdir} and ${base_libdir} being the same Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 14/25] mpeg2dec: depend on libx11 conditionally Saul Wold
` (12 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
From: Andreas Oberritter <obi@opendreambox.org>
* gst-plugins-base currently doesn't build if x11 is
unavailable, due to unconditional dependencies on libx11
and libxv. However, they are not required to build
gst-plugins-base.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
.../gstreamer/gst-plugins-base_0.10.35.bb | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb
index 6dfc26e..93f8eb3 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb
@@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \
file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0"
-DEPENDS += "virtual/libx11 alsa-lib freetype liboil libogg libvorbis libxv libtheora avahi util-linux tremor"
+DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '', d)}"
+DEPENDS += "alsa-lib freetype liboil libogg libvorbis libtheora avahi util-linux tremor"
SRC_URI += " file://gst-plugins-base-tremor.patch"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 14/25] mpeg2dec: depend on libx11 conditionally
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
` (12 preceding siblings ...)
2012-02-23 15:58 ` [CONSOLIDATED PULL 13/25] gst-plugins-base: depend on libx11 and libxv conditionally Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 15/25] ppp: Fix rp-pppoe plugin compilation Saul Wold
` (11 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
From: Andreas Oberritter <obi@opendreambox.org>
* mpeg2dec currently doesn't build if x11 is unavailable,
due to an unconditional dependency on libx11. However,
libx11 is not required to build mpeg2dec.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
index f2865f6..f38066a 100644
--- a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
+++ b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
@@ -6,7 +6,7 @@ LICENSE_FLAGS = "commercial"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://include/mpeg2.h;beginline=1;endline=22;md5=ead62602d4638329d3b5b86a55803154"
-DEPENDS = "virtual/libx11"
+DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}"
PR = "r2"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 15/25] ppp: Fix rp-pppoe plugin compilation
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
` (13 preceding siblings ...)
2012-02-23 15:58 ` [CONSOLIDATED PULL 14/25] mpeg2dec: depend on libx11 conditionally Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 16/25] syslinux: Use SYSLINUX_TIMEOUT and SYSLINUX_PROMPT to configure syslinux Saul Wold
` (10 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
From: Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com>
rp-pppoe plugin was broken due linux headers changes: pppd has own copy of
if_pppol2tp.h file which is included from <linux/if_pppox.h>.
Add patch from Debian for struct pppol2tpv3_addr definition.
Signed-off-by: Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com>
---
.../ppp/ppp-2.4.5/update_if_pppol2tp.patch | 54 ++++++++++++++++++++
meta/recipes-connectivity/ppp/ppp_2.4.5.bb | 3 +-
2 files changed, 56 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-connectivity/ppp/ppp-2.4.5/update_if_pppol2tp.patch
diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/update_if_pppol2tp.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/update_if_pppol2tp.patch
new file mode 100644
index 0000000..e034f19
--- /dev/null
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/update_if_pppol2tp.patch
@@ -0,0 +1,54 @@
+Upstream-Status: Pending
+diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h
+index 4113d6a..7ee86b2 100644
+--- a/include/linux/if_pppol2tp.h
++++ b/include/linux/if_pppol2tp.h
+@@ -2,7 +2,7 @@
+ * Linux PPP over L2TP (PPPoL2TP) Socket Implementation (RFC 2661)
+ *
+ * This file supplies definitions required by the PPP over L2TP driver
+- * (pppol2tp.c). All version information wrt this file is located in pppol2tp.c
++ * (l2tp_ppp.c). All version information wrt this file is located in l2tp_ppp.c
+ *
+ * License:
+ * This program is free software; you can redistribute it and/or
+@@ -15,14 +15,14 @@
+ #ifndef __LINUX_IF_PPPOL2TP_H
+ #define __LINUX_IF_PPPOL2TP_H
+
+-#include <asm/types.h>
++#include <linux/types.h>
++
+
+ /* Structure used to connect() the socket to a particular tunnel UDP
+ * socket.
+ */
+-struct pppol2tp_addr
+-{
+- pid_t pid; /* pid that owns the fd.
++struct pppol2tp_addr {
++ __kernel_pid_t pid; /* pid that owns the fd.
+ * 0 => current */
+ int fd; /* FD of UDP socket to use */
+
+@@ -32,6 +32,20 @@ struct pppol2tp_addr
+ __u16 d_tunnel, d_session; /* For sending outgoing packets */
+ };
+
++/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
++ * bits. So we need a different sockaddr structure.
++ */
++struct pppol2tpv3_addr {
++ pid_t pid; /* pid that owns the fd.
++ * 0 => current */
++ int fd; /* FD of UDP or IP socket to use */
++
++ struct sockaddr_in addr; /* IP address and port to send to */
++
++ __u32 s_tunnel, s_session; /* For matching incoming packets */
++ __u32 d_tunnel, d_session; /* For sending outgoing packets */
++};
++
+ /* Socket options:
+ * DEBUG - bitmask of debug message categories
+ * SENDSEQ - 0 => don't send packets with sequence numbers
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
index 72464bf..80f91e6 100644
--- a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
+++ b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77
file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \
file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \
file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
file://makefile.patch \
@@ -18,6 +18,7 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
file://pppd-resolv-varrun.patch \
file://enable-ipv6.patch \
file://makefile-remove-hard-usr-reference.patch \
+ file://update_if_pppol2tp.patch \
file://pon \
file://poff \
file://init \
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 16/25] syslinux: Use SYSLINUX_TIMEOUT and SYSLINUX_PROMPT to configure syslinux
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
` (14 preceding siblings ...)
2012-02-23 15:58 ` [CONSOLIDATED PULL 15/25] ppp: Fix rp-pppoe plugin compilation Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 17/25] syslinux: add SYSLINUX_ROOT to APPEND line Saul Wold
` (9 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
syslinux allows you to set TIMEOUT and PROMPT variables, when PROMPT is 0,
the "boot:" is not displayed uless one presses CTRL or SHIFT during startup.
TIMEOUT is in 1/10th of seconds, and a value of 0 for TIMEOUT will disable
the timeout mechanism.
In bitbake, recipes had set TIMEOUT (not SYSLINUX_TIMEOUT) incorrectly, other
patches fix this issues. We are adding SYSLINUX_PROMPT to enable/disable the
"boot:" prompt in syslinux.
See http://www.syslinux.org/wiki/index.php/SYSLINUX for more details
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
meta/classes/syslinux.bbclass | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass
index 1569074..33a509d 100644
--- a/meta/classes/syslinux.bbclass
+++ b/meta/classes/syslinux.bbclass
@@ -136,10 +136,6 @@ python build_syslinux_cfg () {
except OSError:
raise bb.build.funcFailed('Unable to open %s' % (cfile))
- # FIXME - the timeout should be settable
- # And maybe the default too
- # Definately the prompt
-
cfgfile.write('# Automatically created by OE\n')
opts = d.getVar('SYSLINUX_OPTS', 1)
@@ -158,7 +154,11 @@ python build_syslinux_cfg () {
else:
cfgfile.write('TIMEOUT 50\n')
- cfgfile.write('PROMPT 1\n')
+ prompt = d.getVar('SYSLINUX_PROMPT', 1)
+ if prompt:
+ cfgfile.write('PROMPT %s\n' % prompt)
+ else:
+ cfgfile.write('PROMPT 1\n')
menu = d.getVar('AUTO_SYSLINUXMENU', 1)
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 17/25] syslinux: add SYSLINUX_ROOT to APPEND line
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
` (15 preceding siblings ...)
2012-02-23 15:58 ` [CONSOLIDATED PULL 16/25] syslinux: Use SYSLINUX_TIMEOUT and SYSLINUX_PROMPT to configure syslinux Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 18/25] image_types: add vmdk type to use with VMware Saul Wold
` (8 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
By prepending the SYSLINUX_ROOT to the APPEND line, will allow a sane default
to be set for the various syslinux images
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/syslinux.bbclass | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass
index 33a509d..ec93201 100644
--- a/meta/classes/syslinux.bbclass
+++ b/meta/classes/syslinux.bbclass
@@ -23,6 +23,7 @@ SYSLINUXDIR = "/"
ISO_BOOTIMG = "isolinux/isolinux.bin"
ISO_BOOTCAT = "isolinux/boot.cat"
MKISOFS_OPTIONS = "-no-emul-boot -boot-load-size 4 -boot-info-table"
+APPEND_prepend = " ${SYSLINUX_ROOT} "
syslinux_populate() {
DEST=$1
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 18/25] image_types: add vmdk type to use with VMware
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
` (16 preceding siblings ...)
2012-02-23 15:58 ` [CONSOLIDATED PULL 17/25] syslinux: add SYSLINUX_ROOT to APPEND line Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 19/25] image-live: fix SYSLINUX_TIME and add SYSLINUX_ROOT instead of APPEND Saul Wold
` (7 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/image_types.bbclass | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index eef554d..3b26162 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -153,6 +153,8 @@ IMAGE_CMD_ubi () {
}
IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS}"
+IMAGE_CMD_vmdk = "qemu-img convert -O vmdk ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmdk"
+
EXTRA_IMAGECMD = ""
EXTRA_IMAGECMD_jffs2 ?= "--pad --little-endian --eraseblock=0x40000"
# Change these if you want default genext2fs behavior (i.e. create minimal inode number)
@@ -182,6 +184,7 @@ IMAGE_DEPENDS_cpio.lzma = "xz-native"
IMAGE_DEPENDS_cpio.xz = "xz-native"
IMAGE_DEPENDS_ubi = "mtd-utils-native"
IMAGE_DEPENDS_ubifs = "mtd-utils-native"
+IMAGE_DEPENDS_vmdk = "qemu-native"
# This variable is available to request which values are suitable for IMAGE_FSTYPES
-IMAGE_TYPES = "jffs2 sum.jffs2 cramfs ext2 ext2.gz ext2.bz2 ext3 ext3.gz ext2.lzma btrfs live squashfs squashfs-lzma ubi tar tar.gz tar.bz2 tar.xz cpio cpio.gz cpio.xz cpio.lzma"
+IMAGE_TYPES = "jffs2 sum.jffs2 cramfs ext2 ext2.gz ext2.bz2 ext3 ext3.gz ext2.lzma btrfs live squashfs squashfs-lzma ubi tar tar.gz tar.bz2 tar.xz cpio cpio.gz cpio.xz cpio.lzma vmdk"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 19/25] image-live: fix SYSLINUX_TIME and add SYSLINUX_ROOT instead of APPEND
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
` (17 preceding siblings ...)
2012-02-23 15:58 ` [CONSOLIDATED PULL 18/25] image_types: add vmdk type to use with VMware Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 20/25] boot-directdisk: Use correct SYSLINUX_TIMEOUT and " Saul Wold
` (6 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/image-live.bbclass | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index e85ac1e..1476840 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -2,8 +2,8 @@
AUTO_SYSLINUXCFG = "1"
INITRD_IMAGE ?= "core-image-minimal-initramfs"
INITRD ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz"
-APPEND += "root=/dev/ram0 "
-TIMEOUT = "10"
+SYSLINUX_ROOT = "root=/dev/ram0 "
+SYSLINUX_TIMEOUT = "10"
LABELS += "boot install"
ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 20/25] boot-directdisk: Use correct SYSLINUX_TIMEOUT and SYSLINUX_ROOT instead of APPEND
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
` (18 preceding siblings ...)
2012-02-23 15:58 ` [CONSOLIDATED PULL 19/25] image-live: fix SYSLINUX_TIME and add SYSLINUX_ROOT instead of APPEND Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 21/25] openssl: Move libcrypto to base_libdir Saul Wold
` (5 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/boot-directdisk.bbclass | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
index 8879ba8..893164f 100644
--- a/meta/classes/boot-directdisk.bbclass
+++ b/meta/classes/boot-directdisk.bbclass
@@ -38,8 +38,9 @@ BOOTDD_EXTRA_SPACE ?= "16384"
AUTO_SYSLINUXCFG = "1"
LABELS = "boot"
-APPEND = "root=/dev/sda2"
-TIMEOUT = "10"
+SYSLINUX_ROOT ?= "root=/dev/sda2"
+SYSLINUX_TIMEOUT = "10" # 1 second
+
SYSLINUXCFG = "${HDDDIR}/syslinux.cfg"
SYSLINUXMENU = "${HDDDIR}/menu"
@@ -50,6 +51,7 @@ build_boot_dd() {
install -d ${HDDDIR}
install -m 0644 ${STAGING_DIR_HOST}/kernel/bzImage ${HDDDIR}/vmlinuz
+ install -m 0644 ${S}/syslinux.cfg ${HDDDIR}/syslinux.cfg
install -m 444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${HDDDIR}/ldlinux.sys
BLOCKS=`du -bks ${HDDDIR} | cut -f 1`
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 21/25] openssl: Move libcrypto to base_libdir
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
` (19 preceding siblings ...)
2012-02-23 15:58 ` [CONSOLIDATED PULL 20/25] boot-directdisk: Use correct SYSLINUX_TIMEOUT and " Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 22/25] A script to clean obsolete sstate cache files Saul Wold
` (4 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
From: Andrei Gherzan <andrei@gherzan.ro>
This fix is for dhclient. It needs libcrypto at runtime and if
libcrypto is in libdir, it's path can be inaccessible on systems
where /usr is on nfs for example or dhclient is needed before
/usr is mounted.
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
[Fix comment to from /usr -> /lib - sgw]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-connectivity/openssl/openssl.inc | 10 +++++++++-
.../recipes-connectivity/openssl/openssl_1.0.0g.bb | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index 771f146..089b9a4 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -36,10 +36,11 @@ export AS = "${CC} -c"
inherit pkgconfig siteinfo
PACKAGES =+ "libcrypto libssl ${PN}-misc"
-FILES_libcrypto = "${libdir}/libcrypto.so.*"
+FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}"
FILES_libssl = "${libdir}/libssl.so.*"
FILES_${PN} =+ " ${libdir}/ssl/*"
FILES_${PN}-misc = "${libdir}/ssl/misc ${libdir}/ssl/openssl.cnf"
+FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}"
do_configure_prepend_darwin () {
sed -i -e '/version-script=openssl\.ld/d' Configure
@@ -132,6 +133,13 @@ do_install () {
oe_libinstall -so libcrypto ${D}${libdir}
oe_libinstall -so libssl ${D}${libdir}
+ # Moving libcrypto to /lib
+ if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
+ mkdir -p ${D}/${base_libdir}/
+ mv ${D}${libdir}/libcrypto* ${D}${base_libdir}/
+ sed -i s#libdir=\$\{exec_prefix\}\/lib#libdir=${base_libdir}# ${D}/${libdir}/pkgconfig/libcrypto.pc
+ fi
+
install -d ${D}${includedir}
cp --dereference -R include/openssl ${D}${includedir}
sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.0g.bb b/meta/recipes-connectivity/openssl/openssl_1.0.0g.bb
index 80dfcb3..8ffe931 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.0g.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.0g.bb
@@ -6,7 +6,7 @@ DEPENDS += "ocf-linux"
CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 22/25] A script to clean obsolete sstate cache files
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
` (20 preceding siblings ...)
2012-02-23 15:58 ` [CONSOLIDATED PULL 21/25] openssl: Move libcrypto to base_libdir Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 23/25] task-self-hosted: remove duplicate packages Saul Wold
` (3 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
From: Robert Yang <liezhi.yang@windriver.com>
There would be many obsolete cache files in the SSTATE_DIR after several
builds, this script can remove the obsolete one for a pkg, only leave
the up to date one.
Here is the help text:
sstate-cache-management.sh <OPTION>
Options:
--help, -h
Display this help and exit.
--cache-dir=<sstate cache dir>
Specify sstate cache directory, will use the environment
variable SSTATE_CACHE_DIR if it is not specified.
--remove-duplicated
Remove the duplicated sstate cache files of one package, only
the newest one would be kept.
[YOCTO #1682]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
scripts/sstate-cache-management.sh | 135 ++++++++++++++++++++++++++++++++++++
1 files changed, 135 insertions(+), 0 deletions(-)
create mode 100755 scripts/sstate-cache-management.sh
diff --git a/scripts/sstate-cache-management.sh b/scripts/sstate-cache-management.sh
new file mode 100755
index 0000000..d0e3abc
--- /dev/null
+++ b/scripts/sstate-cache-management.sh
@@ -0,0 +1,135 @@
+#!/bin/bash
+
+# Copyright (c) 2012 Wind River Systems, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
+usage () {
+ cat << EOF
+Welcome to sstate cache management utilities.
+sstate-cache-management.sh <OPTION>
+
+Options:
+ --help, -h
+ Display this help and exit.
+
+ --cache-dir=<sstate cache dir>
+ Specify sstate cache directory, will use the environment
+ variable SSTATE_CACHE_DIR if it is not specified.
+
+ --remove-duplicated
+ Remove the duplicated sstate cache files of one package, only
+ the newest one would be kept.
+
+EOF
+}
+
+if [ $# -lt 1 ]; then
+ usage
+ exit 0
+fi
+
+# Print error information and exit.
+echo_error () {
+ echo "ERROR: $1" >&2
+ exit 1
+}
+
+# Remove the duplicated cache files for the pkg, keep the newest one
+remove_duplicated () {
+ local all_suffixes="$1"
+ local ava_archs="$2"
+ local total_deleted=0
+ for suffix in $all_suffixes; do
+ local deleted=0
+ echo -n "Removing the sstate-xxx_$suffix.tgz ... "
+ # sed twice to avoid the greedy match
+ file_names=`for arch in $ava_archs; do
+ ls sstate-*-$arch-*_$suffix.tgz 2>/dev/null | \
+ sed -e 's/\(.*\)-'"$arch"'-.*/\1/' \
+ -e 's/\(.*\)-'"$arch"'-.*/\1/'
+ done | sort -u`
+
+ for fn in $file_names; do
+ for arch in $ava_archs; do
+ ls $fn-$arch-*_$suffix.tgz 2>/dev/null >>/tmp/$fn
+ done
+ # Also delete the .siginfo file
+ to_del=$(ls -t $(cat /tmp/$fn) | sed -n '1!p' | sed -e 'p' -e 's/$/.siginfo/')
+ rm -f $to_del
+ let deleted=$deleted+`echo $to_del | wc -w`
+ rm -f /tmp/$fn
+ done
+ echo "($deleted files)"
+ let total_deleted=$total_deleted+$deleted
+ done
+ echo "$total_deleted files have been removed"
+}
+
+# Parse arguments
+while [ -n "$1" ]; do
+ case $1 in
+ --cache-dir=*)
+ cache_dir=`echo $1 | sed -e 's#^--cache-dir=##' -e 's#/*$##' | xargs readlink -f`
+ [ -d "$cache_dir" ] || echo_error "Invalid argument to --cache-dir"
+ shift
+ ;;
+ --remove-duplicated)
+ rm_duplicated="yes"
+ shift
+ ;;
+ --help|-h)
+ usage
+ exit 0
+ ;;
+ *)
+ echo "Invalid arguments $*"
+ echo_error "Try 'sstate-cache-management.sh -h' for more information."
+ ;;
+ esac
+done
+
+# sstate cache directory, use environment variable SSTATE_CACHE_DIR
+# if it was not specified, otherwise, error.
+[ -n "$cache_dir" ] || cache_dir=$SSTATE_CACHE_DIR
+[ -d "$cache_dir" ] || echo_error "Invalid cache directory \"$cache_dir\""
+
+cache_dir=`readlink -f $cache_dir`
+
+topdir=$(dirname $(dirname $(readlink -f $0)))
+tunedir=$topdir/meta/conf/machine/include
+[ -d $tunedir ] || echo_error "Can't find the tune directory"
+
+# Use the "_" to substitute "-", e.g., x86-64 to x86_64
+all_archs=`grep -r DEFAULTTUNE $tunedir | \
+ sed -e 's/.*\"\(.*\)\"/\1/' -e 's/-/_/g' | sort -u`
+# Add the qemu archs
+all_archs="$all_archs qemuarm qemux86 qemumips qemuppc"
+
+all_suffixes="deploy-rpm deploy-ipk deploy-deb deploy package populate-lic populate-sysroot"
+
+cd $cache_dir
+
+echo "Figuring out the archs in the sstate cache dir ..."
+for arch in $all_archs; do
+ ls | grep -q -w $arch
+ [ $? -eq 0 ] && ava_archs="$ava_archs $arch"
+done
+echo "The following archs have been found in the sstate cache dir:"
+echo $ava_archs
+
+if [ "$rm_duplicated" == "yes" -a -n "$ava_archs" ]; then
+ remove_duplicated "$all_suffixes" "$ava_archs"
+fi
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 23/25] task-self-hosted: remove duplicate packages
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
` (21 preceding siblings ...)
2012-02-23 15:58 ` [CONSOLIDATED PULL 22/25] A script to clean obsolete sstate cache files Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 24/25] task-self-hosted: make the package lists alphabetical Saul Wold
` (2 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
From: Dexuan Cui <dexuan.cui@intel.com>
The package names are specified more than once.
We only need to keep one for each of them, so let's remove the duplicated
ones.
This patch makes no actual change to the functionality of the recipe.
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
meta/recipes-core/tasks/task-self-hosted.bb | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-core/tasks/task-self-hosted.bb b/meta/recipes-core/tasks/task-self-hosted.bb
index 1678ac3..c9a8c49 100644
--- a/meta/recipes-core/tasks/task-self-hosted.bb
+++ b/meta/recipes-core/tasks/task-self-hosted.bb
@@ -30,12 +30,6 @@ RDEPENDS_task-self-hosted = "\
RDEPENDS_task-self-hosted-host-tools = "\
connman \
connman-plugin-ethernet \
- parted \
- e2fsprogs \
- e2fsprogs-mke2fs \
- e2fsprogs-tune2fs \
- e2fsprogs-e2fsck \
- e2fsprogs-fsck \
dhcp-client \
e2fsprogs \
e2fsprogs-e2fsck \
@@ -65,7 +59,6 @@ RDEPENDS_task-self-hosted-sdk = "\
cpp-symlinks \
ccache \
coreutils \
- diffutils \
distcc \
eglibc-utils \
file \
@@ -74,7 +67,6 @@ RDEPENDS_task-self-hosted-sdk = "\
gcc-symlinks \
g++ \
g++-symlinks \
- gettext \
intltool \
ldd \
less \
@@ -88,7 +80,6 @@ RDEPENDS_task-self-hosted-sdk = "\
pkgconfig \
quilt \
sed \
- tcl \
"
RDEPENDS_task-self-hosted-debug = " \
@@ -100,7 +91,6 @@ RDEPENDS_task-self-hosted-debug = " \
RDEPENDS_task-self-hosted-extended = "\
- binutils \
bzip2 \
chkconfig \
chrpath \
@@ -134,7 +124,6 @@ RDEPENDS_task-self-hosted-extended = "\
openssl \
opkg \
opkg-utils \
- parted \
patch \
perl \
perl-dev \
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 24/25] task-self-hosted: make the package lists alphabetical
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
` (22 preceding siblings ...)
2012-02-23 15:58 ` [CONSOLIDATED PULL 23/25] task-self-hosted: remove duplicate packages Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-23 15:58 ` [CONSOLIDATED PULL 25/25] distro_tracking_fields: fix typos Saul Wold
2012-02-24 0:01 ` [CONSOLIDATED PULL 00/25] Catching up from ELC Richard Purdie
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
From: Dexuan Cui <dexuan.cui@intel.com>
This patch makes no actual change to the functionality of the recipe.
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
meta/recipes-core/tasks/task-self-hosted.bb | 36 +++++++++++++-------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/meta/recipes-core/tasks/task-self-hosted.bb b/meta/recipes-core/tasks/task-self-hosted.bb
index c9a8c49..3c5fad6 100644
--- a/meta/recipes-core/tasks/task-self-hosted.bb
+++ b/meta/recipes-core/tasks/task-self-hosted.bb
@@ -53,20 +53,20 @@ RDEPENDS_task-self-hosted-host-tools = "\
RDEPENDS_task-self-hosted-sdk = "\
autoconf \
automake \
- binutils-symlinks \
binutils \
- cpp \
- cpp-symlinks \
+ binutils-symlinks \
ccache \
coreutils \
+ cpp \
+ cpp-symlinks \
distcc \
eglibc-utils \
file \
findutils \
- gcc \
- gcc-symlinks \
g++ \
g++-symlinks \
+ gcc \
+ gcc-symlinks \
intltool \
ldd \
less \
@@ -85,9 +85,9 @@ RDEPENDS_task-self-hosted-sdk = "\
RDEPENDS_task-self-hosted-debug = " \
gdb \
gdbserver \
- tcf-agent \
rsync \
- strace"
+ strace \
+ tcf-agent"
RDEPENDS_task-self-hosted-extended = "\
@@ -101,16 +101,17 @@ RDEPENDS_task-self-hosted-extended = "\
elfutils \
expat \
gamin \
+ gawk \
gdbm \
- git \
gettext \
gettext-runtime \
+ git \
grep \
groff \
- gawk \
+ gzip \
libaio \
- libxml2 \
libusb1 \
+ libxml2 \
lrzsz \
lsof \
lzo \
@@ -133,11 +134,13 @@ RDEPENDS_task-self-hosted-extended = "\
python \
python-compile \
python-compiler \
+ python-compression \
python-core \
python-curses \
python-datetime \
python-distutils \
python-elementtree \
+ python-email \
python-fcntl \
python-logging \
python-misc \
@@ -145,17 +148,15 @@ RDEPENDS_task-self-hosted-extended = "\
python-netclient \
python-netserver \
python-pickle \
+ python-pkgutil \
python-re \
python-rpm \
python-shell \
python-sqlite3 \
python-subprocess \
python-textutils \
- python-xmlrpc \
- python-email \
python-unixadmin \
- python-compression \
- python-pkgutil \
+ python-xmlrpc \
quota \
readline \
rpm \
@@ -164,12 +165,11 @@ RDEPENDS_task-self-hosted-extended = "\
sudo \
sysstat \
tar \
- gzip \
tcl \
texi2html \
texinfo \
- usbutils \
unzip \
+ usbutils \
watchdog \
wget \
which \
@@ -180,7 +180,7 @@ RDEPENDS_task-self-hosted-extended = "\
RDEPENDS_task-self-hosted-graphics = "\
- python-pygtk \
+ builder \
libgl \
libgl-dev \
libglu \
@@ -188,5 +188,5 @@ RDEPENDS_task-self-hosted-graphics = "\
libsdl \
libsdl-dev \
libx11-dev \
- builder \
+ python-pygtk \
"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* [CONSOLIDATED PULL 25/25] distro_tracking_fields: fix typos
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
` (23 preceding siblings ...)
2012-02-23 15:58 ` [CONSOLIDATED PULL 24/25] task-self-hosted: make the package lists alphabetical Saul Wold
@ 2012-02-23 15:58 ` Saul Wold
2012-02-24 0:01 ` [CONSOLIDATED PULL 00/25] Catching up from ELC Richard Purdie
25 siblings, 0 replies; 27+ messages in thread
From: Saul Wold @ 2012-02-23 15:58 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 5381c18..686bdf7 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -5900,7 +5900,7 @@ RECIPE_LAST_UPDATE_pn-gthumb = "Nov 30, 2011"
RECIPE_MAINTAINER_pn-gthumb = "Joshua Lock <josh@linux.intel.com>"
RECIPE_LATEST_VERSION_pn-mx = "1.4.2"
-RECIPE_LAST_UPDATE_pn-mx = "Deb 08, 2012"
+RECIPE_LAST_UPDATE_pn-mx = "Dec 08, 2012"
RECIPE_MAINTAINER_pn-mx = "Joshua Lock <josh@linux.intel.com>"
RECIPE_LATEST_VERSION_pn-json-glib = "0.14.2"
@@ -6135,7 +6135,7 @@ RECIPE_STATUS_pn-rxvt-unicode = "green"
RECIPE_DEPENDENCY_CHECK_pn-rxvt-unicode = "not done"
RECIPE_LATEST_VERSION_pn-rxvt-unicode = "9.15"
RECIPE_LATEST_RELEASE_DATE_pn-rxvt-unicode = "Jan 21, 2012"
-RECIPE_LAST_UPDATE_pn-rxvt-unicode = "Fev 02, 2012"
+RECIPE_LAST_UPDATE_pn-rxvt-unicode = "Feb 02, 2012"
RECIPE_NO_UPDATE_REASON_pn-rxvt-unicode = ""
RECIPE_NO_OF_PATCHES_pn-rxvt-unicode = "1"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-rxvt-unicode = ""
--
1.7.6.5
^ permalink raw reply related [flat|nested] 27+ messages in thread* Re: [CONSOLIDATED PULL 00/25] Catching up from ELC
2012-02-23 15:58 [CONSOLIDATED PULL 00/25] Catching up from ELC Saul Wold
` (24 preceding siblings ...)
2012-02-23 15:58 ` [CONSOLIDATED PULL 25/25] distro_tracking_fields: fix typos Saul Wold
@ 2012-02-24 0:01 ` Richard Purdie
25 siblings, 0 replies; 27+ messages in thread
From: Richard Purdie @ 2012-02-24 0:01 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, 2012-02-23 at 07:58 -0800, Saul Wold wrote:
> Richard,
>
> Here are a batch of changes reviewed and built
>
>
> The following changes since commit 55f72b98f606c1554eb6edd151292ffdfddf1384:
>
> texi2html: Fix for multilib (2012-02-22 23:01:45 +0000)
>
> 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
>
> Andreas Oberritter (5):
> xorg-lib: don't build libs unless requested by DISTRO_FEATURES
> autotools.bbclass: Don't copy into non-existant directory
> busybox: don't create /etc/default
> gst-plugins-base: depend on libx11 and libxv conditionally
> mpeg2dec: depend on libx11 conditionally
>
> Andrei Gherzan (7):
> dhcp: Update to 4.2.3-P2
> nspr: Integrate version 4.8.9
> nspr: Compile nspr with tests
> nspr: Add patch in order to remove rpath from binaries
> e2fsprogs: e2initrd_helper was moved in libdir but not packaged
> correctly in FILES_libext2fs
> dbus: Remove empty ${lindir}dbus-1.0/test directory as we don't build
> tests
> openssl: Move libcrypto to base_libdir
>
> Dexuan Cui (2):
> task-self-hosted: remove duplicate packages
> task-self-hosted: make the package lists alphabetical
>
> Gary Thomas (1):
> initscripts: Make /etc/timestamp consistent again.
>
> Martin Jansa (1):
> wireless-tools: remove ldconfig call from install-libs
>
> Mike Crowe (1):
> e2fsprogs: Cope with ${libdir} and ${base_libdir} being the same
>
> Robert Yang (1):
> A script to clean obsolete sstate cache files
>
> Saul Wold (6):
> syslinux: Use SYSLINUX_TIMEOUT and SYSLINUX_PROMPT to configure
> syslinux
> syslinux: add SYSLINUX_ROOT to APPEND line
> image_types: add vmdk type to use with VMware
> image-live: fix SYSLINUX_TIME and add SYSLINUX_ROOT instead of APPEND
> boot-directdisk: Use correct SYSLINUX_TIMEOUT and SYSLINUX_ROOT
> instead of APPEND
> distro_tracking_fields: fix typos
>
> Yauhen Kharuzhy (1):
> ppp: Fix rp-pppoe plugin compilation
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 27+ messages in thread