* [CONSOLIDATED PULL 01/43] augeas: Add libxml2 dependency
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
@ 2012-04-20 16:44 ` Saul Wold
2012-07-17 20:50 ` McClintock Matthew-B29882
2012-04-20 16:44 ` [CONSOLIDATED PULL 02/43] rt-tests: fix dependency on eglibc, clean LDFLAGS passing Saul Wold
` (42 subsequent siblings)
43 siblings, 1 reply; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:44 UTC (permalink / raw)
To: openembedded-core
From: Martin Donnelly <martin.donnelly@ge.com>
This patch fixes the following Augeas configure error.
| checking for LIBXML... no
| configure: error: Package requirements (libxml-2.0) were not met:
|
| No package 'libxml-2.0' found
|
| Consider adjusting the PKG_CONFIG_PATH environment variable if you
| installed software in a non-standard prefix.
|
| Alternatively, you may set the environment variables LIBXML_CFLAGS
| and LIBXML_LIBS to avoid the need to call pkg-config.
| See the pkg-config man page for more details.
| ERROR: oe_runconf failed
Signed-off-by: Martin Donnelly <martin.donnelly@ge.com>
---
meta/recipes-extended/augeas/augeas.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/augeas/augeas.inc b/meta/recipes-extended/augeas/augeas.inc
index 40be762..9fe864d 100644
--- a/meta/recipes-extended/augeas/augeas.inc
+++ b/meta/recipes-extended/augeas/augeas.inc
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff"
SRC_URI = "http://augeas.net/download/${BP}.tar.gz"
-DEPENDS = "readline"
+DEPENDS = "readline libxml2"
inherit autotools
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [CONSOLIDATED PULL 01/43] augeas: Add libxml2 dependency
2012-04-20 16:44 ` [CONSOLIDATED PULL 01/43] augeas: Add libxml2 dependency Saul Wold
@ 2012-07-17 20:50 ` McClintock Matthew-B29882
0 siblings, 0 replies; 52+ messages in thread
From: McClintock Matthew-B29882 @ 2012-07-17 20:50 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer, Scott Garman
denzil needs this commit to get build order right. I've added it too:
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=mattsm/denzil
-M
On Fri, Apr 20, 2012 at 11:44 AM, Saul Wold <sgw@linux.intel.com> wrote:
> From: Martin Donnelly <martin.donnelly@ge.com>
>
> This patch fixes the following Augeas configure error.
>
> | checking for LIBXML... no
> | configure: error: Package requirements (libxml-2.0) were not met:
> |
> | No package 'libxml-2.0' found
> |
> | Consider adjusting the PKG_CONFIG_PATH environment variable if you
> | installed software in a non-standard prefix.
> |
> | Alternatively, you may set the environment variables LIBXML_CFLAGS
> | and LIBXML_LIBS to avoid the need to call pkg-config.
> | See the pkg-config man page for more details.
> | ERROR: oe_runconf failed
>
> Signed-off-by: Martin Donnelly <martin.donnelly@ge.com>
> ---
> meta/recipes-extended/augeas/augeas.inc | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-extended/augeas/augeas.inc b/meta/recipes-extended/augeas/augeas.inc
> index 40be762..9fe864d 100644
> --- a/meta/recipes-extended/augeas/augeas.inc
> +++ b/meta/recipes-extended/augeas/augeas.inc
> @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff"
>
> SRC_URI = "http://augeas.net/download/${BP}.tar.gz"
>
> -DEPENDS = "readline"
> +DEPENDS = "readline libxml2"
>
> inherit autotools
>
> --
> 1.7.7.6
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 52+ messages in thread
* [CONSOLIDATED PULL 02/43] rt-tests: fix dependency on eglibc, clean LDFLAGS passing
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
2012-04-20 16:44 ` [CONSOLIDATED PULL 01/43] augeas: Add libxml2 dependency Saul Wold
@ 2012-04-20 16:44 ` Saul Wold
2012-04-20 20:04 ` Denys Dmytriyenko
2012-04-20 16:44 ` [CONSOLIDATED PULL 03/43] connman: Fix linking with gold linker Saul Wold
` (41 subsequent siblings)
43 siblings, 1 reply; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:44 UTC (permalink / raw)
To: openembedded-core
From: Denys Dmytriyenko <denys@ti.com>
Replace dependency on eglibc with virtual/libc
Pass LDFLAGS to TARGET_CC_ARCH, instead of CFLAGS as Makefile overrides it
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta/recipes-rt/rt-tests/rt-tests_0.83.bb | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.83.bb b/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
index 6c4931e..e38ada9 100644
--- a/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
+++ b/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
@@ -18,8 +18,7 @@ SRC_URI = "git://github.com/clrkwllms/rt-tests.git \
S = "${WORKDIR}/git"
-# need to append rt-tests' default CFLAGS to ours
-CFLAGS += "-I${S}/src/include -D_GNU_SOURCE -Wall -Wno-nonnulli"
+TARGET_CC_ARCH += "${LDFLAGS}"
# calling 'uname -m' is broken on crossbuilds
EXTRA_OEMAKE = "NUMA=0"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [CONSOLIDATED PULL 02/43] rt-tests: fix dependency on eglibc, clean LDFLAGS passing
2012-04-20 16:44 ` [CONSOLIDATED PULL 02/43] rt-tests: fix dependency on eglibc, clean LDFLAGS passing Saul Wold
@ 2012-04-20 20:04 ` Denys Dmytriyenko
2012-04-20 20:10 ` Saul Wold
0 siblings, 1 reply; 52+ messages in thread
From: Denys Dmytriyenko @ 2012-04-20 20:04 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, Apr 20, 2012 at 09:44:53AM -0700, Saul Wold wrote:
> From: Denys Dmytriyenko <denys@ti.com>
>
> Replace dependency on eglibc with virtual/libc
> Pass LDFLAGS to TARGET_CC_ARCH, instead of CFLAGS as Makefile overrides it
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
That's already been fixed differently:
http://cgit.openembedded.org/openembedded-core/commit/?id=fb89e4585644db0958a633a637fc70f0459af26a
--
Denys
> ---
> meta/recipes-rt/rt-tests/rt-tests_0.83.bb | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.83.bb b/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
> index 6c4931e..e38ada9 100644
> --- a/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
> +++ b/meta/recipes-rt/rt-tests/rt-tests_0.83.bb
> @@ -18,8 +18,7 @@ SRC_URI = "git://github.com/clrkwllms/rt-tests.git \
>
> S = "${WORKDIR}/git"
>
> -# need to append rt-tests' default CFLAGS to ours
> -CFLAGS += "-I${S}/src/include -D_GNU_SOURCE -Wall -Wno-nonnulli"
> +TARGET_CC_ARCH += "${LDFLAGS}"
>
> # calling 'uname -m' is broken on crossbuilds
> EXTRA_OEMAKE = "NUMA=0"
> --
> 1.7.7.6
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 52+ messages in thread
* [CONSOLIDATED PULL 03/43] connman: Fix linking with gold linker
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
2012-04-20 16:44 ` [CONSOLIDATED PULL 01/43] augeas: Add libxml2 dependency Saul Wold
2012-04-20 16:44 ` [CONSOLIDATED PULL 02/43] rt-tests: fix dependency on eglibc, clean LDFLAGS passing Saul Wold
@ 2012-04-20 16:44 ` Saul Wold
2012-04-20 16:44 ` [CONSOLIDATED PULL 04/43] connman: backport test script fixes Saul Wold
` (40 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:44 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Fixes errors like below
/home/kraj/work/angstrom/build/tmp-angstrom_2010_x-eglibc/sysroots/x86_64-linux/usr/libexec/armv5te-angstrom-linux-gnueabi/gcc/arm-angstrom-linux-gnueabi/4.6.3/ld:
error: hidden symbol '__start___debug' is not defined locally
/home/kraj/work/angstrom/build/tmp-angstrom_2010_x-eglibc/sysroots/x86_64-linux/usr/libexec/armv5te-angstrom-linux-gnueabi/gcc/arm-angstrom-linux-gnueabi/4.6.3/ld:
error: hidden symbol '__stop___debug' is not defined locally
collect2: ld returned 1 exit status
make[1]: *** [plugins/loopback.la] Error 1
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...ange-visibility-to-default-for-debug-symb.patch | 35 ++++++++++++++++++++
meta/recipes-connectivity/connman/connman_0.79.bb | 3 +-
2 files changed, 37 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch
diff --git a/meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch b/meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch
new file mode 100644
index 0000000..e6f03e6
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch
@@ -0,0 +1,35 @@
+From 4ddaf78dad5a9ee4a0658235f71b75132192123e Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 7 Apr 2012 18:52:12 -0700
+Subject: [PATCH] plugin.h: Change visibility to default for debug symbols
+
+gold refuses to link in undefined weak symbols which
+have hidden visibility
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+
+Upstream-Status: Pending
+---
+ include/plugin.h | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/plugin.h b/include/plugin.h
+index 692a4e5..a9361c3 100644
+--- a/include/plugin.h
++++ b/include/plugin.h
+@@ -89,9 +89,9 @@ struct connman_plugin_desc {
+ #else
+ #define CONNMAN_PLUGIN_DEFINE(name, description, version, priority, init, exit) \
+ extern struct connman_debug_desc __start___debug[] \
+- __attribute__ ((weak, visibility("hidden"))); \
++ __attribute__ ((weak, visibility("default"))); \
+ extern struct connman_debug_desc __stop___debug[] \
+- __attribute__ ((weak, visibility("hidden"))); \
++ __attribute__ ((weak, visibility("default"))); \
+ extern struct connman_plugin_desc connman_plugin_desc \
+ __attribute__ ((visibility("default"))); \
+ struct connman_plugin_desc connman_plugin_desc = { \
+--
+1.7.5.4
+
diff --git a/meta/recipes-connectivity/connman/connman_0.79.bb b/meta/recipes-connectivity/connman/connman_0.79.bb
index f87c4dd..da48e94 100644
--- a/meta/recipes-connectivity/connman/connman_0.79.bb
+++ b/meta/recipes-connectivity/connman/connman_0.79.bb
@@ -6,6 +6,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \
file://add_xuser_dbus_permission.patch \
file://ethernet_default.patch \
file://disable_alg-test.patch \
+ file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
file://connman"
S = "${WORKDIR}/git"
-PR = "r1"
+PR = "r2"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 04/43] connman: backport test script fixes
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (2 preceding siblings ...)
2012-04-20 16:44 ` [CONSOLIDATED PULL 03/43] connman: Fix linking with gold linker Saul Wold
@ 2012-04-20 16:44 ` Saul Wold
2012-04-20 16:44 ` [CONSOLIDATED PULL 05/43] python: use PKGSUFFIX for libpython2 Saul Wold
` (39 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:44 UTC (permalink / raw)
To: openembedded-core
From: Otavio Salvador <otavio@ossystems.com.br>
Those fixes are required to get the test scripts to work with current
0.79 DBus API.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
.../connman/test-set-ipv4-method-api-fix.patch | 50 ++++++++++++++++++
.../connman/test-set-ipv6-method-api-fix.patch | 55 ++++++++++++++++++++
meta/recipes-connectivity/connman/connman_0.79.bb | 4 +-
3 files changed, 108 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch
create mode 100644 meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch
diff --git a/meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch b/meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch
new file mode 100644
index 0000000..78eb19a
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch
@@ -0,0 +1,50 @@
+From 0b817dd3096f5c3ca8f0b868ee55ea550054137b Mon Sep 17 00:00:00 2001
+From: Daniel Wagner <daniel.wagner@bmw-carit.de>
+Date: Mon, 19 Mar 2012 14:03:27 +0100
+Subject: [PATCH 3/3] set-ipv4-method: The arguments have to be wrapped into a
+ variant
+
+Fixes BMC#24986
+
+Upstream-Status: Backport
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ test/set-ipv4-method | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/test/set-ipv4-method b/test/set-ipv4-method
+index 820b24b..235113f 100755
+--- a/test/set-ipv4-method
++++ b/test/set-ipv4-method
+@@ -3,6 +3,9 @@
+ import sys
+ import dbus
+
++def make_variant(string):
++ return dbus.String(string, variant_level=1)
++
+ def print_usage():
+ print "Usage: %s <service> [off|dhcp|manual <address> [netmask] [gateway]]" % (sys.argv[0])
+
+@@ -20,13 +23,13 @@ properties = service.GetProperties()
+
+ print "Setting method %s for %s" % (sys.argv[2], sys.argv[1])
+
+-ipv4_configuration = { "Method": sys.argv[2] }
++ipv4_configuration = { "Method": make_variant(sys.argv[2]) }
+ if (len(sys.argv) > 3):
+- ipv4_configuration["Address"] = sys.argv[3]
++ ipv4_configuration["Address"] = make_variant(sys.argv[3])
+ if (len(sys.argv) > 4):
+- ipv4_configuration["Netmask"] = sys.argv[4]
++ ipv4_configuration["Netmask"] = make_variant(sys.argv[4])
+ if (len(sys.argv) > 5):
+- ipv4_configuration["Gateway"] = sys.argv[5]
++ ipv4_configuration["Gateway"] = make_variant(sys.argv[5])
+
+ service.SetProperty("IPv4.Configuration", ipv4_configuration)
+ print "New IPv4.Configuration: ", ipv4_configuration
+--
+1.7.9.5
+
diff --git a/meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch b/meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch
new file mode 100644
index 0000000..773127b
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch
@@ -0,0 +1,55 @@
+From 2885e71c9c0df7ea9866e91ab79d255eaa8de53d Mon Sep 17 00:00:00 2001
+From: Daniel Wagner <daniel.wagner@bmw-carit.de>
+Date: Mon, 19 Mar 2012 14:03:28 +0100
+Subject: [PATCH 2/3] set-ipv6-method: The arguments have to be wrapped into a
+ variant
+
+Fixes BMC#24986
+
+Upstream-Status: Backport
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ test/set-ipv6-method | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/test/set-ipv6-method b/test/set-ipv6-method
+index 7f60b88..4f2de09 100755
+--- a/test/set-ipv6-method
++++ b/test/set-ipv6-method
+@@ -3,6 +3,9 @@
+ import sys
+ import dbus
+
++def make_variant(string):
++ return dbus.String(string, variant_level=1)
++
+ def print_usage():
+ print "Usage: %s <service> off|manual|auto [<address> [prefixlen] [gateway]] [<privacy>]" % (sys.argv[0])
+
+@@ -19,17 +22,17 @@ properties = service.GetProperties()
+
+ print "Setting method %s for %s" % (sys.argv[2], sys.argv[1])
+
+-ipv6_configuration = { "Method": sys.argv[2] }
++ipv6_configuration = { "Method": make_variant(sys.argv[2])}
+ if sys.argv[2] == "auto":
+ if (len(sys.argv) > 3):
+- ipv6_configuration["Privacy"] = sys.argv[3]
++ ipv6_configuration["Privacy"] = make_variant(sys.argv[3])
+ else:
+ if (len(sys.argv) > 3):
+- ipv6_configuration["Address"] = sys.argv[3]
++ ipv6_configuration["Address"] = make_variant(sys.argv[3])
+ if (len(sys.argv) > 4):
+- ipv6_configuration["PrefixLength"] = sys.argv[4]
++ ipv6_configuration["PrefixLength"] = make_variant(sys.argv[4])
+ if (len(sys.argv) > 5):
+- ipv6_configuration["Gateway"] = sys.argv[5]
++ ipv6_configuration["Gateway"] = make_variant(sys.argv[5])
+
+ service.SetProperty("IPv6.Configuration", ipv6_configuration)
+ print "New IPv6.Configuration: ", ipv6_configuration
+--
+1.7.9.5
+
diff --git a/meta/recipes-connectivity/connman/connman_0.79.bb b/meta/recipes-connectivity/connman/connman_0.79.bb
index da48e94..4c57dab 100644
--- a/meta/recipes-connectivity/connman/connman_0.79.bb
+++ b/meta/recipes-connectivity/connman/connman_0.79.bb
@@ -7,6 +7,8 @@ SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \
file://ethernet_default.patch \
file://disable_alg-test.patch \
file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
+ file://test-set-ipv4-method-api-fix.patch \
+ file://test-set-ipv6-method-api-fix.patch \
file://connman"
S = "${WORKDIR}/git"
-PR = "r2"
+PR = "r3"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 05/43] python: use PKGSUFFIX for libpython2
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (3 preceding siblings ...)
2012-04-20 16:44 ` [CONSOLIDATED PULL 04/43] connman: backport test script fixes Saul Wold
@ 2012-04-20 16:44 ` Saul Wold
2012-04-20 16:44 ` [CONSOLIDATED PULL 06/43] wpa-supplicant: remove unused files Saul Wold
` (38 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:44 UTC (permalink / raw)
To: openembedded-core
From: Andreas Oberritter <obi@opendreambox.org>
* python-nativesdk shouldn't provide libpython2, but
libpython2-nativesdk.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
[PR Bump - sgw]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/python/python_2.7.2.bb | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb
index 95e17a8..3deed4c 100644
--- a/meta/recipes-devtools/python/python_2.7.2.bb
+++ b/meta/recipes-devtools/python/python_2.7.2.bb
@@ -1,6 +1,6 @@
require python.inc
DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib"
-PR = "${INC_PR}.12"
+PR = "${INC_PR}.13"
DISTRO_SRC_URI ?= "file://sitecustomize.py"
DISTRO_SRC_URI_linuxstdbase = ""
@@ -133,8 +133,8 @@ RRECOMMENDS_${PN}-core = "${PN}-readline"
RRECOMMENDS_${PN}-crypt = "openssl"
# package libpython2
-PACKAGES =+ "lib${BPN}2"
-FILES_lib${BPN}2 = "${libdir}/libpython*.so.*"
+PACKAGES =+ "lib${BPN}2${PKGSUFFIX}"
+FILES_lib${BPN}2${PKGSUFFIX} = "${libdir}/libpython*.so.*"
# catch debug extensions (isn't that already in python-core-dbg?)
FILES_${PN}-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug"
@@ -148,3 +148,6 @@ PACKAGES += "${PN}-man"
FILES_${PN}-man = "${datadir}/man"
BBCLASSEXTEND = "nativesdk"
+
+PKGSUFFIX = ""
+PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 06/43] wpa-supplicant: remove unused files
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (4 preceding siblings ...)
2012-04-20 16:44 ` [CONSOLIDATED PULL 05/43] python: use PKGSUFFIX for libpython2 Saul Wold
@ 2012-04-20 16:44 ` Saul Wold
2012-04-20 16:44 ` [CONSOLIDATED PULL 07/43] wpa-supplicant: move wpa_passphrase to bindir Saul Wold
` (37 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:44 UTC (permalink / raw)
To: openembedded-core
From: Andreas Oberritter <obi@opendreambox.org>
* defconfig, init.sh, wpa_supplicant-0.5.7-always-scan.patch,
wpa_supplicant-fix-deprecated-dbus-function.patch and
wpa_supplicant_default.conf are not used by the recipe.
* default-sane gets installed but is unused.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
.../wpa-supplicant-0.7.3/defaults-sane | 8 -
.../wpa-supplicant/wpa-supplicant-0.7.3/defconfig | 157 ----------------
.../wpa-supplicant/wpa-supplicant-0.7.3/init.sh | 50 -----
.../wpa_supplicant-0.5.7-always-scan.patch | 14 --
...a_supplicant-fix-deprecated-dbus-function.patch | 189 --------------------
.../wpa_supplicant_default.conf | 13 --
.../wpa-supplicant/wpa-supplicant-0.7.inc | 4 +-
.../wpa-supplicant/wpa-supplicant_0.7.3.bb | 2 +-
8 files changed, 2 insertions(+), 435 deletions(-)
delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defaults-sane
delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defconfig
delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/init.sh
delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-0.5.7-always-scan.patch
delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-fix-deprecated-dbus-function.patch
delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant_default.conf
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defaults-sane b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defaults-sane
deleted file mode 100644
index 67c4cbd..0000000
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defaults-sane
+++ /dev/null
@@ -1,8 +0,0 @@
-# Useful flags:
-# -i <ifname> Interface (required, unless specified in config)
-# -D <driver> Wireless Driver
-# -d Debugging (-dd for more)
-# -q Quiet (-qq for more)
-
-CONFIG="/etc/wpa_supplicant.conf"
-OPTIONS="-i eth1 -D wext"
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defconfig b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defconfig
deleted file mode 100644
index c165343..0000000
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defconfig
+++ /dev/null
@@ -1,157 +0,0 @@
-# This file lists the configuration options that are used when building the
-# hostapd binary. All lines starting with # are ignored. Configuration option
-# lines must be commented out complete, if they are not to be included, i.e.,
-# just setting VARIABLE=n is not disabling that variable.
-#
-# This file is included in Makefile, so variables like CFLAGS and LIBS can also
-# be modified from here. In most cass, these lines should use += in order not
-# to override previous values of the variables.
-
-CFLAGS = $(TARGET_CFLAGS) -I../hostapd -I../utils -I../driver/modules -Wall -MMD
-
-# for wpa_supplicant, wpa_cli
-LIBS = $(TARGET_LDFLAGS)
-
-# for wpa_passphrase:
-LIBS_p = $(TARGET_LDFLAGS)
-
-
-# Uncomment following two lines and fix the paths if you have installed openssl
-# in non-default location
-#CFLAGS += -I/usr/local/openssl/include
-#LIBS += -L/usr/local/openssl/lib
-
-# Example configuration for various cross-compilation platforms
-
-#### sveasoft (e.g., for Linksys WRT54G) ######################################
-#CC=mipsel-uclibc-gcc
-#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
-#CFLAGS += -Os
-#CPPFLAGS += -I../src/include -I../../src/router/openssl/include
-#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl
-###############################################################################
-
-#### openwrt (e.g., for Linksys WRT54G) #######################################
-#CC=mipsel-uclibc-gcc
-#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
-#CFLAGS += -Os
-#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \
-# -I../WRT54GS/release/src/include
-#LIBS = -lssl
-###############################################################################
-
-
-# Driver interface for Host AP driver
-CONFIG_DRIVER_HOSTAP=y
-
-# Driver interface for Agere driver
-CONFIG_DRIVER_HERMES=y
-
-# Driver interface for madwifi driver
-#CONFIG_DRIVER_MADWIFI=y
-# Change include directories to match with the local setup
-#CFLAGS += -I../madwifi/wpa
-
-# Driver interface for Prism54 driver
-#CONFIG_DRIVER_PRISM54=y
-
-# Driver interface for ndiswrapper
-#CONFIG_DRIVER_NDISWRAPPER=y
-
-# Driver interface for Atmel driver
-#CONFIG_DRIVER_ATMEL=y
-
-# Driver interface for Broadcom driver
-#CONFIG_DRIVER_BROADCOM=y
-# Example path for wlioctl.h; change to match your configuration
-#CFLAGS += -I/opt/WRT54GS/release/src/include
-
-# Driver interface for Intel ipw2100 driver
-#CONFIG_DRIVER_IPW2100=y
-
-# Driver interface for generic Linux wireless extensions
-CONFIG_DRIVER_WEXT=y
-
-# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
-#CONFIG_DRIVER_BSD=y
-#CFLAGS += -I/usr/local/include
-#LIBS += -L/usr/local/lib
-
-# Driver interface for Windows NDIS
-#CONFIG_DRIVER_NDIS=y
-#CFLAGS += -I/usr/include/w32api/ddk
-#LIBS += -L/usr/local/lib
-# For native build using mingw
-#CONFIG_NATIVE_WINDOWS=y
-# Additional directories for cross-compilation on Linux host for mingw target
-#CFLAGS += -I/opt/mingw/mingw32/include/ddk
-#LIBS += -L/opt/mingw/mingw32/lib
-#CC=mingw32-gcc
-
-# Driver interface for development testing
-#CONFIG_DRIVER_TEST=y
-
-# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
-# included)
-CONFIG_IEEE8021X_EAPOL=y
-
-# EAP-MD5 (automatically included if EAP-TTLS is enabled)
-CONFIG_EAP_MD5=y
-
-# EAP-MSCHAPv2 (automatically included if EAP-PEAP is enabled)
-CONFIG_EAP_MSCHAPV2=y
-
-# EAP-TLS
-CONFIG_EAP_TLS=y
-
-# EAL-PEAP
-CONFIG_EAP_PEAP=y
-
-# EAP-TTLS
-CONFIG_EAP_TTLS=y
-
-# EAP-GTC
-CONFIG_EAP_GTC=y
-
-# EAP-OTP
-CONFIG_EAP_OTP=y
-
-# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
-#CONFIG_EAP_SIM=y
-
-# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
-#CONFIG_EAP_PSK=y
-
-# LEAP
-CONFIG_EAP_LEAP=y
-
-# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
-#CONFIG_EAP_AKA=y
-
-# PKCS#12 (PFX) support (used to read private key and certificate file from
-# a file that usually has extension .p12 or .pfx)
-CONFIG_PKCS12=y
-
-# PC/SC interface for smartcards (USIM, GSM SIM)
-# Enable this if EAP-SIM or EAP-AKA is included
-#CONFIG_PCSC=y
-
-# Development testing
-#CONFIG_EAPOL_TEST=y
-
-# Replace native Linux implementation of packet sockets with libdnet/libpcap.
-# This will be automatically set for non-Linux OS.
-#CONFIG_DNET_PCAP=y
-
-# Include control interface for external programs, e.g, wpa_cli
-CONFIG_CTRL_IFACE=y
-
-# Include interface for using external supplicant (Xsupplicant) for EAP
-# authentication
-#CONFIG_XSUPPLICANT_IFACE=y
-
-# Include support for GNU Readline and History Libraries in wpa_cli.
-# When building a wpa_cli binary for distribution, please note that these
-# libraries are licensed under GPL and as such, BSD license may not apply for
-# the resulting binary.
-#CONFIG_READLINE=y
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/init.sh b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/init.sh
deleted file mode 100644
index bc7ee91..0000000
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/init.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-
-DAEMON=/usr/sbin/wpa_supplicant
-CONFIG="/etc/wpa_supplicant.conf"
-PNAME="wpa_supplicant"
-
-# insane defaults
-OPTIONS=""
-
-test -f /etc/default/wpa && . /etc/default/wpa
-
-if [ ! -f $CONFIG ]; then
- echo "No configuration file found, not starting."
- exit 1
-fi
-
-test -f $DAEMON || exit 0
-
-case "$1" in
- start)
- echo -n "Starting wpa_supplicant: "
- start-stop-daemon -S -b -x $DAEMON -- -Bw -c $CONFIG $OPTIONS >/dev/null
- echo "done."
- ;;
- stop)
- echo -n "Stopping wpa_supplicant: "
- start-stop-daemon -K -n $PNAME >/dev/null
- echo "done."
- ;;
- reload|force-reload)
- echo -n "Reloading wpa_supplicant: "
- killall -HUP $PNAME
- echo "done."
- ;;
- restart)
- echo -n "Restarting wpa_supplicant: "
- start-stop-daemon -K -n $PNAME >/dev/null
- sleep 1
- start-stop-daemon -S -b -x $DAEMON -- -Bw -c $CONFIG $OPTIONS >/dev/null
- echo "done."
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-0.5.7-always-scan.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-0.5.7-always-scan.patch
deleted file mode 100644
index 5485d55..0000000
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-0.5.7-always-scan.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-diff -up wpa_supplicant-0.5.7/wpa_supplicant.c.always-scan wpa_supplicant-0.5.7/wpa_supplicant.c
---- wpa_supplicant-0.5.7/wpa_supplicant.c.always-scan 2007-09-25 15:51:35.000000000 -0400
-+++ wpa_supplicant-0.5.7/wpa_supplicant.c 2007-09-25 16:31:27.000000000 -0400
-@@ -972,7 +972,7 @@ static void wpa_supplicant_scan(void *el
- struct wpa_ssid *ssid;
- int enabled, scan_req = 0, ret;
-
-- if (wpa_s->disconnected)
-+ if (wpa_s->disconnected && !wpa_s->scan_req)
- return;
-
- enabled = 0;
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-fix-deprecated-dbus-function.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-fix-deprecated-dbus-function.patch
deleted file mode 100644
index a1898c3..0000000
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-fix-deprecated-dbus-function.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-Upstream-Status: Inappropriate [not used]
-
---- dbus_dict_helpers.c.array-fix 2006-12-18 12:31:11.000000000 -0500
-+++ dbus_dict_helpers.c 2006-12-20 03:17:08.000000000 -0500
-@@ -629,36 +629,55 @@ dbus_bool_t wpa_dbus_dict_open_read(DBus
- }
-
-
-+#define BYTE_ARRAY_CHUNK_SIZE 34
-+#define BYTE_ARRAY_ITEM_SIZE (sizeof (char))
-+
- static dbus_bool_t _wpa_dbus_dict_entry_get_byte_array(
-- DBusMessageIter *iter, int array_len, int array_type,
-+ DBusMessageIter *iter, int array_type,
- struct wpa_dbus_dict_entry *entry)
- {
-- dbus_uint32_t i = 0;
-+ dbus_uint32_t count = 0;
- dbus_bool_t success = FALSE;
-- char byte;
-+ char * buffer;
-
-- /* Zero-length arrays are valid. */
-- if (array_len == 0) {
-- entry->bytearray_value = NULL;
-- entry->array_type = DBUS_TYPE_BYTE;
-- success = TRUE;
-- goto done;
-- }
-+ entry->bytearray_value = NULL;
-+ entry->array_type = DBUS_TYPE_BYTE;
-
-- entry->bytearray_value = wpa_zalloc(array_len * sizeof(char));
-- if (!entry->bytearray_value) {
-+ buffer = wpa_zalloc(BYTE_ARRAY_ITEM_SIZE * BYTE_ARRAY_CHUNK_SIZE);
-+ if (!buffer) {
- perror("_wpa_dbus_dict_entry_get_byte_array[dbus]: out of "
- "memory");
- goto done;
- }
-
-- entry->array_type = DBUS_TYPE_BYTE;
-- entry->array_len = array_len;
-+ entry->bytearray_value = buffer;
-+ entry->array_len = 0;
- while (dbus_message_iter_get_arg_type(iter) == DBUS_TYPE_BYTE) {
-+ char byte;
-+
-+ if ((count % BYTE_ARRAY_CHUNK_SIZE) == 0 && count != 0) {
-+ buffer = realloc(buffer, BYTE_ARRAY_ITEM_SIZE * (count + BYTE_ARRAY_CHUNK_SIZE));
-+ if (buffer == NULL) {
-+ perror("_wpa_dbus_dict_entry_get_byte_array["
-+ "dbus] out of memory trying to "
-+ "retrieve the string array");
-+ goto done;
-+ }
-+ }
-+ entry->bytearray_value = buffer;
-+
- dbus_message_iter_get_basic(iter, &byte);
-- entry->bytearray_value[i++] = byte;
-+ entry->bytearray_value[count] = byte;
-+ entry->array_len = ++count;
- dbus_message_iter_next(iter);
- }
-+
-+ /* Zero-length arrays are valid. */
-+ if (entry->array_len == 0) {
-+ free(entry->bytearray_value);
-+ entry->strarray_value = NULL;
-+ }
-+
- success = TRUE;
-
- done:
-@@ -666,8 +685,11 @@ done:
- }
-
-
-+#define STR_ARRAY_CHUNK_SIZE 8
-+#define STR_ARRAY_ITEM_SIZE (sizeof (char *))
-+
- static dbus_bool_t _wpa_dbus_dict_entry_get_string_array(
-- DBusMessageIter *iter, int array_len, int array_type,
-+ DBusMessageIter *iter, int array_type,
- struct wpa_dbus_dict_entry *entry)
- {
- dbus_uint32_t count = 0;
-@@ -677,13 +699,7 @@ static dbus_bool_t _wpa_dbus_dict_entry_
- entry->strarray_value = NULL;
- entry->array_type = DBUS_TYPE_STRING;
-
-- /* Zero-length arrays are valid. */
-- if (array_len == 0) {
-- success = TRUE;
-- goto done;
-- }
--
-- buffer = wpa_zalloc(sizeof (char *) * 8);
-+ buffer = wpa_zalloc(STR_ARRAY_ITEM_SIZE * STR_ARRAY_CHUNK_SIZE);
- if (buffer == NULL) {
- perror("_wpa_dbus_dict_entry_get_string_array[dbus] out of "
- "memory trying to retrieve a string array");
-@@ -696,18 +712,14 @@ static dbus_bool_t _wpa_dbus_dict_entry_
- const char *value;
- char *str;
-
-- if ((count % 8) == 0 && count != 0) {
-- char **tmp;
-- tmp = realloc(buffer, sizeof(char *) * (count + 8));
-- if (tmp == NULL) {
-+ if ((count % STR_ARRAY_CHUNK_SIZE) == 0 && count != 0) {
-+ buffer = realloc(buffer, STR_ARRAY_ITEM_SIZE * (count + STR_ARRAY_CHUNK_SIZE));
-+ if (buffer == NULL) {
- perror("_wpa_dbus_dict_entry_get_string_array["
- "dbus] out of memory trying to "
- "retrieve the string array");
-- free(buffer);
-- buffer = NULL;
- goto done;
- }
-- buffer = tmp;
- }
- entry->strarray_value = buffer;
-
-@@ -723,6 +735,13 @@ static dbus_bool_t _wpa_dbus_dict_entry_
- entry->array_len = ++count;
- dbus_message_iter_next(iter);
- }
-+
-+ /* Zero-length arrays are valid. */
-+ if (entry->array_len == 0) {
-+ free(entry->strarray_value);
-+ entry->strarray_value = NULL;
-+ }
-+
- success = TRUE;
-
- done:
-@@ -734,7 +753,6 @@ static dbus_bool_t _wpa_dbus_dict_entry_
- DBusMessageIter *iter_dict_val, struct wpa_dbus_dict_entry *entry)
- {
- int array_type = dbus_message_iter_get_element_type(iter_dict_val);
-- int array_len;
- dbus_bool_t success = FALSE;
- DBusMessageIter iter_array;
-
-@@ -743,20 +761,14 @@ static dbus_bool_t _wpa_dbus_dict_entry_
-
- dbus_message_iter_recurse(iter_dict_val, &iter_array);
-
-- array_len = dbus_message_iter_get_array_len(&iter_array);
-- if (array_len < 0)
-- return FALSE;
--
- switch (array_type) {
- case DBUS_TYPE_BYTE:
- success = _wpa_dbus_dict_entry_get_byte_array(&iter_array,
-- array_len,
- array_type,
- entry);
- break;
- case DBUS_TYPE_STRING:
- success = _wpa_dbus_dict_entry_get_string_array(&iter_array,
-- array_len,
- array_type,
- entry);
- break;
-@@ -943,9 +955,17 @@ void wpa_dbus_dict_entry_clear(struct wp
- break;
- case DBUS_TYPE_ARRAY:
- switch (entry->array_type) {
-- case DBUS_TYPE_BYTE:
-- free(entry->bytearray_value);
-- break;
-+ case DBUS_TYPE_BYTE: {
-+ free(entry->bytearray_value);
-+ break;
-+ }
-+ case DBUS_TYPE_STRING: {
-+ int i;
-+ for (i = 0; i < entry->array_len; i++)
-+ free (entry->strarray_value[i]);
-+ free (entry->strarray_value);
-+ break;
-+ }
- }
- break;
- }
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant_default.conf b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant_default.conf
deleted file mode 100644
index 8eebdeb..0000000
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant_default.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# This is a basic configuration for WPA with pre-shared keys (WPA-PSK)
-
-ctrl_interface=/var/run/wpa_supplicant
-ctrl_interface_group=0
-eapol_version=1
-ap_scan=1
-network={
- ssid="YOUR_SSID"
- psk="YOUR WPA PASSWORD IN HEX OR ASCII"
- key_mgmt=WPA-PSK
- pairwise=CCMP
- priority=5
-}
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
index 539ab8c..d92acac 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
@@ -11,7 +11,6 @@ RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
file://defconfig-gnutls \
- file://defaults-sane \
file://wpa-supplicant.sh \
file://wpa_supplicant.conf \
file://wpa_supplicant.conf-sane \
@@ -43,8 +42,7 @@ do_install () {
install -d ${D}${docdir}/wpa_supplicant
install -m 644 README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant
- install -d ${D}${sysconfdir}/default
- install -m 600 ${WORKDIR}/defaults-sane ${D}${sysconfdir}/default/wpa
+ install -d ${D}${sysconfdir}
install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf
install -d ${D}${sysconfdir}/network/if-pre-up.d/
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
index c607fad..94c88ba 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
@@ -1,6 +1,6 @@
require wpa-supplicant-0.7.inc
-PR = "r7"
+PR = "r8"
SRC_URI[md5sum] = "f516f191384a9a546e3f5145c08addda"
SRC_URI[sha256sum] = "d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 07/43] wpa-supplicant: move wpa_passphrase to bindir
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (5 preceding siblings ...)
2012-04-20 16:44 ` [CONSOLIDATED PULL 06/43] wpa-supplicant: remove unused files Saul Wold
@ 2012-04-20 16:44 ` Saul Wold
2012-04-20 16:44 ` [CONSOLIDATED PULL 08/43] update-alternatives.bbclass: Ensure alternatives end up in per file deps Saul Wold
` (36 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:44 UTC (permalink / raw)
To: openembedded-core
From: Andreas Oberritter <obi@opendreambox.org>
* wpa_passphrase doesn't require special privileges.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
.../wpa-supplicant/wpa-supplicant-0.7.inc | 4 +++-
.../wpa-supplicant/wpa-supplicant_0.7.3.bb | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
index d92acac..aabb3df 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc
@@ -36,9 +36,11 @@ do_compile () {
do_install () {
install -d ${D}${sbindir}
install -m 755 wpa_supplicant ${D}${sbindir}
- install -m 755 wpa_passphrase ${D}${sbindir}
install -m 755 wpa_cli ${D}${sbindir}
+ install -d ${D}${bindir}
+ install -m 755 wpa_passphrase ${D}${bindir}
+
install -d ${D}${docdir}/wpa_supplicant
install -m 644 README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
index 94c88ba..dc2eb6c 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb
@@ -1,6 +1,6 @@
require wpa-supplicant-0.7.inc
-PR = "r8"
+PR = "r9"
SRC_URI[md5sum] = "f516f191384a9a546e3f5145c08addda"
SRC_URI[sha256sum] = "d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 08/43] update-alternatives.bbclass: Ensure alternatives end up in per file deps
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (6 preceding siblings ...)
2012-04-20 16:44 ` [CONSOLIDATED PULL 07/43] wpa-supplicant: move wpa_passphrase to bindir Saul Wold
@ 2012-04-20 16:44 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 09/43] coreutils_*.bb: Use update alternatives and add missing manual alt links Saul Wold
` (35 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:44 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
Ensure that alternatives end up in per file provides, associated with the
source of the alternative.
Add a way to specify MANUAL_ALTERNATIVE_LINKS in order for programs that
manage their own alternatives to be more easily added to the per file
provides.
Add a function, package_do_filedeps_append to handle the setup of these
automatic per file dependencies. The method is based on the code in the
busybox package that does similar work. It replaces the brute force RPM
method that just adds a "Provides:" for each alternative. This version
of the code was written by Richard Purdie and modified by me.
Add a check before moving the item to see if the destination already exists,
if it does, assume the package already performed the rename. This is
necessary to deal with some packages that have symlinks pointing to renamed
items.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/classes/package.bbclass | 16 +++++---
meta/classes/package_rpm.bbclass | 4 --
meta/classes/update-alternatives.bbclass | 59 +++++++++++++++++++++++++++++-
3 files changed, 68 insertions(+), 11 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index c3f077a..99c945d 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1162,6 +1162,15 @@ python package_do_filedeps() {
rpmdeps = d.expand("${RPMDEPS}")
r = re.compile(r'[<>=]+ +[^ ]*')
+ def file_translate(file):
+ ft = file.replace("@", "@at@")
+ ft = ft.replace(" ", "@space@")
+ ft = ft.replace("\t", "@tab@")
+ ft = ft.replace("[", "@openbrace@")
+ ft = ft.replace("]", "@closebrace@")
+ ft = ft.replace("_", "@underscore@")
+ return ft
+
# Quick routine to process the results of the rpmdeps call...
def process_deps(pipe, pkg, provides_files, requires_files):
provides = {}
@@ -1179,12 +1188,7 @@ python package_do_filedeps() {
continue
file = f.replace(pkgdest + "/" + pkg, "")
- file = file.replace("@", "@at@")
- file = file.replace(" ", "@space@")
- file = file.replace("\t", "@tab@")
- file = file.replace("[", "@openbrace@")
- file = file.replace("]", "@closebrace@")
- file = file.replace("_", "@underscore@")
+ file = file_translate(file)
value = line.split(":", 1)[1].strip()
value = r.sub(r'(\g<0>)', value)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index ffe3b31..30bb08b 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -720,10 +720,6 @@ python write_specfile () {
splitrconflicts = strip_multilib(localdata.getVar('RCONFLICTS', True), d) or ""
splitrobsoletes = []
- # For now we need to manually supplement RPROVIDES with any update-alternatives links
- if pkg == d.getVar("PN", True):
- splitrprovides = splitrprovides + " " + (d.getVar('ALTERNATIVE_LINK', True) or '') + " " + (d.getVar('ALTERNATIVE_LINKS', True) or '')
-
# Gather special src/first package data
if srcname == splitname:
srcrdepends = splitrdepends
diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass
index 7b0518d..46136c8 100644
--- a/meta/classes/update-alternatives.bbclass
+++ b/meta/classes/update-alternatives.bbclass
@@ -35,6 +35,14 @@
#
# If above assumption breaks your requirement, then you still need to use
# your own update-alternatives command directly.
+#
+# Even if you specify your update-alternatives manually, you need to
+# use MANUAL_ALTERNATIVE_LINKS to specify each of the target linked items.
+# This ensures that package dependencies/provides are set appropriately.
+#
+# MANUAL_ALTERNATIVE_LINKS = "<target>:<source>"
+#
+# If no source is specified, it is assumed to be <target>.${PN}
# defaults
ALTERNATIVE_PRIORITY = "10"
@@ -71,7 +79,11 @@ done
update_alternatives_batch_doinstall() {
for link in ${ALTERNATIVE_LINKS}
do
- mv ${D}${link} ${D}${link}.${PN}
+ # Only do this if not already done..
+ # There are a few cases where a package will do this manually
+ if [ ! -e ${D}${link}.${PN} ]; then
+ mv ${D}${link} ${D}${link}.${PN}
+ fi
done
}
@@ -85,6 +97,9 @@ def update_alternatives_after_parse(d):
d.setVar('do_install', doinstall)
return
+ if d.getVar('MANUAL_ALTERNATIVE_LINKS') != None:
+ return
+
if d.getVar('ALTERNATIVE_NAME') == None:
raise bb.build.FuncFailed, "%s inherits update-alternatives but doesn't set ALTERNATIVE_NAME" % d.getVar('FILE')
if d.getVar('ALTERNATIVE_PATH') == None:
@@ -114,3 +129,45 @@ python populate_packages_prepend () {
postrm += d.getVar('update_alternatives_postrm', True)
d.setVar('pkg_postrm_%s' % pkg, postrm)
}
+
+python package_do_filedeps_append () {
+ # We need to load the provides for each manually updated alternative
+ # This function sets up the provides only, it's up to the pkg_postinst
+ # to setup the actual links...
+
+ alt_links = {}
+
+ target = d.getVar('ALTERNATIVE_LINK', True)
+ source = d.getVar('ALTERNATIVE_PATH', True)
+ if target and source:
+ if source[0] != '/':
+ source = os.path.dirname(target) + '/' + source
+ alt_links[target] = source
+
+ pn = d.getVar('PN', True)
+ links = ((d.getVar('ALTERNATIVE_LINKS', True) or "") + " " + (d.getVar('MANUAL_ALTERNATIVE_LINKS', True) or "")).split()
+ for target in links:
+ # Generate the filename we need to set the dependency in
+ if ':' in target:
+ source = target.split(':')[1]
+ target = target.split(':')[0]
+ else:
+ source = target + '.' + pn
+ alt_links[target] = source
+
+ pkgdest = d.getVar('PKGDEST', True)
+ for target in alt_links:
+ link = alt_links[target]
+ source = file_translate(link)
+
+ for pkg in d.getVar('PACKAGES', True).split():
+ if not os.path.lexists('%s/%s/%s' % (pkgdest, pkg, link)):
+ bb.note('%s: NOT Adding alternative provide %s to package %s' % (link, target, pkg))
+ continue
+
+ bb.note('%s: Adding alternative provide %s to package %s' % (link, target, pkg))
+
+ d.appendVar('FILERPROVIDES_%s_%s' % (source, pkg), " " + target)
+ if not source in (d.getVar('FILERPROVIDESFLIST_%s' % pkg, True) or "").split():
+ d.appendVar('FILERPROVIDESFLIST_%s' % pkg, " " + source)
+}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 09/43] coreutils_*.bb: Use update alternatives and add missing manual alt links
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (7 preceding siblings ...)
2012-04-20 16:44 ` [CONSOLIDATED PULL 08/43] update-alternatives.bbclass: Ensure alternatives end up in per file deps Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 10/43] coreutils_*.bb: Sync up file path with busybox and minor cleanup Saul Wold
` (34 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
Coreutils was capable of providing many of the necessary binaries for
the system, however it never told the package manager what was being
provided via the alternatives. Use the MANUAL_ALTERNATIVE_LINKS to do
this.
It also should have been using the update-alternatives class as that
automatically sets the file rprovides.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
coreutils - 8.14 - update-alt
---
meta/recipes-core/coreutils/coreutils_6.9.bb | 34 +++++++++-------------
meta/recipes-core/coreutils/coreutils_8.14.bb | 38 +++++++++++++------------
2 files changed, 34 insertions(+), 38 deletions(-)
diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb
index 8a47a60..32ea321 100644
--- a/meta/recipes-core/coreutils/coreutils_6.9.bb
+++ b/meta/recipes-core/coreutils/coreutils_6.9.bb
@@ -8,11 +8,11 @@ BUGTRACKER = "http://debbugs.gnu.org/coreutils"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://src/ls.c;startline=4;endline=16;md5=482a96d4f25010a4e13f8743e0c3685e"
-PR = "r2"
+PR = "r3"
DEPENDS = "coreutils-native-${PV}"
DEPENDS_virtclass-native = "gettext-native"
-inherit autotools gettext
+inherit update-alternatives autotools gettext
SRC_URI_BASE = "${GNU_MIRROR}/coreutils/${BP}.tar.bz2 \
file://gnulib_m4.patch \
@@ -30,6 +30,9 @@ SRC_URI_virtclass-native = "${SRC_URI_BASE}"
SRC_URI[md5sum] = "c9607d8495f16e98906e7ed2d9751a06"
SRC_URI[sha256sum] = "89c2895ad157de50e53298b22d91db116ee4e1dd3fdf4019260254e2e31497b0"
+ALTERNATIVE_PRIORITY = "100"
+ALTERNATIVE_LINKS = ""
+
# [ gets a special treatment and is not included in this
bindir_progs = "base64 basename cksum comm csplit cut dir dircolors dirname du \
env expand expr factor fmt fold groups head hostid id install \
@@ -37,23 +40,26 @@ bindir_progs = "base64 basename cksum comm csplit cut dir dircolors dirname du \
pinky pr printenv printf ptx readlink seq sha1sum sha224sum sha256sum \
sha384sum sha512sum shred shuf sort split stat sum tac tail tee test \
tr tsort tty unexpand uniq unlink users vdir wc who whoami yes"
+ALTERNATIVE_LINKS += "${bindir}/${@' ${bindir}/'.join((d.getVar('bindir_progs', True)).split())}"
# hostname gets a special treatment and is not included in this
base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill ln ls mkdir \
mknod mv pwd rm rmdir sleep stty sync touch true uname"
+ALTERNATIVE_LINKS += "${base_bindir}/${@' ${base_bindir}/'.join((d.getVar('base_bindir_progs', True)).split())}"
sbindir_progs= "chroot"
+ALTERNATIVE_LINKS += "${sbindir}/${@' ${sbindir}/'.join((d.getVar('sbindir_progs', True)).split())}"
-do_install() {
- autotools_do_install
-
- for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done
+# rprovides for manually controlled alternatives
+MANUAL_ALTERNATIVE_LINKS += "${bindir}/uptime ${base_bindir}/hostname"
+MANUAL_ALTERNATIVE_LINKS += "${bindir}/[:${bindir}/lbracket.${PN}"
+do_install_append() {
install -d ${D}${base_bindir}
- for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done
+ for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i; done
install -d ${D}${sbindir}
- for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i.${PN}; done
+ for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i; done
# [ requires special handling because [.coreutils will cause the sed stuff
# in update-alternatives to fail, therefore use lbracket - the name used
@@ -66,12 +72,6 @@ do_install() {
}
pkg_postinst_${PN} () {
- for i in ${bindir_progs}; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
-
- for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done
-
- for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done
-
# Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately.
update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 10
update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 10
@@ -79,12 +79,6 @@ pkg_postinst_${PN} () {
}
pkg_prerm_${PN} () {
- for i in ${bindir_progs}; do update-alternatives --remove $i $i.${PN}; done
-
- for i in ${base_bindir_progs}; do update-alternatives --remove $i $i.${PN}; done
-
- for i in ${sbindir_progs}; do update-alternatives --remove $i $i.${PN}; done
-
# The special cases
update-alternatives --remove hostname hostname.${PN}
update-alternatives --remove uptime uptime.${PN}
diff --git a/meta/recipes-core/coreutils/coreutils_8.14.bb b/meta/recipes-core/coreutils/coreutils_8.14.bb
index 688cec9..9ccb813 100644
--- a/meta/recipes-core/coreutils/coreutils_8.14.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.14.bb
@@ -7,11 +7,11 @@ BUGTRACKER = "http://debbugs.gnu.org/coreutils"
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
file://src/ls.c;startline=5;endline=16;md5=e1a509558876db58fb6667ba140137ad"
-PR = "r3"
+PR = "r4"
DEPENDS = "gmp libcap"
DEPENDS_virtclass-native = ""
-inherit autotools gettext
+inherit update-alternatives autotools gettext
SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
file://remove-usr-local-lib-from-m4.patch \
@@ -21,6 +21,9 @@ SRC_URI[sha256sum] = "0d120817c19292edb19e92ae6b8eac9020e03d51e0af9cb116cf82b65d
EXTRA_OECONF_virtclass-native = "--without-gmp"
+ALTERNATIVE_PRIORITY = "100"
+ALTERNATIVE_LINKS = ""
+
# [ df mktemp base64 gets a special treatment and is not included in this
bindir_progs = "basename chcon cksum comm csplit cut dir dircolors dirname du \
env expand expr factor fmt fold groups head hostid id install \
@@ -28,37 +31,42 @@ bindir_progs = "basename chcon cksum comm csplit cut dir dircolors dirname du \
pinky pr printenv printf ptx readlink runcon seq sha1sum sha224sum sha256sum \
sha384sum sha512sum shred shuf sort split stat stdbuf sum tac tail tee test timeout\
tr truncate tsort tty unexpand uniq unlink uptime users vdir wc who whoami yes"
+ALTERNATIVE_LINKS += "${bindir}/${@' ${bindir}/'.join((d.getVar('bindir_progs', True)).split())}"
# hostname gets a special treatment and is not included in this
base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill ln ls mkdir \
mknod mv pwd rm rmdir sleep stty sync touch true uname"
+ALTERNATIVE_LINKS += "${base_bindir}/${@' ${base_bindir}/'.join((d.getVar('base_bindir_progs', True)).split())}"
sbindir_progs= "chroot"
+ALTERNATIVE_LINKS += "${sbindir}/${@' ${sbindir}/'.join((d.getVar('sbindir_progs', True)).split())}"
-do_install_append() {
- for i in ${bindir_progs} df mktemp base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done
+# Manual file provides for manually controlled alternatives
+MANUAL_ALTERNATIVE_LINKS += "${base_bindir}/df:${bindir}/df.${PN}"
+MANUAL_ALTERNATIVE_LINKS += "${base_bindir}/mktemp:${bindir}/mktemp.${PN}"
+MANUAL_ALTERNATIVE_LINKS += "${base_bindir}/base64:${bindir}/base64.${PN}"
+MANUAL_ALTERNATIVE_LINKS += "${bindir}/[:${bindir}/lbracket.${PN}"
+do_install_append() {
install -d ${D}${base_bindir}
- for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done
+ for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i; done
install -d ${D}${sbindir}
- for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i.${PN}; done
+ for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i; done
+
+ # Process the special items due to mismatch with busybox
+ for i in df mktemp base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done
# [ requires special handling because [.coreutils will cause the sed stuff
# in update-alternatives to fail, therefore use lbracket - the name used
# for the actual source file.
mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN}
+
install -d ${D}${libdir}/coreutils
mv ${D}${libexecdir}/coreutils/libstdbuf.so ${D}${libdir}/coreutils
}
pkg_postinst_${PN} () {
- for i in ${bindir_progs}; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
-
- for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done
-
- for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done
-
# Special cases. [ needs to be treated separately.
update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100
@@ -69,12 +77,6 @@ pkg_postinst_${PN} () {
}
pkg_prerm_${PN} () {
- for i in ${bindir_progs}; do update-alternatives --remove $i $i.${PN}; done
-
- for i in ${base_bindir_progs}; do update-alternatives --remove $i $i.${PN}; done
-
- for i in ${sbindir_progs}; do update-alternatives --remove $i $i.${PN}; done
-
# The special cases
update-alternatives --remove hostname hostname.${PN}
update-alternatives --remove uptime uptime.${PN}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 10/43] coreutils_*.bb: Sync up file path with busybox and minor cleanup
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (8 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 09/43] coreutils_*.bb: Use update alternatives and add missing manual alt links Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 11/43] grep: Use update-alternatives Saul Wold
` (33 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
We need to ensure that the filepaths used by coreutils and busybox are
the same. Do this for base64, mktemp and df. Also remove references
to hostname/uptime in 8.14 version as these were only relevant for the
older 6.9 version.
su from the 6.9 version is removed, as it should come from shadow.
(No PR bumps, as the previous patch did that.)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-core/coreutils/coreutils_6.9.bb | 10 +++++++---
meta/recipes-core/coreutils/coreutils_8.14.bb | 23 +++--------------------
2 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb
index 32ea321..597d457 100644
--- a/meta/recipes-core/coreutils/coreutils_6.9.bb
+++ b/meta/recipes-core/coreutils/coreutils_6.9.bb
@@ -34,7 +34,7 @@ ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE_LINKS = ""
# [ gets a special treatment and is not included in this
-bindir_progs = "base64 basename cksum comm csplit cut dir dircolors dirname du \
+bindir_progs = "basename cksum comm csplit cut dir dircolors dirname du \
env expand expr factor fmt fold groups head hostid id install \
join link logname md5sum mkfifo nice nl nohup od paste pathchk \
pinky pr printenv printf ptx readlink seq sha1sum sha224sum sha256sum \
@@ -43,7 +43,7 @@ bindir_progs = "base64 basename cksum comm csplit cut dir dircolors dirname du \
ALTERNATIVE_LINKS += "${bindir}/${@' ${bindir}/'.join((d.getVar('bindir_progs', True)).split())}"
# hostname gets a special treatment and is not included in this
-base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill ln ls mkdir \
+base_bindir_progs = "base64 cat chgrp chmod chown cp date dd df echo false kill ln ls mkdir \
mknod mv pwd rm rmdir sleep stty sync touch true uname"
ALTERNATIVE_LINKS += "${base_bindir}/${@' ${base_bindir}/'.join((d.getVar('base_bindir_progs', True)).split())}"
@@ -69,12 +69,16 @@ do_install_append() {
# hostname and uptime separated. busybox's versions are preferred
mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN}
mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN}
+
+ # remove su, it should come from shadow or another package
+ rm ${D}${bindir}/su
}
pkg_postinst_${PN} () {
- # Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately.
+ # Special cases. uptime and hostname is broken, prefer busybox's version.
update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 10
update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 10
+ # [ needs to be treated separately.
update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100
}
diff --git a/meta/recipes-core/coreutils/coreutils_8.14.bb b/meta/recipes-core/coreutils/coreutils_8.14.bb
index 9ccb813..9994526 100644
--- a/meta/recipes-core/coreutils/coreutils_8.14.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.14.bb
@@ -24,7 +24,7 @@ EXTRA_OECONF_virtclass-native = "--without-gmp"
ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE_LINKS = ""
-# [ df mktemp base64 gets a special treatment and is not included in this
+# [ gets a special treatment and is not included in this
bindir_progs = "basename chcon cksum comm csplit cut dir dircolors dirname du \
env expand expr factor fmt fold groups head hostid id install \
join link logname md5sum mkfifo nice nl nohup nproc od paste pathchk \
@@ -33,18 +33,14 @@ bindir_progs = "basename chcon cksum comm csplit cut dir dircolors dirname du \
tr truncate tsort tty unexpand uniq unlink uptime users vdir wc who whoami yes"
ALTERNATIVE_LINKS += "${bindir}/${@' ${bindir}/'.join((d.getVar('bindir_progs', True)).split())}"
-# hostname gets a special treatment and is not included in this
-base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill ln ls mkdir \
- mknod mv pwd rm rmdir sleep stty sync touch true uname"
+base_bindir_progs = "base64 cat chgrp chmod chown cp date dd df echo false kill ln ls mkdir \
+ mknod mktemp mv pwd rm rmdir sleep stty sync touch true uname"
ALTERNATIVE_LINKS += "${base_bindir}/${@' ${base_bindir}/'.join((d.getVar('base_bindir_progs', True)).split())}"
sbindir_progs= "chroot"
ALTERNATIVE_LINKS += "${sbindir}/${@' ${sbindir}/'.join((d.getVar('sbindir_progs', True)).split())}"
# Manual file provides for manually controlled alternatives
-MANUAL_ALTERNATIVE_LINKS += "${base_bindir}/df:${bindir}/df.${PN}"
-MANUAL_ALTERNATIVE_LINKS += "${base_bindir}/mktemp:${bindir}/mktemp.${PN}"
-MANUAL_ALTERNATIVE_LINKS += "${base_bindir}/base64:${bindir}/base64.${PN}"
MANUAL_ALTERNATIVE_LINKS += "${bindir}/[:${bindir}/lbracket.${PN}"
do_install_append() {
@@ -54,9 +50,6 @@ do_install_append() {
install -d ${D}${sbindir}
for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i; done
- # Process the special items due to mismatch with busybox
- for i in df mktemp base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done
-
# [ requires special handling because [.coreutils will cause the sed stuff
# in update-alternatives to fail, therefore use lbracket - the name used
# for the actual source file.
@@ -69,21 +62,11 @@ do_install_append() {
pkg_postinst_${PN} () {
# Special cases. [ needs to be treated separately.
update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100
-
- # Special cases. base64, mktemp and df need to be treated separately, because busybox have them in base_binding not bindir
- update-alternatives --install ${base_bindir}/base64 base64 ${bindir}/base64.${PN} 100;
- update-alternatives --install ${base_bindir}/mktemp mktemp ${bindir}/mktemp.${PN} 100;
- update-alternatives --install ${base_bindir}/df df ${bindir}/df.${PN} 100;
}
pkg_prerm_${PN} () {
# The special cases
- update-alternatives --remove hostname hostname.${PN}
- update-alternatives --remove uptime uptime.${PN}
update-alternatives --remove '[' 'lbracket.${PN}'
- update-alternatives --remove base64 ${bindir}/base64.${PN}
- update-alternatives --remove mktemp ${bindir}/mktemp.${PN}
- update-alternatives --remove df ${bindir}.df.${PN}
}
BBCLASSEXTEND = "native"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 11/43] grep: Use update-alternatives
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (9 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 10/43] coreutils_*.bb: Sync up file path with busybox and minor cleanup Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 12/43] openssh: " Saul Wold
` (32 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
Use ALTERNATIVE_LINKS to be sure the links and provide info is setup
properly.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-extended/grep/grep_2.5.1a.bb | 25 +++++++++----------------
meta/recipes-extended/grep/grep_2.9.bb | 22 ++++++++--------------
2 files changed, 17 insertions(+), 30 deletions(-)
diff --git a/meta/recipes-extended/grep/grep_2.5.1a.bb b/meta/recipes-extended/grep/grep_2.5.1a.bb
index 64064fc..332a4d0 100644
--- a/meta/recipes-extended/grep/grep_2.5.1a.bb
+++ b/meta/recipes-extended/grep/grep_2.5.1a.bb
@@ -5,7 +5,7 @@ SECTION = "console/utils"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
-PR = "r1"
+PR = "r2"
SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
file://uclibc-fix.patch"
@@ -21,23 +21,16 @@ do_configure_prepend () {
rm -f ${S}/m4/init.m4
}
+inherit update-alternatives
+
+ALTERNATIVE_LINKS = "${base_bindir}/grep ${base_bindir}/egrep ${base_bindir}/fgrep"
+ALTERNATIVE_PRIORITY = "100"
+
do_install () {
autotools_do_install
install -d ${D}${base_bindir}
- mv ${D}${bindir}/grep ${D}${base_bindir}/grep.${PN}
- mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep.${PN}
- mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep.${PN}
+ mv ${D}${bindir}/grep ${D}${base_bindir}/grep
+ mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep
+ mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep
rmdir ${D}${bindir}/
}
-
-pkg_postinst_${PN} () {
- update-alternatives --install ${base_bindir}/grep grep grep.${PN} 100
- update-alternatives --install ${base_bindir}/egrep egrep egrep.${PN} 100
- update-alternatives --install ${base_bindir}/fgrep fgrep fgrep.${PN} 100
-}
-
-pkg_prerm_${PN} () {
- update-alternatives --remove grep grep.${PN}
- update-alternatives --remove egrep egrep.${PN}
- update-alternatives --remove fgrep fgrep.${PN}
-}
diff --git a/meta/recipes-extended/grep/grep_2.9.bb b/meta/recipes-extended/grep/grep_2.9.bb
index 1bc79f2..7710e65 100644
--- a/meta/recipes-extended/grep/grep_2.9.bb
+++ b/meta/recipes-extended/grep/grep_2.9.bb
@@ -21,23 +21,17 @@ do_configure_prepend () {
rm -f ${S}/m4/init.m4
}
+inherit update-alternatives
+
+ALTERNATIVE_LINKS = "${base_bindir}/grep ${base_bindir}/egrep ${base_bindir}/fgrep"
+ALTERNATIVE_PRIORITY = "100"
+
do_install () {
autotools_do_install
install -d ${D}${base_bindir}
- mv ${D}${bindir}/grep ${D}${base_bindir}/grep.${PN}
- mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep.${PN}
- mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep.${PN}
+ mv ${D}${bindir}/grep ${D}${base_bindir}/grep
+ mv ${D}${bindir}/egrep ${D}${base_bindir}/egrep
+ mv ${D}${bindir}/fgrep ${D}${base_bindir}/fgrep
rmdir ${D}${bindir}/
}
-pkg_postinst_${PN} () {
- update-alternatives --install ${base_bindir}/grep grep grep.${PN} 100
- update-alternatives --install ${base_bindir}/egrep egrep egrep.${PN} 100
- update-alternatives --install ${base_bindir}/fgrep fgrep fgrep.${PN} 100
-}
-
-pkg_prerm_${PN} () {
- update-alternatives --remove grep grep.${PN}
- update-alternatives --remove egrep egrep.${PN}
- update-alternatives --remove fgrep fgrep.${PN}
-}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 12/43] openssh: Use update-alternatives
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (10 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 11/43] grep: Use update-alternatives Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 13/43] hdparm: " Saul Wold
` (31 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
Use the MANUAL_ALTERNATIVE_LINKS to ensure the update-alternative
references are properly added to the packages provides.
Also fix the RPROVIDES, as they are package split specific!
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-connectivity/openssh/openssh_5.9p1.bb | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb b/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
index 749f89e..6ed1276 100644
--- a/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_5.9p1.bb
@@ -7,12 +7,13 @@ SECTION = "console/network"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENCE;md5=bae9a689be41581503bcf95d8fb42c4e"
-PR = "r3"
+PR = "r4"
DEPENDS = "zlib openssl"
DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-RPROVIDES = "ssh sshd"
+RPROVIDES_${PN}-ssh = "ssh"
+RPROVIDES_${PN}-sshd = "sshd"
CONFLICTS_${PN} = "dropbear"
RCONFLICTS_${PN}-sshd = "dropbear"
@@ -29,7 +30,7 @@ PAM_SRC_URI = "file://sshd"
SRC_URI[md5sum] = "afe17eee7e98d3b8550cc349834a85d0"
SRC_URI[sha256sum] = "8d3e8b6b6ff04b525a6dfa6fdeb6a99043ccf6c3310cc32eba84c939b07777d5"
-inherit useradd update-rc.d
+inherit useradd update-rc.d update-alternatives
USERADD_PACKAGES = "${PN}-sshd"
USERADD_PARAM_${PN}-sshd = "--system --no-create-home --home-dir /var/run/sshd --shell /bin/false --user-group sshd"
@@ -99,6 +100,8 @@ RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen"
DEPENDS_${PN}-sshd += "update-rc.d"
RDEPENDS_${PN}-sshd += "update-rc.d ${PN}-keygen"
+MANUAL_ALTERNATIVE_LINKS = "${bindir}/scp ${bindir}/ssh"
+
pkg_postinst_${PN}-scp () {
update-alternatives --install ${bindir}/scp scp scp.${PN} 90
}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 13/43] hdparm: Use update-alternatives
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (11 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 12/43] openssh: " Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 14/43] iputils: " Saul Wold
` (30 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
Switch to using update-alternatives, this ensures that the
call to update-alternatives and package provides are correct.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-extended/hdparm/hdparm_9.39.bb | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/meta/recipes-extended/hdparm/hdparm_9.39.bb b/meta/recipes-extended/hdparm/hdparm_9.39.bb
index ed076cc..42867a9 100644
--- a/meta/recipes-extended/hdparm/hdparm_9.39.bb
+++ b/meta/recipes-extended/hdparm/hdparm_9.39.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=910a8a42c962d238619c75fdb78bdb24 \
file://wiper/GPLv2.txt;md5=fcb02dc552a041dee27e4b85c7396067 \
file://wiper/wiper.sh;beginline=7;endline=31;md5=b7bc642addc152ea307505bf1a296f09"
-PR = "r1"
+PR = "r2"
PACKAGES += "wiper"
@@ -24,17 +24,13 @@ SRC_URI[sha256sum] = "72d550af4526aa96f0841c79321a0ee39d636cbaf1f294e52193e90c05
EXTRA_OEMAKE += 'STRIP="echo"'
+inherit update-alternatives
+
+ALTERNATIVE_LINKS = "${base_sbindir}/hdparm"
+ALTERNATIVE_PRIORITY = "100"
+
do_install () {
install -d ${D}/${base_sbindir} ${D}/${mandir}/man8 ${D}/${bindir}
oe_runmake 'DESTDIR=${D}' 'sbindir=${base_sbindir}' install
- mv ${D}${base_sbindir}/hdparm ${D}${base_sbindir}/hdparm.${PN}
cp ${S}/wiper/wiper.sh ${D}/${bindir}
}
-
-pkg_postinst_${PN} () {
- update-alternatives --install ${base_sbindir}/hdparm hdparm hdparm.${PN} 100
-}
-
-pkg_prerm_${PN} () {
- update-alternatives --remove hdparm hdparm.${PN}
-}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 14/43] iputils: Use update-alternatives
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (12 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 13/43] hdparm: " Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 15/43] net-tools: " Saul Wold
` (29 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
Use MANUAL_ALTERNATIVE_LINKS to ensure that the package provides
are being setup properly.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-extended/iputils/iputils_s20101006.bb | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/iputils/iputils_s20101006.bb b/meta/recipes-extended/iputils/iputils_s20101006.bb
index a092192..aadcaf3 100644
--- a/meta/recipes-extended/iputils/iputils_s20101006.bb
+++ b/meta/recipes-extended/iputils/iputils_s20101006.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://ping.c;beginline=1;endline=35;md5=f9ceb201733e9a6cf8f
DEPENDS = "sysfsutils openssl docbook-utils-native sgmlspl-native"
-PR = "r3"
+PR = "r4"
SRC_URI = "http://www.skbuff.net/iputils/${BPN}-${PV}.tar.bz2 \
file://debian/fix-dead-host-ping-stats.diff \
@@ -47,6 +47,9 @@ do_install () {
done
}
+inherit update-alternatives
+MANUAL_ALTERNATIVE_LINKS = "${base_bindir}/ping ${base_bindir}/ping6"
+
# Busybox also provides ping and ping6, so use update-alternatives
# Also fixup SUID bit for applications that need it
pkg_postinst_${PN}-ping () {
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 15/43] net-tools: Use update-alternatives
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (13 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 14/43] iputils: " Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 16/43] shadow: " Saul Wold
` (28 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
Switch to using ALTERNATIVE_LINKS to ensure the update-alternatives are setup
properly, along with the package provides.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../net-tools/net-tools_1.60-23.bb | 28 ++++++-------------
1 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-23.bb b/meta/recipes-extended/net-tools/net-tools_1.60-23.bb
index c8d2c57..b9a05c6 100644
--- a/meta/recipes-extended/net-tools/net-tools_1.60-23.bb
+++ b/meta/recipes-extended/net-tools/net-tools_1.60-23.bb
@@ -5,7 +5,7 @@ BUGTRACKER = "http://bugs.debian.org/net-tools"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
file://ifconfig.c;startline=11;endline=15;md5=da4c7bb79a5d0798faa99ef869721f4a"
-PR = "r0"
+PR = "r1"
SRC_URI = "${DEBIAN_MIRROR}/main/n/net-tools/net-tools_1.60.orig.tar.gz;name=tarball \
${DEBIAN_MIRROR}/main/n/net-tools/${BPN}_${PV}.diff.gz;apply=no;name=patch \
@@ -67,26 +67,16 @@ do_compile() {
oe_runmake
}
-do_install() {
- oe_runmake 'BASEDIR=${D}' install
+inherit update-alternatives
- for app in ${D}/${base_sbindir}/* ${D}/${base_bindir}/*; do
- mv $app $app.${PN}
- done
-}
+base_sbindir_progs = "arp ifconfig ipmaddr iptunnel mii-tool nameif plipconfig rarp route slattach"
+ALTERNATIVE_LINKS += "${base_sbindir}/${@' ${base_sbindir}/'.join((d.getVar('base_sbindir_progs', True)).split())}"
-pkg_postinst_${PN} () {
- for app in arp ifconfig ipmaddr iptunnel mii-tool nameif plipconfig rarp route slattach ; do
- update-alternatives --install ${base_sbindir}/$app $app $app.${PN} 100
- done
+base_bindir_progs = "dnsdomainname domainname hostname netstat nisdomainname ypdomainname"
+ALTERNATIVE_LINKS += "${base_bindir}/${@' ${base_bindir}/'.join((d.getVar('base_bindir_progs', True)).split())}"
- for app in dnsdomainname domainname hostname netstat nisdomainname ypdomainname ; do
- update-alternatives --install ${base_bindir}/$app $app $app.${PN} 100
- done
-}
+ALTERNATIVE_PRIORITY = "100"
-pkg_prerm_${PN} () {
- for app in arp ifconfig ipmaddr iptunnel mii-tool nameif plipconfig rarp route slattach dnsdomainname domainname hostname netstat nisdomainname ypdomainname ; do
- update-alternatives --remove $app $app.${PN}
- done
+do_install() {
+ oe_runmake 'BASEDIR=${D}' install
}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 16/43] shadow: Use update-alternatives
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (14 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 15/43] net-tools: " Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 17/43] findutils: " Saul Wold
` (27 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
Switch to using ALTERNATIVE_LINKS to ensure the update-alternatives are setup
properly, along with the package provides.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-extended/shadow/shadow_4.1.4.3.bb | 42 +++++++++++------------
1 files changed, 20 insertions(+), 22 deletions(-)
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 f892eb9..e27ca47 100644
--- a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \
DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
RDEPENDS_${PN} = "shadow-securetty ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}"
-PR = "r8"
+PR = "r9"
SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
file://login_defs_pam.sed \
@@ -84,14 +84,12 @@ do_install_append() {
sed -i '/^CREATE_MAIL_SPOOL/ s:^:#:' ${D}${sysconfdir}/default/useradd
install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir}
- for i in passwd chfn newgrp chsh groups ; do
- mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}
- done
- mv ${D}${sbindir}/chpasswd ${D}${sbindir}/chpasswd.${PN}
+ # We create the ${PN} versions to avoid link problems
+ mv ${D}${bindir}/newgrp ${D}${bindir}/newgrp.${PN}
mv ${D}${sbindir}/vigr ${D}${base_sbindir}/vigr.${PN}
mv ${D}${sbindir}/vipw ${D}${base_sbindir}/vipw.${PN}
- mv ${D}${bindir}/login ${D}${base_bindir}/login.${PN}
+ mv ${D}${bindir}/login ${D}${base_bindir}/login
# Handle link properly after rename, otherwise missing files would
# lead rpm failed dependencies.
@@ -99,17 +97,23 @@ do_install_append() {
ln -sf newgrp.${PN} ${D}${bindir}/sg
}
-pkg_postinst_${PN} () {
- update-alternatives --install ${bindir}/passwd passwd passwd.${PN} 200
- update-alternatives --install ${sbindir}/chpasswd chpasswd chpasswd.${PN} 200
- update-alternatives --install ${bindir}/chfn chfn chfn.${PN} 200
- update-alternatives --install ${bindir}/newgrp newgrp newgrp.${PN} 200
- update-alternatives --install ${bindir}/chsh chsh chsh.${PN} 200
- update-alternatives --install ${bindir}/groups groups groups.${PN} 200
- update-alternatives --install ${base_bindir}/login login login.${PN} 200
- update-alternatives --install ${base_sbindir}/vipw vipw vipw.${PN} 200
- update-alternatives --install ${base_sbindir}/vigr vigr vigr.${PN} 200
+inherit update-alternatives
+
+ALTERNATIVE_PRIORITY = "200"
+
+bindir_progs = "passwd chfn newgrp chsh groups"
+ALTERNATIVE_LINKS += "${bindir}/${@' ${bindir}/'.join((d.getVar('bindir_progs', True)).split())}"
+
+sbindir_progs = "chpasswd"
+ALTERNATIVE_LINKS += "${sbindir}/${@' ${sbindir}/'.join((d.getVar('sbindir_progs', True)).split())}"
+
+base_bindir_progs = "login"
+ALTERNATIVE_LINKS += "${base_bindir}/${@' ${base_bindir}/'.join((d.getVar('base_bindir_progs', True)).split())}"
+base_sbindir_progs = "vipw vigr"
+ALTERNATIVE_LINKS += "${base_sbindir}/${@' ${base_sbindir}/'.join((d.getVar('base_sbindir_progs', True)).split())}"
+
+pkg_postinst_${PN} () {
if [ "x$D" != "x" ]; then
rootarg="--root=$D"
else
@@ -119,9 +123,3 @@ pkg_postinst_${PN} () {
pwconv $rootarg
grpconv $rootarg
}
-
-pkg_prerm_${PN} () {
- for i in passwd chpasswd chfn newgrp chsh login vipw vigr ; do
- update-alternatives --remove $i $i.${PN}
- done
-}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 17/43] findutils: Use update-alternatives
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (15 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 16/43] shadow: " Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 18/43] gzip: Use update-alternatives class Saul Wold
` (26 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
Change to using update-alternatives to ensure that we're consistently
using the class, and the package provides are being setup properly.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-extended/findutils/findutils.inc | 5 +++-
.../recipes-extended/findutils/findutils_4.2.31.bb | 22 ++++---------------
meta/recipes-extended/findutils/findutils_4.4.2.bb | 17 +--------------
3 files changed, 10 insertions(+), 34 deletions(-)
diff --git a/meta/recipes-extended/findutils/findutils.inc b/meta/recipes-extended/findutils/findutils.inc
index 7a07ad5..64909a1 100644
--- a/meta/recipes-extended/findutils/findutils.inc
+++ b/meta/recipes-extended/findutils/findutils.inc
@@ -12,7 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz"
-inherit autotools gettext
+inherit autotools gettext update-alternatives
+
+ALTERNATIVE_LINKS = "${bindir}/find ${bindir}/xargs"
+ALTERNATIVE_PRIORITY = "100"
# diffutils assumes non-glibc compilation with uclibc and
# this causes it to generate its own implementations of
diff --git a/meta/recipes-extended/findutils/findutils_4.2.31.bb b/meta/recipes-extended/findutils/findutils_4.2.31.bb
index bd455a5..0c37836 100644
--- a/meta/recipes-extended/findutils/findutils_4.2.31.bb
+++ b/meta/recipes-extended/findutils/findutils_4.2.31.bb
@@ -8,7 +8,7 @@ SECTION = "console/utils"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-PR = "r1"
+PR = "r2"
SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz \
file://gnulib-extension.patch"
@@ -16,7 +16,10 @@ SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz \
SRC_URI[md5sum] = "a0e31a0f18a49709bf5a449867c8049a"
SRC_URI[sha256sum] = "e0d34b8faca0b3cca0703f6c6b498afbe72f0ba16c35980c10ec9ef7724d6204"
-inherit autotools gettext
+inherit autotools gettext update-alternatives
+
+ALTERNATIVE_LINKS = "${bindir}/find ${bindir}/xargs"
+ALTERNATIVE_PRIORITY = "100"
# diffutils assumes non-glibc compilation with uclibc and
# this causes it to generate its own implementations of
@@ -25,19 +28,4 @@ inherit autotools gettext
# see diffutils.mk in buildroot)
EXTRA_OECONF_libc-uclibc = "--without-included-regex"
-do_install_append () {
- if [ -e ${D}${bindir}/find ]; then
- mv ${D}${bindir}/find ${D}${bindir}/find.${PN}
- mv ${D}${bindir}/xargs ${D}${bindir}/xargs.${PN}
- fi
-}
-
-pkg_postinst_${PN} () {
- for i in find xargs; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
-}
-
-pkg_prerm_${PN} () {
- for i in find xargs; do update-alternatives --remove $i $i.${PN}; done
-}
-
BBCLASSEXTEND = "native"
diff --git a/meta/recipes-extended/findutils/findutils_4.4.2.bb b/meta/recipes-extended/findutils/findutils_4.4.2.bb
index b2898ed..d80511c 100644
--- a/meta/recipes-extended/findutils/findutils_4.4.2.bb
+++ b/meta/recipes-extended/findutils/findutils_4.4.2.bb
@@ -1,6 +1,6 @@
require findutils.inc
-PR = "r2"
+PR = "r3"
SRC_URI += "file://01-27017.patch \
file://02-28824.patch \
@@ -13,19 +13,4 @@ SRC_URI[sha256sum] = "434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd7
# http://savannah.gnu.org/bugs/?27299
CACHED_CONFIGUREVARS += "${@base_contains('DISTRO_FEATURES', 'libc-posix-clang-wchar', 'gl_cv_func_wcwidth_works=yes', '', d)}"
-do_install_append () {
- if [ -e ${D}${bindir}/find ]; then
- mv ${D}${bindir}/find ${D}${bindir}/find.${PN}
- mv ${D}${bindir}/xargs ${D}${bindir}/xargs.${PN}
- fi
-}
-
-pkg_postinst_${PN} () {
- for i in find xargs; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
-}
-
-pkg_prerm_${PN} () {
- for i in find xargs; do update-alternatives --remove $i $i.${PN}; done
-}
-
BBCLASSEXTEND = "native"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 18/43] gzip: Use update-alternatives class
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (16 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 17/43] findutils: " Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 19/43] module-init-tools: Update to use " Saul Wold
` (25 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
Switch to using the update-alternatives class. Need this for
consistency and to ensure the necessary package provides get set.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-extended/gzip/gzip.inc | 32 ++++++++--------------------
meta/recipes-extended/gzip/gzip_1.3.12.bb | 24 +++++++--------------
meta/recipes-extended/gzip/gzip_1.4.bb | 2 +-
3 files changed, 18 insertions(+), 40 deletions(-)
diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc
index a449449..1d608a6 100644
--- a/meta/recipes-extended/gzip/gzip.inc
+++ b/meta/recipes-extended/gzip/gzip.inc
@@ -12,29 +12,15 @@ SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz"
inherit autotools
-do_install () {
- autotools_do_install
- if [ "${PN}" = "${BPN}" ] ; then
- # Rename and move files into /bin (FHS), which is typical place for gzip
- install -d ${D}${base_bindir}
- mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip.${PN}
- mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip.${PN}
- mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat.${PN}
- fi
+do_install_append () {
+ # Rename and move files into /bin (FHS), which is typical place for gzip
+ install -d ${D}${base_bindir}
+ mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip
+ mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip
+ mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat
}
-pkg_postinst_${PN} () {
- if [ "${PN}" = "${BPN}" ] ; then
- update-alternatives --install ${base_bindir}/gunzip gunzip gunzip.${PN} 100
- update-alternatives --install ${base_bindir}/gzip gzip gzip.${PN} 100
- update-alternatives --install ${base_bindir}/zcat zcat zcat.${PN} 100
- fi
-}
+inherit update-alternatives
-pkg_prerm_${PN} () {
- if [ "${PN}" = "${BPN}" ] ; then
- update-alternatives --remove gunzip gunzip.${PN}
- update-alternatives --remove gzip gzip.${PN}
- update-alternatives --remove zcat zcat.${PN}
- fi
-}
+ALTERNATIVE_LINKS = "${base_bindir}/gunzip ${base_bindir}/gzip ${base_bindir}/zcat"
+ALTERNATIVE_PRIORITY = "100"
diff --git a/meta/recipes-extended/gzip/gzip_1.3.12.bb b/meta/recipes-extended/gzip/gzip_1.3.12.bb
index 2836942..6d18d47 100644
--- a/meta/recipes-extended/gzip/gzip_1.3.12.bb
+++ b/meta/recipes-extended/gzip/gzip_1.3.12.bb
@@ -16,29 +16,21 @@ SRC_URI = "${GNU_MIRROR}/gzip/gzip-${PV}.tar.gz \
SRC_URI[md5sum] = "b5bac2d21840ae077e0217bc5e4845b1"
SRC_URI[sha256sum] = "3f565be05f7f3d1aff117c030eb7c738300510b7d098cedea796ca8e4cd587af"
-PR = "r0"
+PR = "r1"
inherit autotools
-do_install () {
- autotools_do_install
+do_install_append () {
# move files into /bin (FHS)
install -d ${D}${base_bindir}
- mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip.${PN}
- mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip.${PN}
- mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat.${PN}
+ mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip
+ mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip
+ mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat
}
-pkg_postinst_${PN} () {
- update-alternatives --install ${base_bindir}/gunzip gunzip gunzip.${PN} 100
- update-alternatives --install ${base_bindir}/gzip gzip gzip.${PN} 100
- update-alternatives --install ${base_bindir}/zcat zcat zcat.${PN} 100
-}
+inherit update-alternatives
-pkg_prerm_${PN} () {
- update-alternatives --remove gunzip gunzip.${PN}
- update-alternatives --remove gzip gzip.${PN}
- update-alternatives --remove zcat zcat.${PN}
-}
+ALTERNATIVE_LINKS = "${base_bindir}/gunzip ${base_bindir}/gzip ${base_bindir}/zcat"
+ALTERNATIVE_PRIORITY = "100"
BBCLASSEXTEND = "native"
diff --git a/meta/recipes-extended/gzip/gzip_1.4.bb b/meta/recipes-extended/gzip/gzip_1.4.bb
index 8f4a237..54dd50a 100644
--- a/meta/recipes-extended/gzip/gzip_1.4.bb
+++ b/meta/recipes-extended/gzip/gzip_1.4.bb
@@ -1,6 +1,6 @@
require gzip.inc
-PR = "r1"
+PR = "r2"
NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 19/43] module-init-tools: Update to use update-alternatives class
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (17 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 18/43] gzip: Use update-alternatives class Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 20/43] kbd: Use update-alternatives Saul Wold
` (24 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
Use the update-alternatives class and MANUAL_ALTERNATIVE_LINKs to ensure
that the produced packages specify the correct package provides.
Also change references from "bin" and "sbin" to base_bindir and base_sbindir.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../module-init-tools/module-init-tools_3.16.bb | 35 ++++++++++++--------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/meta/recipes-kernel/module-init-tools/module-init-tools_3.16.bb b/meta/recipes-kernel/module-init-tools/module-init-tools_3.16.bb
index 0248b46..cb6f425 100644
--- a/meta/recipes-kernel/module-init-tools/module-init-tools_3.16.bb
+++ b/meta/recipes-kernel/module-init-tools/module-init-tools_3.16.bb
@@ -1,41 +1,48 @@
require module-init-tools.inc
-PR = "r0"
+PR = "r1"
# autotools set prefix to /usr, however we want them in /bin and /sbin
-bindir = "/bin"
-sbindir = "/sbin"
+bindir = "${base_bindir}"
+sbindir = "${base_sbindir}"
-do_install() {
- autotools_do_install
- for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do
+inherit update-alternatives
+MANUAL_ALTERNATIVE_LINKS = "${base_bindir}/lsmod:${base_bindir}/lsmod.26"
+MANUAL_ALTERNATIVE_LINKS += "${base_sbindir}/insmod:${base_sbindir}/insmod.26"
+MANUAL_ALTERNATIVE_LINKS += "${base_sbindir}/rmmod:${base_sbindir}/rmmod.26"
+MANUAL_ALTERNATIVE_LINKS += "${base_sbindir}/modprobe:${base_sbindir}/modprobe.26"
+MANUAL_ALTERNATIVE_LINKS += "${base_sbindir}/modinfo:${base_sbindir}/modinfo.26"
+MANUAL_ALTERNATIVE_LINKS += "${base_sbindir}/depmod:${base_sbindir}/depmod.26"
+
+do_install_append() {
+ for f in ${base_bindir}/lsmod ${base_sbindir}/insmod ${base_sbindir}/rmmod ${base_sbindir}/modprobe ${base_sbindir}/modinfo ${base_sbindir}/depmod; do
mv ${D}/$f ${D}/$f.26
done
}
pkg_postinst_module-init-tools() {
- for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/modinfo; do
+ for f in ${base_sbindir}/insmod ${base_sbindir}/modprobe ${base_sbindir}/rmmod ${base_sbindir}/modinfo; do
bn=`basename $f`
update-alternatives --install /$f $bn /$f.26 60
done
- update-alternatives --install /bin/lsmod bin-lsmod /bin/lsmod.26 60
- update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.26 60
+ update-alternatives --install ${base_bindir}/lsmod bin-lsmod ${base_bindir}/lsmod.26 60
+ update-alternatives --install ${base_sbindir}lsmod lsmod ${base_bindir}/lsmod.26 60
}
pkg_prerm_module-init-tools() {
- for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/modinfo; do
+ for f in ${base_sbindir}/insmod ${base_sbindir}/modprobe ${base_sbindir}/rmmod ${base_sbindir}/modinfo; do
bn=`basename $f`
update-alternatives --remove $bn /$f.26
done
- update-alternatives --remove bin-lsmod /bin/lsmod.26
- update-alternatives --remove lsmod /bin/lsmod.26
+ update-alternatives --remove bin-lsmod ${base_bindir}/lsmod.26
+ update-alternatives --remove lsmod ${base_bindir}/lsmod.26
}
pkg_postinst_module-init-tools-depmod() {
- update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 60
+ update-alternatives --install ${base_sbindir}depmod depmod ${base_sbindir}depmod.26 60
}
pkg_prerm_module-init-tools-depmod() {
- update-alternatives --remove depmod /sbin/depmod.26
+ update-alternatives --remove depmod ${base_sbindir}depmod.26
}
SRC_URI[md5sum] = "bc44832c6e41707b8447e2847d2019f5"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 20/43] kbd: Use update-alternatives
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (18 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 19/43] module-init-tools: Update to use " Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 21/43] console-tools: " Saul Wold
` (23 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
Change to use ALTERNATIVE_LINKS from update-alternatives. This ensures
the links are created consistently and the package provides are
correct.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-core/kbd/kbd_1.15.2.bb | 34 +++++++---------------------------
1 files changed, 7 insertions(+), 27 deletions(-)
diff --git a/meta/recipes-core/kbd/kbd_1.15.2.bb b/meta/recipes-core/kbd/kbd_1.15.2.bb
index eea04a0..99a6a50 100644
--- a/meta/recipes-core/kbd/kbd_1.15.2.bb
+++ b/meta/recipes-core/kbd/kbd_1.15.2.bb
@@ -10,7 +10,7 @@ RREPLACES_${PN} = "console-tools"
RPROVIDES_${PN} = "console-tools"
RCONFLICTS_${PN} = "console-tools"
-PR = "r2"
+PR = "r3"
SRC_URI="${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.tar.bz2"
SRC_URI[md5sum] = "e850eb91e4d3b94b194efe8e953204c5"
@@ -23,29 +23,9 @@ FILES_${PN}-consoletrans = "${datadir}/consoletrans"
FILES_${PN}-keymaps = "${datadir}/keymaps"
FILES_${PN}-unimaps = "${datadir}/unimaps"
-ALTERNATIVE_NAMES_USRBIN = "chvt deallocvt fgconsole openvt"
-
-do_install_append() {
- usrbinprogs_a="${ALTERNATIVE_NAMES_USRBIN}"
- for p in $usrbinprogs_a; do
- if [ -f "${D}${bindir}/$p" ]; then
- mv "${D}${bindir}/$p" "${D}${bindir}/$p.${PN}"
- fi
- done
-}
-
-pkg_postinst_${PN} () {
- usrbinprogs_a="${ALTERNATIVE_NAMES_USRBIN}"
- for p in $usrbinprogs_a; do
- if [ -f "$D${bindir}/$p" ]; then
- update-alternatives --install ${bindir}/$p $p $p.${PN} 100
- fi
- done
-}
-
-pkg_postrm_${PN} () {
- usrbinprogs_a="${ALTERNATIVE_NAMES_USRBIN}"
- for p in $usrbinprogs_a; do
- update-alternatives --remove $p $p.${PN}
- done
-}
+inherit update-alternatives
+
+ALTERNATIVE_PRIORITY = "100"
+
+bindir_progs = "chvt deallocvt fgconsole openvt"
+ALTERNATIVE_LINKS = "${bindir}/${@' ${bindir}/'.join((d.getVar('bindir_progs', True)).split())}"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 21/43] console-tools: Use update-alternatives
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (19 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 20/43] kbd: Use update-alternatives Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 22/43] sysvinit: Use update-alternatives in a different way Saul Wold
` (22 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
Use update-alternatives and sync to the way the replace kbd package
does things. Using update-alternatives ensures that the proper provides
are setup in the packages.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../console-tools/console-tools_0.3.2.bb | 27 +++----------------
1 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/meta/recipes-core/console-tools/console-tools_0.3.2.bb b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
index 5f1d640..6027d4a 100644
--- a/meta/recipes-core/console-tools/console-tools_0.3.2.bb
+++ b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING.kbd;md5=9b2d91511d3d80d4d20ac6e6b0137fe9"
SUMMARY = "Allows you to set-up and manipulate the Linux console."
DESCRIPTION = "Provides tools that enable the set-up and manipulation of the linux console and console-font files."
-PR = "r4"
+PR = "r5"
SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
file://codepage.patch \
@@ -30,28 +30,11 @@ do_compile () {
oe_runmake 'SUBDIRS=${SUBDIRS}'
}
-inherit autotools gettext
+inherit autotools gettext update-alternatives
-do_install () {
- autotools_do_install
- mv ${D}${bindir}/chvt ${D}${bindir}/chvt.${PN}
- mv ${D}${bindir}/deallocvt ${D}${bindir}/deallocvt.${PN}
- mv ${D}${bindir}/openvt ${D}${bindir}/openvt.${PN}
- mv ${D}${bindir}/fgconsole ${D}${bindir}/fgconsole.${PN}
-}
-
-pkg_postinst_${PN} () {
- update-alternatives --install ${bindir}/chvt chvt chvt.${PN} 100
- update-alternatives --install ${bindir}/deallocvt deallocvt deallocvt.${PN} 100
- update-alternatives --install ${bindir}/openvt openvt openvt.${PN} 100
- update-alternatives --install ${bindir}/fgconsole fgconsole fgconsole.${PN} 100
-}
+ALTERNATIVE_PRIORITY = "100"
-pkg_prerm_${PN} () {
- update-alternatives --remove chvt chvt.${PN}
- update-alternatives --remove deallocvt deallocvt.${PN}
- update-alternatives --remove openvt openvt.${PN}
- update-alternatives --remove fgconsole fgconsole.${PN}
-}
+bindir_progs = "chvt deallocvt fgconsole openvt"
+ALTERNATIVE_LINKS = "${bindir}/${@' ${bindir}/'.join((d.getVar('bindir_progs', True)).split())}"
RDEPENDS_${PN} = "bash"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 22/43] sysvinit: Use update-alternatives in a different way
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (20 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 21/43] console-tools: " Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 23/43] lrzsz: Use update-alternatives to set provides Saul Wold
` (21 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
Change from using a single update-alternative class entry for "init"
to using ALTERNATIVE_LINKS for the majority of the items. Then use
the manual entries for the outliers like init and pidof.
End result is the same package behavior, plus proper dependencies in
the resulting package.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 44 ++++++-----------------
1 files changed, 12 insertions(+), 32 deletions(-)
diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
index d3e430c..22ca24f 100644
--- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
@@ -5,7 +5,7 @@ SECTION = "base"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4"
-PR = "r6"
+PR = "r7"
RDEPENDS_${PN} = "${PN}-inittab"
@@ -27,10 +27,15 @@ B = "${S}/src"
inherit update-alternatives
-ALTERNATIVE_NAME = "init"
-ALTERNATIVE_LINK = "${base_sbindir}/init"
-ALTERNATIVE_PATH = "${base_sbindir}/init.sysvinit"
-ALTERNATIVE_PRIORITY = "50"
+ALTERNATIVE_PRIORITY = "200"
+ALTERNATIVE_LINKS = "${base_bindir}/mountpoint ${base_sbindir}/halt ${base_sbindir}/reboot"
+ALTERNATIVE_LINKS += "${base_sbindir}/runlevel ${base_sbindir}/shutdown ${base_sbindir}/poweroff"
+ALTERNATIVE_LINKS += "${bindir}/last ${bindir}/mesg ${bindir}/wall"
+
+# The following two are setup manually.
+# init because it has a different priority
+# pidof because it is in a split package
+MANUAL_ALTERNATIVE_LINKS = "${base_sbindir}/init ${base_bindir}/pidof"
PACKAGES =+ "sysvinit-pidof sysvinit-sulogin"
FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*"
@@ -66,40 +71,15 @@ do_install () {
ln -s ../init.d/stop-bootlogd ${D}${sysconfdir}/rc$level.d/S99stop-bootlogd
done
mv ${D}${base_sbindir}/init ${D}${base_sbindir}/init.${BPN}
- mv ${D}${base_bindir}/mountpoint ${D}${base_bindir}/mountpoint.${BPN}
mv ${D}${base_bindir}/pidof ${D}${base_bindir}/pidof.${BPN}
- mv ${D}${base_sbindir}/halt ${D}${base_sbindir}/halt.${BPN}
- mv ${D}${base_sbindir}/reboot ${D}${base_sbindir}/reboot.${BPN}
- mv ${D}${base_sbindir}/runlevel ${D}${base_sbindir}/runlevel.${BPN}
- mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${BPN}
- mv ${D}${base_sbindir}/poweroff ${D}${base_sbindir}/poweroff.${BPN}
- mv ${D}${bindir}/last ${D}${bindir}/last.${BPN}
- mv ${D}${bindir}/mesg ${D}${bindir}/mesg.${BPN}
- mv ${D}${bindir}/wall ${D}${bindir}/wall.${BPN}
}
pkg_postinst_${PN} () {
- update-alternatives --install ${base_bindir}/mountpoint mountpoint mountpoint.${BPN} 200
- update-alternatives --install ${base_sbindir}/halt halt halt.${BPN} 200
- update-alternatives --install ${base_sbindir}/reboot reboot reboot.${BPN} 200
- update-alternatives --install ${base_sbindir}/runlevel runlevel runlevel.${BPN} 200
- update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${BPN} 200
- update-alternatives --install ${base_sbindir}/poweroff poweroff poweroff.${BPN} 200
- update-alternatives --install ${bindir}/last last last.${BPN} 200
- update-alternatives --install ${bindir}/mesg mesg mesg.${BPN} 200
- update-alternatives --install ${bindir}/wall wall wall.${BPN} 200
+ update-alternatives --install ${base_sbindir}/init init init.${BPN} 50
}
pkg_prerm_${PN} () {
- update-alternatives --remove mountpoint mountpoint.${BPN}
- update-alternatives --remove halt halt.${BPN}
- update-alternatives --remove reboot reboot.${BPN}
- update-alternatives --remove runlevel runlevel.${BPN}
- update-alternatives --remove shutdown shutdown.${BPN}
- update-alternatives --remove poweroff poweroff.${BPN}
- update-alternatives --remove last last.${BPN}
- update-alternatives --remove mesg mesg.${BPN}
- update-alternatives --remove wall wall.${BPN}
+ update-alternatives --remove init init.${BPN}
}
pkg_postinst_sysvinit-pidof () {
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 23/43] lrzsz: Use update-alternatives to set provides
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (21 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 22/43] sysvinit: Use update-alternatives in a different way Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 24/43] cpio: use update-alternatives class Saul Wold
` (20 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
Use the update-alternatives and MANUAL_ALTERNATIVE_LINKS to ensure
the package gets the proper provides setup automatically.
Signed-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
index 7f86157..0f858f7 100644
--- a/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
+++ b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
file://src/lrz.c;beginline=1;endline=10;md5=5276956373ff7d8758837f6399a1045f"
SECTION = "console/network"
DEPENDS = ""
-PR = "r4"
+PR = "r5"
SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \
file://autotools.patch \
@@ -20,7 +20,14 @@ SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \
SRC_URI[md5sum] = "b5ce6a74abc9b9eb2af94dffdfd372a4"
SRC_URI[sha256sum] = "c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1"
-inherit autotools gettext
+inherit autotools gettext update-alternatives
+
+MANUAL_ALTERNATIVE_LINKS = "${bindir}/rz:${bindir}/lrz"
+MANUAL_ALTERNATIVE_LINKS += "${bindir}/rx:${bindir}/lrz"
+MANUAL_ALTERNATIVE_LINKS += "${bindir}/rb:${bindir}/lrz"
+MANUAL_ALTERNATIVE_LINKS += "${bindir}/sz:${bindir}/lsz"
+MANUAL_ALTERNATIVE_LINKS += "${bindir}/sx:${bindir}/lsz"
+MANUAL_ALTERNATIVE_LINKS += "${bindir}/sb:${bindir}/lsz"
do_install() {
install -d ${D}${bindir}/
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 24/43] cpio: use update-alternatives class
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (22 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 23/43] lrzsz: Use update-alternatives to set provides Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 25/43] dropbear: Use " Saul Wold
` (19 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
Use the manual_alternative_links to ensure that the cpio packages
are generated with proper runtime provides.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-extended/cpio/cpio_2.11.bb | 2 +-
meta/recipes-extended/cpio/cpio_2.8.bb | 2 +-
meta/recipes-extended/cpio/cpio_v2.inc | 3 +++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/cpio/cpio_2.11.bb b/meta/recipes-extended/cpio/cpio_2.11.bb
index 78da20e..73a3444 100644
--- a/meta/recipes-extended/cpio/cpio_2.11.bb
+++ b/meta/recipes-extended/cpio/cpio_2.11.bb
@@ -3,7 +3,7 @@ include cpio_v2.inc
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
-PR = "r1"
+PR = "r2"
SRC_URI[md5sum] = "1112bb6c45863468b5496ba128792f6c"
SRC_URI[sha256sum] = "601b1d774cd6e4cd39416203c91ec59dbd65dd27d79d75e1a9b89497ea643978"
diff --git a/meta/recipes-extended/cpio/cpio_2.8.bb b/meta/recipes-extended/cpio/cpio_2.8.bb
index 006e4f6..cabc1cd 100644
--- a/meta/recipes-extended/cpio/cpio_2.8.bb
+++ b/meta/recipes-extended/cpio/cpio_2.8.bb
@@ -3,7 +3,7 @@ require cpio_v2.inc
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b7f772ea3a2489231cb4872656cac34b"
-PR = "r1"
+PR = "r2"
SRC_URI += "file://m4extensions.patch \
file://avoid_heap_overflow.patch \
diff --git a/meta/recipes-extended/cpio/cpio_v2.inc b/meta/recipes-extended/cpio/cpio_v2.inc
index 066e937..2672c95 100644
--- a/meta/recipes-extended/cpio/cpio_v2.inc
+++ b/meta/recipes-extended/cpio/cpio_v2.inc
@@ -25,6 +25,9 @@ do_install () {
esac
}
+inherit update-alternatives
+MANUAL_ALTERNATIVE_LINKS = "${base_bindir}/cpio ${libexecdir}/rmt"
+
pkg_postinst_${PN} () {
update-alternatives --install ${base_bindir}/cpio cpio cpio.${PN} 100
if [ -f ${libexecdir}/rmt.${PN} ]
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 25/43] dropbear: Use update-alternatives class
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (23 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 24/43] cpio: use update-alternatives class Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 26/43] ncurses: Use update-alternatives Saul Wold
` (18 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
Use the MANUAL_ALTERNATIVE_LINKS to specify the update-alternatives
so that runtime provides are automatically added to packages.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-core/dropbear/dropbear.inc | 4 ++++
meta/recipes-core/dropbear/dropbear_2012.55.bb | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 2d6aeb2..27a3b66 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -72,6 +72,10 @@ do_install() {
}
+inherit update-alternatives
+
+MANUAL_ALTERNATIVE_LINKS = "${bindir}/scp:${sbindir}/dropbearmulti ${bindir}/ssh:${sbindir}/dropbearmulti"
+
pkg_postinst_${PN} () {
update-alternatives --install ${bindir}/scp scp ${sbindir}/dropbearmulti 20
update-alternatives --install ${bindir}/ssh ssh ${sbindir}/dropbearmulti 20
diff --git a/meta/recipes-core/dropbear/dropbear_2012.55.bb b/meta/recipes-core/dropbear/dropbear_2012.55.bb
index 4f0ef80..18fea01 100644
--- a/meta/recipes-core/dropbear/dropbear_2012.55.bb
+++ b/meta/recipes-core/dropbear/dropbear_2012.55.bb
@@ -3,4 +3,4 @@ require dropbear.inc
SRC_URI[md5sum] = "44836e5a0419ba12557f9ea46880077e"
SRC_URI[sha256sum] = "808df243c61bb60f2f18fa64bca628cbba0918b2a14139f10e6d59d4ac5a17ce"
-PR = "r0"
+PR = "r1"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 26/43] ncurses: Use update-alternatives
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (24 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 25/43] dropbear: Use " Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 27/43] gthumb: Disable parallel make for gthumb install Saul Wold
` (17 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
Specify update-alternatives with MANUAL_ALTERNATIVE_LINKS to ensure
that the packages get proper runtime provides.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-core/ncurses/ncurses.inc | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index ae99e2c..e46f341 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc
SECTION = "libs"
DEPENDS = "ncurses-native"
DEPENDS_virtclass-native = ""
-INC_PR = "r8"
+INC_PR = "r9"
inherit autotools binconfig multilib_header
@@ -206,6 +206,9 @@ python populate_packages_prepend () {
do_split_packages(d, base_libdir, '^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True)
}
+inherit update-alternatives
+
+MANUAL_ALTERNATIVE_LINKS = "${bindir}/clear ${bindir}/reset"
pkg_postinst_ncurses-tools () {
if [ "${PN}" = "ncurses" ]; then
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 27/43] gthumb: Disable parallel make for gthumb install
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (25 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 26/43] ncurses: Use update-alternatives Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 28/43] qt4-x11-free: enable -accessibility and -sm Saul Wold
` (16 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Darren Hart <dvhart@linux.intel.com>
With PARALLEL_MAKE set to 14, I frequently see the gthumb do_install
task hang. Make is spinning at 100% CPU and the build makes no
more progress.
The following work-around proposed by Richard Purdie allows progress
to be made.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Joshua Lock <josh@linux.intel.com>
CC: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-gnome/gthumb/gthumb_2.12.4.bb | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-gnome/gthumb/gthumb_2.12.4.bb b/meta/recipes-gnome/gthumb/gthumb_2.12.4.bb
index 5c87dc1..5821dc4 100644
--- a/meta/recipes-gnome/gthumb/gthumb_2.12.4.bb
+++ b/meta/recipes-gnome/gthumb/gthumb_2.12.4.bb
@@ -8,6 +8,8 @@ PR = "r2"
EXTRA_OECONF = "--disable-gnome-keyring --disable-libsoup --disable-exiv2 --disable-clutter"
+PARALLEL_MAKEINST=""
+
inherit gnome pkgconfig
FILES_${PN} += "${datadir}/icons"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 28/43] qt4-x11-free: enable -accessibility and -sm
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (26 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 27/43] gthumb: Disable parallel make for gthumb install Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 29/43] package.bbclass: Ensure kernel modules get stripped Saul Wold
` (15 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Robert Yang <liezhi.yang@windriver.com>
Is it possible to enable the "-sm -accessibility" in oe-core, please?
There is a meta-kde layer which requires the "-sm -accessibility", but
they are disabled in meta/recipes-qt/qt4/qt4.inc:
QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm"
I checked the log of the qt4, can't find the related log for
"-no-accessibility -no-sm".
Another way is use the bbappend, but it would be great if it can be
enabled in oe-core.
This only enables for qt4-x11, doesn't enable for qt4-embedded, and
have done testing on: qemux86, qemuarm, qemumips, qemuppc.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-qt/qt4/qt4-x11-free.inc | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 072c522..a59198d 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -13,6 +13,9 @@ QT_GLFLAGS_qemuppc = "-opengl"
QT_CONFIG_FLAGS += "-no-xinerama -no-xkb"
QT_BASE_LIB ?= "libqt"
+# required by kdelibs4
+QT_DISTRO_FLAGS = "-accessibility -sm"
+
inherit qt4x11
do_install_append() {
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 29/43] package.bbclass: Ensure kernel modules get stripped
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (27 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 28/43] qt4-x11-free: enable -accessibility and -sm Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-23 15:47 ` Darren Hart
2012-05-08 12:43 ` Dominik
2012-04-20 16:45 ` [CONSOLIDATED PULL 30/43] qemu: Backport a patch to solve SSE2 instruction emulation issues Saul Wold
` (14 subsequent siblings)
43 siblings, 2 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Kernel modules are not marked as executable but we do expect to strip them.
This patch adds in missing code to ensure we do this. Without this images
are getting sigificantly bloated in size.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/package.bbclass | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 99c945d..71bd3a6 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -870,6 +870,14 @@ python split_and_strip_files () {
elf_file = int(file_list[file][5:])
#bb.note("Strip %s" % file)
runstrip(file, elf_file, d)
+
+
+ if (d.getVar('INHIBIT_PACKAGE_STRIP', True) != '1'):
+ for root, dirs, files in os.walk(dvar):
+ for f in files:
+ if not f.endswith(".ko"):
+ continue
+ runstrip(os.path.join(root, f), None, d)
#
# End of strip
#
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [CONSOLIDATED PULL 29/43] package.bbclass: Ensure kernel modules get stripped
2012-04-20 16:45 ` [CONSOLIDATED PULL 29/43] package.bbclass: Ensure kernel modules get stripped Saul Wold
@ 2012-04-23 15:47 ` Darren Hart
2012-04-24 10:40 ` Richard Purdie
2012-05-08 12:43 ` Dominik
1 sibling, 1 reply; 52+ messages in thread
From: Darren Hart @ 2012-04-23 15:47 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Rifenbark, Scott M
On 04/20/2012 09:45 AM, Saul Wold wrote:
> From: Richard Purdie <richard.purdie@linuxfoundation.org>
>
> Kernel modules are not marked as executable but we do expect to strip them.
> This patch adds in missing code to ensure we do this. Without this images
> are getting sigificantly bloated in size.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> meta/classes/package.bbclass | 8 ++++++++
> 1 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
> index 99c945d..71bd3a6 100644
> --- a/meta/classes/package.bbclass
> +++ b/meta/classes/package.bbclass
> @@ -870,6 +870,14 @@ python split_and_strip_files () {
> elf_file = int(file_list[file][5:])
> #bb.note("Strip %s" % file)
> runstrip(file, elf_file, d)
> +
> +
> + if (d.getVar('INHIBIT_PACKAGE_STRIP', True) != '1'): <- white space at end
Note: Whitespace at end of line.
I understand it's common practice with bitbake recipes to compare to '1'
as a string. However, this isn't documented in the usae of
INHIBIT_PACKAGE_STRIP, and it seems reasonable that someone might try
setting "True" or "yes" or some other common affirmative label.
Scott, can we update the ref manual glossary to indicate that assigning
to the string "1" is the way to set this to true?
> + for root, dirs, files in os.walk(dvar):
> + for f in files:
> + if not f.endswith(".ko"):
> + continue
> + runstrip(os.path.join(root, f), None, d)
Not a big deal, but you can drop the "not" and the "continue" and only
runtstrip if the file ends with ".ko" since there isn't anything else
done in the loop.
> #
> # End of strip
> #
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [CONSOLIDATED PULL 29/43] package.bbclass: Ensure kernel modules get stripped
2012-04-23 15:47 ` Darren Hart
@ 2012-04-24 10:40 ` Richard Purdie
0 siblings, 0 replies; 52+ messages in thread
From: Richard Purdie @ 2012-04-24 10:40 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Rifenbark, Scott M
On Mon, 2012-04-23 at 08:47 -0700, Darren Hart wrote:
>
> On 04/20/2012 09:45 AM, Saul Wold wrote:
> > From: Richard Purdie <richard.purdie@linuxfoundation.org>
> >
> > Kernel modules are not marked as executable but we do expect to strip them.
> > This patch adds in missing code to ensure we do this. Without this images
> > are getting sigificantly bloated in size.
> >
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> > meta/classes/package.bbclass | 8 ++++++++
> > 1 files changed, 8 insertions(+), 0 deletions(-)
> >
> > diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
> > index 99c945d..71bd3a6 100644
> > --- a/meta/classes/package.bbclass
> > +++ b/meta/classes/package.bbclass
> > @@ -870,6 +870,14 @@ python split_and_strip_files () {
> > elf_file = int(file_list[file][5:])
> > #bb.note("Strip %s" % file)
> > runstrip(file, elf_file, d)
> > +
> > +
> > + if (d.getVar('INHIBIT_PACKAGE_STRIP', True) != '1'): <- white space at end
>
> Note: Whitespace at end of line.
>
> I understand it's common practice with bitbake recipes to compare to '1'
> as a string. However, this isn't documented in the usae of
> INHIBIT_PACKAGE_STRIP, and it seems reasonable that someone might try
> setting "True" or "yes" or some other common affirmative label.
>
> Scott, can we update the ref manual glossary to indicate that assigning
> to the string "1" is the way to set this to true?
I think we need to go over all these "1" tests that change them to be
conditional on the variable set/unset. I did just copy this some another
location within package.bbclass which is fine for 1.2 but needs
revisiting.
> > + for root, dirs, files in os.walk(dvar):
> > + for f in files:
> > + if not f.endswith(".ko"):
> > + continue
> > + runstrip(os.path.join(root, f), None, d)
>
> Not a big deal, but you can drop the "not" and the "continue" and only
> runtstrip if the file ends with ".ko" since there isn't anything else
> done in the loop.
I just have a dislike of functions that look like a set of steps :). I
also suspect the conditions might change here in the future.
Cheers,
Richard
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [CONSOLIDATED PULL 29/43] package.bbclass: Ensure kernel modules get stripped
2012-04-20 16:45 ` [CONSOLIDATED PULL 29/43] package.bbclass: Ensure kernel modules get stripped Saul Wold
2012-04-23 15:47 ` Darren Hart
@ 2012-05-08 12:43 ` Dominik
1 sibling, 0 replies; 52+ messages in thread
From: Dominik @ 2012-05-08 12:43 UTC (permalink / raw)
To: openembedded-core
> Kernel modules are not marked as executable but we do expect to strip them.
> This patch adds in missing code to ensure we do this. Without this images
> are getting sigificantly bloated in size.
>
This patch causes problems with TI's dsplink and linuxutils as posted here
http://comments.gmane.org/gmane.linux.embedded.yocto.meta-ti/340.
^ permalink raw reply [flat|nested] 52+ messages in thread
* [CONSOLIDATED PULL 30/43] qemu: Backport a patch to solve SSE2 instruction emulation issues
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (28 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 29/43] package.bbclass: Ensure kernel modules get stripped Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 31/43] bdwgc: Set ARM_INSTRUCTION_SET to "arm" Saul Wold
` (13 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
This fix addresses various issues seen in qemux86-64 images:
* scroll bars in matchbox-terminal not working
* files not appearing in pcmanfm
* warnings on the console from glib/gobject about invalid gdouble values
Its due to an emulation issue in qemu which the backported patch fixes.
[YOCTO #1906]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../a4d1f142542935b90d2eb30f3aead4edcf455fe6.patch | 66 ++++++++++++++++++++
meta/recipes-devtools/qemu/qemu_0.15.1.bb | 3 +-
2 files changed, 68 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/qemu/qemu-0.15.1/a4d1f142542935b90d2eb30f3aead4edcf455fe6.patch
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.1/a4d1f142542935b90d2eb30f3aead4edcf455fe6.patch b/meta/recipes-devtools/qemu/qemu-0.15.1/a4d1f142542935b90d2eb30f3aead4edcf455fe6.patch
new file mode 100644
index 0000000..405d557
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu-0.15.1/a4d1f142542935b90d2eb30f3aead4edcf455fe6.patch
@@ -0,0 +1,66 @@
+From a4d1f142542935b90d2eb30f3aead4edcf455fe6 Mon Sep 17 00:00:00 2001
+From: Aurelien Jarno <aurelien@aurel32.net>
+Date: Sat, 7 Jan 2012 15:20:11 +0100
+Subject: [PATCH 1/1] target-i386: fix {min,max}{pd,ps,sd,ss} SSE2 instructions
+
+minpd, minps, minsd, minss and maxpd, maxps, maxsd, maxss SSE2
+instructions have been broken when switching target-i386 to softfloat.
+It's not possible to use comparison instructions on float types anymore
+to softfloat, so use the floatXX_lt function instead, as the
+float_XX_min and float_XX_max functions can't be used due to the Intel
+specific behaviour.
+
+As it implements the correct NaNs behaviour, let's remove the
+corresponding entry from the TODO.
+
+It fixes GDM screen display on Debian Lenny.
+
+Thanks to Peter Maydell and Jason Wessel for their analysis of the
+problem.
+
+Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
+---
+ target-i386/TODO | 1 -
+ target-i386/ops_sse.h | 9 +++++++--
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+This fixes scrollbar issues in matchbox-terminal/vte on qemux86-64 and
+files not appearing in pcmanfm, as well as glib/gobject errors to do with gdoubles
+on the console [YOCTO #1906]
+
+Upstream-Status: Backport
+
+Index: qemu-0.15.1/target-i386/TODO
+===================================================================
+--- qemu-0.15.1.orig/target-i386/TODO 2011-10-12 16:41:43.000000000 +0000
++++ qemu-0.15.1/target-i386/TODO 2012-04-19 07:30:38.704073075 +0000
+@@ -15,7 +15,6 @@
+ - DRx register support
+ - CR0.AC emulation
+ - SSE alignment checks
+-- fix SSE min/max with nans
+
+ Optimizations/Features:
+
+Index: qemu-0.15.1/target-i386/ops_sse.h
+===================================================================
+--- qemu-0.15.1.orig/target-i386/ops_sse.h 2011-10-12 16:41:43.000000000 +0000
++++ qemu-0.15.1/target-i386/ops_sse.h 2012-04-19 07:30:38.712073076 +0000
+@@ -584,10 +584,15 @@
+ #define FPU_SUB(size, a, b) float ## size ## _sub(a, b, &env->sse_status)
+ #define FPU_MUL(size, a, b) float ## size ## _mul(a, b, &env->sse_status)
+ #define FPU_DIV(size, a, b) float ## size ## _div(a, b, &env->sse_status)
+-#define FPU_MIN(size, a, b) (a) < (b) ? (a) : (b)
+-#define FPU_MAX(size, a, b) (a) > (b) ? (a) : (b)
+ #define FPU_SQRT(size, a, b) float ## size ## _sqrt(b, &env->sse_status)
+
++/* Note that the choice of comparison op here is important to get the
++ * special cases right: for min and max Intel specifies that (-0,0),
++ * (NaN, anything) and (anything, NaN) return the second argument.
++ */
++#define FPU_MIN(size, a, b) float ## size ## _lt(a, b, &env->sse_status) ? (a) : (b)
++#define FPU_MAX(size, a, b) float ## size ## _lt(b, a, &env->sse_status) ? (a) : (b)
++
+ SSE_HELPER_S(add, FPU_ADD)
+ SSE_HELPER_S(sub, FPU_SUB)
+ SSE_HELPER_S(mul, FPU_MUL)
diff --git a/meta/recipes-devtools/qemu/qemu_0.15.1.bb b/meta/recipes-devtools/qemu/qemu_0.15.1.bb
index 05ea5f8..e90f339 100644
--- a/meta/recipes-devtools/qemu/qemu_0.15.1.bb
+++ b/meta/recipes-devtools/qemu/qemu_0.15.1.bb
@@ -3,7 +3,7 @@ require qemu.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
-PR = "r5"
+PR = "r6"
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
FILESDIR = "${WORKDIR}"
@@ -18,6 +18,7 @@ SRC_URI = "\
file://fallback-to-safe-mmap_min_addr.patch \
file://larger_default_ram_size.patch \
file://arm-bgr.patch \
+ file://a4d1f142542935b90d2eb30f3aead4edcf455fe6.patch \
"
# Only use the GL passthrough patches for native/nativesdk versions
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 31/43] bdwgc: Set ARM_INSTRUCTION_SET to "arm"
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (29 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 30/43] qemu: Backport a patch to solve SSE2 instruction emulation issues Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 32/43] bluez4: make alsa support conditional upon DISTRO_FEATURES Saul Wold
` (12 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Ken Werner <ken.werner@linaro.org>
The bdwgc recipe uses a version of libatomic that fails when building in Thumb
mode. This has been fixed upstream already. The
pulseaudio/libatomics-ops_1.2.bb has the same issue and sets the
ARM_INSTRUCTION_SET to "arm" (probably until a new version gets pulled in).
This patch applies the same workaround to the bdwgc/bdwgc_20110107.bb recipe.
Signed-off-by: Ken Werner <ken.werner@linaro.org>
---
meta/recipes-support/bdwgc/bdwgc_20110107.bb | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-support/bdwgc/bdwgc_20110107.bb b/meta/recipes-support/bdwgc/bdwgc_20110107.bb
index 327e59b..bc7b613 100644
--- a/meta/recipes-support/bdwgc/bdwgc_20110107.bb
+++ b/meta/recipes-support/bdwgc/bdwgc_20110107.bb
@@ -33,5 +33,7 @@ PR = "r1"
S = "${WORKDIR}/bdwgc"
+ARM_INSTRUCTION_SET = "arm"
+
inherit autotools
BBCLASSEXTEND = "native nativesdk"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 32/43] bluez4: make alsa support conditional upon DISTRO_FEATURES
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (30 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 31/43] bdwgc: Set ARM_INSTRUCTION_SET to "arm" Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 33/43] gettext.bbclass: Ensure we don't overwrite other DEPENDS_GETTEXT values Saul Wold
` (11 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Jonas Danielsson <jonas.danielsson@lundinova.se>
Do not enable alsa in bluez4 unless it's included in DISTRO_FEATURES.
Signed-off-by: Jonas Danielsson <jonas.danielsson@lundinova.se>
---
meta/recipes-connectivity/bluez/bluez4.inc | 6 ++++--
meta/recipes-connectivity/bluez/bluez4_4.99.bb | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc
index fbbe0bf..6dc06f4 100644
--- a/meta/recipes-connectivity/bluez/bluez4.inc
+++ b/meta/recipes-connectivity/bluez/bluez4.inc
@@ -7,9 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
-DEPENDS = "udev alsa-lib libusb dbus-glib glib-2.0 libcheck"
+DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck"
RDEPENDS_${PN}-dev = "bluez-hcidump"
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
+PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
+
ASNEEDED = ""
SRC_URI = "\
@@ -21,7 +24,6 @@ inherit autotools
EXTRA_OECONF = "\
--disable-gstreamer \
- --enable-alsa \
--enable-usb \
--enable-tools \
--enable-bccmd \
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.99.bb b/meta/recipes-connectivity/bluez/bluez4_4.99.bb
index 5033d34..32831e7 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.99.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.99.bb
@@ -1,6 +1,6 @@
require bluez4.inc
-PR = "r1"
+PR = "r2"
SRC_URI += "file://bluetooth.conf \
file://sbc_mmx.patch \
@@ -19,6 +19,7 @@ do_install_append() {
RDEPENDS_${PN}-dev = "bluez-hcidump"
+ALLOW_EMPTY_libasound-module-bluez = "1"
PACKAGES =+ "libasound-module-bluez"
FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 33/43] gettext.bbclass: Ensure we don't overwrite other DEPENDS_GETTEXT values
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (31 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 32/43] bluez4: make alsa support conditional upon DISTRO_FEATURES Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 34/43] binutils: add embedspu for ppc builds Saul Wold
` (10 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
In particular, this overwrites the value from cross-canadian.bbclass in
some cases which isn't the desired behaviour and unnecessarily
complicates/breaks the dependency chain.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/gettext.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass
index 89faa30..95818c6 100644
--- a/meta/classes/gettext.bbclass
+++ b/meta/classes/gettext.bbclass
@@ -15,7 +15,7 @@ def gettext_oeconf(d):
return '--disable-nls'
return "--enable-nls"
-DEPENDS_GETTEXT = "virtual/gettext gettext-native"
+DEPENDS_GETTEXT ??= "virtual/gettext gettext-native"
BASEDEPENDS =+ "${@gettext_dependencies(d)}"
EXTRA_OECONF_append = " ${@gettext_oeconf(d)}"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 34/43] binutils: add embedspu for ppc builds
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (32 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 33/43] gettext.bbclass: Ensure we don't overwrite other DEPENDS_GETTEXT values Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 35/43] libgcc: Package additional *crt*.o files for PPC Saul Wold
` (9 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
WARNING: For recipe binutils, the following files/directories were installed but not shipped in any package:
WARNING: /usr/bin/embedspu
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/binutils/binutils.inc | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index e343242..552b808 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -32,6 +32,7 @@ FILES_${PN}-symlinks = " \
${bindir}/addr2line \
${bindir}/as \
${bindir}/c++filt \
+ ${bindir}/embedspu \
${bindir}/gprof \
${bindir}/ld \
${bindir}/ld.bfd \
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 35/43] libgcc: Package additional *crt*.o files for PPC
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (33 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 34/43] binutils: add embedspu for ppc builds Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 36/43] xserver-kdrive: Add xkb to existing docs list Saul Wold
` (8 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
WARNING: For recipe libgcc, the following files/directories were installed but not shipped in any package:
WARNING: /usr/lib/powerpc-poky-linux/4.6.4/ecrti.o
WARNING: /usr/lib/powerpc-poky-linux/4.6.4/ncrti.o
WARNING: /usr/lib/powerpc-poky-linux/4.6.4/ecrtn.o
WARNING: /usr/lib/powerpc-poky-linux/4.6.4/ncrtn.o
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/gcc/libgcc_4.6.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/gcc/libgcc_4.6.bb b/meta/recipes-devtools/gcc/libgcc_4.6.bb
index 6e557d5..9a8b20d 100644
--- a/meta/recipes-devtools/gcc/libgcc_4.6.bb
+++ b/meta/recipes-devtools/gcc/libgcc_4.6.bb
@@ -16,7 +16,7 @@ PACKAGES = "\
FILES_${PN} = "${base_libdir}/libgcc*.so.*"
FILES_${PN}-dev = " \
${base_libdir}/libgcc*.so \
- ${libdir}/${TARGET_SYS}/${BINV}/crt* \
+ ${libdir}/${TARGET_SYS}/${BINV}/*crt* \
${libdir}/${TARGET_SYS}/${BINV}/libgcc*"
FILES_libgcov${PKGSUFFIX}-dev = " \
${libdir}/${TARGET_SYS}/${BINV}/libgcov.a"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 36/43] xserver-kdrive: Add xkb to existing docs list
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (34 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 35/43] libgcc: Package additional *crt*.o files for PPC Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 37/43] gcc: Add plugins package for ARM, fix /usr/incude packaging Saul Wold
` (7 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
WARNING: For recipe xserver-kdrive, the following files/directories were installed but not shipped in any package:
WARNING: /usr/share/man
WARNING: /usr/share/man/man5
WARNING: /usr/share/man/man1
WARNING: /usr/share/man/man1/Xephyr.1
WARNING: /usr/share/man/man1/Xserver.1
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../xorg-xserver/xserver-kdrive.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive.inc b/meta/recipes-graphics/xorg-xserver/xserver-kdrive.inc
index d0bedd9..c4c2a9f 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive.inc
@@ -50,7 +50,7 @@ DESCRIPTION_xserver-kdrive-vesa = "X server from freedesktop.org, supporting any
DESCRIPTION_xserver-kdrive-via = "X server from freedesktop.org, supporting VIA chipsets"
FILES_${PN} += "${libdir}/xserver/SecurityPolicy ${libdir}/xorg"
-FILES_${PN}-doc = "${datadir}/X11/xkb"
+FILES_${PN}-doc += "${datadir}/X11/xkb"
ALLOW_EMPTY_${PN} = "1"
FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 37/43] gcc: Add plugins package for ARM, fix /usr/incude packaging
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (35 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 36/43] xserver-kdrive: Add xkb to existing docs list Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 38/43] quilt: move empty quiltrc to native sysconfdir Saul Wold
` (6 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
WARNING: For recipe gcc, the following files/directories were installed but not shipped in any package:
WARNING: /usr/include
WARNING: /usr/lib/gcc/arm-poky-linux-gnueabi/4.6.4/plugin/libgcc
WARNING: /usr/lib/gcc/arm-poky-linux-gnueabi/4.6.4/plugin/libgcc/config
WARNING: /usr/lib/gcc/arm-poky-linux-gnueabi/4.6.4/plugin/libgcc/config/arm
WARNING: /usr/lib/gcc/arm-poky-linux-gnueabi/4.6.4/plugin/libgcc/config/arm/bpabi-lib.h
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/gcc/gcc-package-target.inc | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-package-target.inc b/meta/recipes-devtools/gcc/gcc-package-target.inc
index 3076670..a499c88 100644
--- a/meta/recipes-devtools/gcc/gcc-package-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-target.inc
@@ -1,5 +1,5 @@
PACKAGES = "\
- ${PN} ${PN}-symlinks \
+ ${PN} ${PN}-plugins ${PN}-symlinks \
g++ g++-symlinks \
cpp cpp-symlinks \
g77 g77-symlinks \
@@ -40,6 +40,11 @@ FILES_${PN}-symlinks = "\
${bindir}/gccbug \
"
+FILES_${PN}-plugins = "\
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin \
+"
+ALLOW_EMPTY_${PN}-plugins = "1"
+
FILES_g77 = "\
${bindir}/${TARGET_PREFIX}g77 \
${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771 \
@@ -88,6 +93,7 @@ do_install () {
rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
rm -rf ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/*.la
+ rmdir ${D}${includedir}
# Hack around specs file assumptions
test -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs && sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 38/43] quilt: move empty quiltrc to native sysconfdir
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (36 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 37/43] gcc: Add plugins package for ARM, fix /usr/incude packaging Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 39/43] sysstat: Upgrade to 10.0.3 Saul Wold
` (5 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
patch.bbclass orignally pointed at /usr/bin/quiltrc for an empty
version to ensure that no user setting were picked up, change this
to /etc/quiltrc in the Native sysroot since we now have a native
sysconfdir.
Make sure that the quiltrc is actually installed in the Native
sysconfdir, not the target, so fix this after the recipe split.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/patch.bbclass | 2 +-
meta/recipes-devtools/quilt/quilt-0.51.inc | 5 -----
meta/recipes-devtools/quilt/quilt-native.inc | 6 ++++++
meta/recipes-devtools/quilt/quilt-native_0.51.bb | 2 +-
meta/recipes-devtools/quilt/quilt_0.51.bb | 2 +-
5 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass
index 31db9e3..3c4d997 100644
--- a/meta/classes/patch.bbclass
+++ b/meta/classes/patch.bbclass
@@ -1,7 +1,7 @@
# Copyright (C) 2006 OpenedHand LTD
# Point to an empty file so any user's custom settings don't break things
-QUILTRCFILE ?= "${STAGING_BINDIR_NATIVE}/quiltrc"
+QUILTRCFILE ?= "${STAGING_ETCDIR_NATIVE}/quiltrc"
PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_sysroot"
diff --git a/meta/recipes-devtools/quilt/quilt-0.51.inc b/meta/recipes-devtools/quilt/quilt-0.51.inc
index e89013a..824e624 100644
--- a/meta/recipes-devtools/quilt/quilt-0.51.inc
+++ b/meta/recipes-devtools/quilt/quilt-0.51.inc
@@ -24,11 +24,6 @@ RDEPENDS_${PN} = "bash"
# quilt ignores DESTDIR
do_install () {
oe_runmake 'BUILD_ROOT=${D}' install
- if [ "${BUILD_ARCH}" == "${HOST_ARCH}" ]; then
- # Dummy quiltrc file for patch.bbclass
- install -d ${D}${bindir}/
- touch ${D}${bindir}/quiltrc
- fi
# cleanup unpackaged files
rm -rf ${D}/${datadir}/emacs
}
diff --git a/meta/recipes-devtools/quilt/quilt-native.inc b/meta/recipes-devtools/quilt/quilt-native.inc
index 7efea02..9345d88 100644
--- a/meta/recipes-devtools/quilt/quilt-native.inc
+++ b/meta/recipes-devtools/quilt/quilt-native.inc
@@ -11,3 +11,9 @@ EXTRA_OECONF = "--disable-nls"
do_configure () {
oe_runconf
}
+
+do_install_append () {
+ # Dummy quiltrc file for patch.bbclass
+ install -d ${D}${sysconfdir}/
+ touch ${D}${sysconfdir}/quiltrc
+}
diff --git a/meta/recipes-devtools/quilt/quilt-native_0.51.bb b/meta/recipes-devtools/quilt/quilt-native_0.51.bb
index b99b9b6..1494bf2 100644
--- a/meta/recipes-devtools/quilt/quilt-native_0.51.bb
+++ b/meta/recipes-devtools/quilt/quilt-native_0.51.bb
@@ -1,4 +1,4 @@
require quilt-${PV}.inc
require quilt-native.inc
-PR = "r0"
+PR = "r1"
diff --git a/meta/recipes-devtools/quilt/quilt_0.51.bb b/meta/recipes-devtools/quilt/quilt_0.51.bb
index bc62161..6865cd8 100644
--- a/meta/recipes-devtools/quilt/quilt_0.51.bb
+++ b/meta/recipes-devtools/quilt/quilt_0.51.bb
@@ -4,4 +4,4 @@ RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
SRC_URI += "file://aclocal.patch \
file://gnu_patch_test_fix_target.patch \
"
-PR = "r2"
+PR = "r3"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 39/43] sysstat: Upgrade to 10.0.3
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (37 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 38/43] quilt: move empty quiltrc to native sysconfdir Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 40/43] lame: Upgrade to 3.99.5 Saul Wold
` (4 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/sysstat/sysstat_10.0.3.bb | 8 --------
meta/recipes-extended/sysstat/sysstat_10.0.4.bb | 8 ++++++++
2 files changed, 8 insertions(+), 8 deletions(-)
delete mode 100644 meta/recipes-extended/sysstat/sysstat_10.0.3.bb
create mode 100644 meta/recipes-extended/sysstat/sysstat_10.0.4.bb
diff --git a/meta/recipes-extended/sysstat/sysstat_10.0.3.bb b/meta/recipes-extended/sysstat/sysstat_10.0.3.bb
deleted file mode 100644
index 7ef6c60..0000000
--- a/meta/recipes-extended/sysstat/sysstat_10.0.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require sysstat.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
-
-PR = "r1"
-
-SRC_URI[md5sum] = "0e1ed5200f31f69a3b90ff1e81c07745"
-SRC_URI[sha256sum] = "7c0dd172f09edaff100b33db29ef502e15e71867b505c6d519f76a24fabcc1f5"
diff --git a/meta/recipes-extended/sysstat/sysstat_10.0.4.bb b/meta/recipes-extended/sysstat/sysstat_10.0.4.bb
new file mode 100644
index 0000000..7a5bcdc
--- /dev/null
+++ b/meta/recipes-extended/sysstat/sysstat_10.0.4.bb
@@ -0,0 +1,8 @@
+require sysstat.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+
+PR = "r0"
+
+SRC_URI[md5sum] = "c84fd7774080dae34f47257175a0b187"
+SRC_URI[sha256sum] = "66dbef6e5583c320d5aa5a47a7407b8bf2c20f2cf0d171d36ffa21db034f34ba"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 40/43] lame: Upgrade to 3.99.5
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (38 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 39/43] sysstat: Upgrade to 10.0.3 Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 41/43] sqlite3: Upgrade to 3.7.11 Saul Wold
` (3 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../lame/{lame_3.99.3.bb => lame_3.99.5.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-multimedia/lame/{lame_3.99.3.bb => lame_3.99.5.bb} (86%)
diff --git a/meta/recipes-multimedia/lame/lame_3.99.3.bb b/meta/recipes-multimedia/lame/lame_3.99.5.bb
similarity index 86%
rename from meta/recipes-multimedia/lame/lame_3.99.3.bb
rename to meta/recipes-multimedia/lame/lame_3.99.5.bb
index 9248202..a0c4cf5 100644
--- a/meta/recipes-multimedia/lame/lame_3.99.3.bb
+++ b/meta/recipes-multimedia/lame/lame_3.99.5.bb
@@ -13,8 +13,8 @@ PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \
file://no-gtk1.patch"
-SRC_URI[md5sum] = "5ad31e33e70455eb3a7b79a5dd934fce"
-SRC_URI[sha256sum] = "d4ea3c8d00d2cc09338425a25dbfeb4d587942cb3c83a677c09aeb1e850c74cf"
+SRC_URI[md5sum] = "84835b313d4a8b68f5349816d33e07ce"
+SRC_URI[sha256sum] = "24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff"
inherit autotools
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 41/43] sqlite3: Upgrade to 3.7.11
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (39 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 40/43] lame: Upgrade to 3.99.5 Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 42/43] distro_tracking: Update Manual Check Saul Wold
` (2 subsequent siblings)
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-support/sqlite/sqlite3_3.7.10.bb | 11 -----------
meta/recipes-support/sqlite/sqlite3_3.7.11.bb | 11 +++++++++++
2 files changed, 11 insertions(+), 11 deletions(-)
delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.10.bb
create mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.11.bb
diff --git a/meta/recipes-support/sqlite/sqlite3_3.7.10.bb b/meta/recipes-support/sqlite/sqlite3_3.7.10.bb
deleted file mode 100644
index ec6ded6..0000000
--- a/meta/recipes-support/sqlite/sqlite3_3.7.10.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require sqlite3.inc
-
-PR = "r2"
-
-LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0"
-
-SRC_URI = "http://www.sqlite.org/sqlite-autoconf-3071000.tar.gz"
-S = "${WORKDIR}/sqlite-autoconf-3071000"
-
-SRC_URI[md5sum] = "9ed2ca93577b58cfa0d01f64b9312ab9"
-SRC_URI[sha256sum] = "9c1775057af5cc8b6cc64808b9553d77beccf3757e16ecee3bc878404d9c43e3"
diff --git a/meta/recipes-support/sqlite/sqlite3_3.7.11.bb b/meta/recipes-support/sqlite/sqlite3_3.7.11.bb
new file mode 100644
index 0000000..9893e05
--- /dev/null
+++ b/meta/recipes-support/sqlite/sqlite3_3.7.11.bb
@@ -0,0 +1,11 @@
+require sqlite3.inc
+
+LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0"
+
+PR = "r0"
+
+SRC_URI = "http://www.sqlite.org/sqlite-autoconf-3071100.tar.gz"
+S = "${WORKDIR}/sqlite-autoconf-3071100"
+
+SRC_URI[md5sum] = "0552d71bda98ebdcaea305cd6058221b"
+SRC_URI[sha256sum] = "2badc75dc536249bcd68c44d2a655724285d054303251eaff9d355194cb3476b"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 42/43] distro_tracking: Update Manual Check
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (40 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 41/43] sqlite3: Upgrade to 3.7.11 Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-20 16:45 ` [CONSOLIDATED PULL 43/43] kernel: Fix packaging issue Saul Wold
2012-04-24 10:43 ` [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Richard Purdie
43 siblings, 0 replies; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
Update the manual check dates for:
sqlite3
libcap
libcheck
console-tools
psmisc
boost
sysfsutils
less
unzip
zip
usbutils
sysstat
cracklib
libexif
qemugl
glew
squashfs-tools
lame
libmad
lsb
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 58 ++++++++++----------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index de6f3dd..dc36833 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -552,10 +552,10 @@ RECIPE_LATEST_RELEASE_DATE_pn-popt = "May 01, 2010"
RECIPE_STATUS_pn-sqlite3 = "green"
# need upgrade
-RECIPE_LATEST_VERSION_pn-sqlite3 = "3.7.10"
-RECIPE_LATEST_RELEASE_DATE_pn-sqlite3 = "Jan 16, 2012"
-RECIPE_LAST_UPDATE_pn-sqlite3 = "Feb 27, 2012"
-RECIPE_MANUAL_CHECK_DATE_pn-sqlite3= "Feb 26, 2012"
+RECIPE_LATEST_VERSION_pn-sqlite3 = "3.7.11"
+RECIPE_LATEST_RELEASE_DATE_pn-sqlite3 = "Mar 20, 2012"
+RECIPE_LAST_UPDATE_pn-sqlite3 = "Apr 18, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-sqlite3= "Apr 18, 2012"
RECIPE_MAINTAINER_pn-sqlite3 = "Saul Wold <sgw@linux.intel.com>"
RECIPE_DEPENDENCY_CHECK_pn-sqlite3 = "not done"
RECIPE_INTEL_SECTION_pn-sqlite3 = "base libs"
@@ -585,7 +585,7 @@ RECIPE_STATUS_pn-libcap = "yellow"
RECIPE_LATEST_VERSION_pn-libcap = "2.22"
RECIPE_LATEST_RELEASE_DATE_pn-libcap = "Jan 01, 2010"
RECIPE_LAST_UPDATE_pn-libcap = "Jul 25, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-libcap = "Feb 26, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-libcap = "Apr 18, 2012"
RECIPE_MAINTAINER_pn-libcap = "Saul Wold <sgw@linux.intel.com>"
RECIPE_DEPENDENCY_CHECK_pn-libcap = "done"
RECIPE_INTEL_SECTION_pn-libcap = "base libs"
@@ -644,7 +644,7 @@ RECIPE_DEPENDENCY_CHECK_pn-libcheck = "done"
RECIPE_LATEST_VERSION_pn-libcheck = "0.9.8"
RECIPE_LATEST_RELEASE_DATE_pn-libcheck = "Sep 23, 2009"
RECIPE_LAST_UPDATE_pn-libcheck = "Aug 20, 2010"
-RECIPE_MANUAL_CHECK_DATE_pn-libcheck = "Feb 26, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-libcheck = "Apr 18, 2012"
RECIPE_MAINTAINER_pn-libcheck = "Saul Wold <sgw@linux.intel.com>"
RECIPE_INTEL_SECTION_pn-libcheck = "base libs"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libcheck = "9 months"
@@ -1357,7 +1357,7 @@ RECIPE_MAINTAINER_pn-consolekit = "Zhai Edwin <edwin.zhai@intel.com>"
RECIPE_STATUS_pn-console-tools = "red"
RECIPE_LATEST_VERSION_pn-console-tools = "0.3.2"
RECIPE_LAST_UPDATE_pn-console-tools = "Jul 21, 2006"
-RECIPE_MANUAL_CHECK_DATE_pn-console-tools= "Feb 26, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-console-tools= "Apr 18, 2012"
RECIPE_MAINTAINER_pn-console-tools = "Saul Wold <sgw@linux.intel.com>"
DISTRO_PN_ALIAS_pn-console-tools = "Debian=console-tools Ubuntu=console-tools"
@@ -1401,14 +1401,14 @@ RECIPE_STATUS_pn-psmisc = "red"
RECIPE_LATEST_VERSION_pn-psmisc = "22.16"
RECIPE_LATEST_RELEASE_DATE_pn-psmisc = "Feb 25, 2012"
RECIPE_LAST_UPDATE_pn-psmisc = "Feb 27, 2012"
-RECIPE_MANUAL_CHECK_DATE_pn-psmisc = "Feb 26, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-psmisc = "Apr 18, 2012"
RECIPE_MAINTAINER_pn-psmisc = "Saul Wold <sgw@linux.intel.com>"
RECIPE_STATUS_pn-boost = "yellow"
RECIPE_LATEST_VERSION_pn-boost = "1.49.0"
RECIPE_LATEST_RELEASE_DATE_pn-boost = "Feb 24, 2012"
RECIPE_LAST_UPDATE_pn-boost = "Feb 27, 2012"
-RECIPE_MANUAL_CHECK_DATE_pn-boost = "Feb 26, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-boost = "Apr 18, 2012"
RECIPE_MAINTAINER_pn-boost = "Saul Wold <sgw@linux.intel.com>"
RECIPE_STATUS_pn-boost-jam-native = "green"
@@ -1559,7 +1559,7 @@ RECIPE_LAST_UPDATE_pn-sysfsutils = "Jun 18, 2010"
RECIPE_DEPENDENCY_CHECK_pn-sysfsutils = "not done"
RECIPE_INTEL_SECTION_pn-sysfsutils = "base utils"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-sysfsutils = "n/a"
-RECIPE_MANUAL_CHECK_DATE_pn-sysfsutils = "Feb 26, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-sysfsutils = "Apr 18, 2012"
RECIPE_COMMENTS_pn-sysfsutils = "No update on kernel.org"
RECIPE_MAINTAINER_pn-sysfsutils = "Saul Wold <sgw@linux.intel.com>"
@@ -1613,7 +1613,7 @@ RECIPE_STATUS_pn-less = "green"
RECIPE_LATEST_VERSION_pn-less = "444"
RECIPE_LATEST_RELEASE_DATE_pn-less = "Jun 9, 2011"
RECIPE_LAST_UPDATE_pn-less = "Dec 01, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-less = "Feb 26, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-less = "Apr 18, 2012"
RECIPE_MAINTAINER_pn-less = "Saul Wold <sgw@linux.intel.com>"
RECIPE_DEPENDENCY_CHECK_pn-less = "done"
RECIPE_INTEL_SECTION_pn-less = "base utils"
@@ -1774,7 +1774,7 @@ RECIPE_MAINTAINER_pn-unzip = "Saul Wold <sgw@linux.intel.com>"
RECIPE_DEPENDENCY_CHECK_pn-unzip = "not done"
RECIPE_INTEL_SECTION_pn-unzip = "base utils"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-unzip = "49 months"
-RECIPE_MANUAL_CHECK_DATE_pn-unzip = "Feb 26, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-unzip = "Apr 18, 2012"
RECIPE_COMMENTS_pn-unzip = "5.52 has a race condition vulnerability for Unix version"
RECIPE_STATUS_pn-zip = "green"
@@ -1785,7 +1785,7 @@ RECIPE_MAINTAINER_pn-zip = "Saul Wold <sgw@linux.intel.com>"
RECIPE_DEPENDENCY_CHECK_pn-zip = "not done"
RECIPE_INTEL_SECTION_pn-zip = "base utils"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-zip = "21 months"
-RECIPE_MANUAL_CHECK_DATE_pn-zip = "Feb 26, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-zip = "Apr 18, 2012"
RECIPE_COMMENTS_pn-zip = ""
RECIPE_STATUS_pn-strace = "green"
@@ -1888,7 +1888,7 @@ RECIPE_STATUS_pn-usbutils = "green"
RECIPE_LATEST_VERSION_pn-usbutils = "0.91"
RECIPE_LATEST_RELEASE_DATE_pn-usbutils = "Oct 22, 2010"
RECIPE_LAST_UPDATE_pn-usbutils = "May 20, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-usbutils = "Feb 26, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-usbutils = "Apr 18, 2012"
RECIPE_MAINTAINER_pn-usbutils = "Saul Wold <sgw@linux.intel.com>"
RECIPE_DEPENDENCY_CHECK_pn-usbutils = "done"
RECIPE_INTEL_SECTION_pn-usbutils = "base utils"
@@ -1931,10 +1931,10 @@ RECIPE_COMMENTS_pn-zypper = ""
DISTRO_PN_ALIAS_pn-zypper = "OpenSuse=zypper Meego=zypper"
RECIPE_STATUS_pn-sysstat = "green"
-RECIPE_LATEST_VERSION_pn-sysstat = "10.0.3"
-RECIPE_LATEST_RELEASE_DATE_pn-sysstat = "Nov 27, 2011"
-RECIPE_LAST_UPDATE_pn-sysstat = "Dec 27, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-sysstat = "Feb 26, 2012"
+RECIPE_LATEST_VERSION_pn-sysstat = "10.0.4"
+RECIPE_LATEST_RELEASE_DATE_pn-sysstat = "Mar 07, 2012"
+RECIPE_LAST_UPDATE_pn-sysstat = "Apr 19, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-sysstat = "Apr 18, 2012"
RECIPE_MAINTAINER_pn-sysstat = "Saul Wold <sgw@linux.intel.com>"
RECIPE_STATUS_pn-sysklogd = "red"
@@ -1969,7 +1969,7 @@ RECIPE_STATUS_pn-cracklib="green"
RECIPE_LATEST_VERSION_pn-cracklib="2.8.18"
RECIPE_LATEST_RELEASE_DATE_pn-cracklib = "Aug 29, 2010"
RECIPE_LAST_UPDATE_pn-cracklib = "Nov 13, 2010"
-RECIPE_MANUAL_CHECK_DATE_pn-cracklib = "Feb 26, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-cracklib = "Apr 18, 2012"
RECIPE_MAINTAINER_pn-cracklib="Saul Wold <sgw@linux.intel.com>"
RECIPE_STATUS_pn-openobex = "red"
@@ -2063,7 +2063,7 @@ RECIPE_STATUS_pn-libexif = "green"
RECIPE_LATEST_VERSION_pn-libexif = "0.6.20"
RECIPE_LATEST_RELEASE_DATE_pn-libexif = "Dec 12, 2010"
RECIPE_LAST_UPDATE_pn-libexif = "Apr 15, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-libexif = "Feb 26, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-libexif = "Apr 18, 2012"
RECIPE_MAINTAINER_pn-libexif = "Saul Wold <sgw@linux.intel.com>"
RECIPE_STATUS_pn-setserial = "red"
@@ -3666,7 +3666,7 @@ RECIPE_INTEL_SECTION_pn-qemugl="graphic app"
RECIPE_LAST_UPDATE_pn-qemugl = "Nov 28, 2010"
RECIPE_NO_UPDATE_REASON_pn-qemugl = "Do not upgrade to version: 33466cd8 because the upstream is broken in x86_64 build"
RECIPE_MAINTAINER_pn-qemugl="Saul Wold <sgw@linux.intel.com>"
-RECIPE_MANUAL_CHECK_DATE_pn-qemugl= "Feb 26, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-qemugl= "Apr 18, 2012"
RECIPE_STATUS_pn-fotowall="green"
# no update needed
@@ -6048,13 +6048,13 @@ RECIPE_MAINTAINER_pn-adt-installer = "Jessica Zhang <jessica.zhang@intel.com>"
RECIPE_LATEST_VERSION_pn-glew = "1.7.0"
RECIPE_LATEST_RELEASE_DATE_pn-glew = "Aug 26, 2011"
RECIPE_LAST_UPDATE_pn-glew = "May 24, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-glew = "Feb 26, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-glew = "Apr 18, 2012"
RECIPE_MAINTAINER_pn-glew = "Saul Wold <sgw@linux.intel.com>"
RECIPE_LATEST_VERSION_pn-squashfs-tools = "4.2"
RECIPE_LATEST_RELEASE_DATE_pn-squashfs-tools = "Feb 28, 2011"
RECIPE_LAST_UPDATE_pn-squashfs-tools = "Oct 21, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-squashfs-tools = "Feb 26, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-squashfs-tools = "Apr 18, 2012"
RECIPE_MAINTAINER_pn-squashfs-tools = "Saul Wold <sgw@linux.intel.com>"
RECIPE_LATEST_VERSION_pn-mpeg2dec = "0.5.1"
@@ -6062,17 +6062,17 @@ RECIPE_NO_UPDATE_REASON_pn-mpeg2dec = "Why are we currently at 0.4.1?"
RECIPE_MANUAL_CHECK_DATE_pn-mpeg2dec = "May 24, 2011"
RECIPE_MAINTAINER_pn-squashfs-tools = "Saul Wold <sgw@linux.intel.com>"
-RECIPE_LATEST_VERSION_pn-lame = "3.99.3"
-RECIPE_LATEST_RELEASE_DATE_pn-lame = "Nov 26, 2011"
-RECIPE_LAST_UPDATE_pn-lame = "Nov 28, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-lame = "Jan 09, 2012"
+RECIPE_LATEST_VERSION_pn-lame = "3.99.5"
+RECIPE_LATEST_RELEASE_DATE_pn-lame = "Feb 28, 2012"
+RECIPE_LAST_UPDATE_pn-lame = "Apr 19, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-lame = "Apr 18, 2012"
DISTRO_PN_ALIAS_pn-lame = "Debian=lame Ubuntu=lame"
RECIPE_MAINTAINER_pn-lame = "Saul Wold <sgw@linux.intel.com>"
RECIPE_LATEST_VERSION_pn-libmad = "0.15.1b"
RECIPE_LATEST_RELEASE_DATE_pn-libmad = "Feb 18, 2004"
RECIPE_LAST_UPDATE_pn-libmad = "Jul 04, 2006"
-RECIPE_MANUAL_CHECK_DATE_pn-libmad = "Jan 09, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-libmad = "Apr 18, 2012"
RECIPE_MAINTAINER_pn-libmad = "Saul Wold <sgw@linux.intel.com>"
RECIPE_LATEST_VERSION_pn-libxml-perl = "0.08"
@@ -6080,7 +6080,7 @@ RECIPE_LATEST_VERSION_pn-libxml-perl = "0.08"
RECIPE_LATEST_VERSION_pn-lsb = "1.4"
RECIPE_LAST_UPDATE_pn-lsb = "Nov 04, 2010"
RECIPE_LATEST_RELEASE_DATE_pn-lsb = "Jan 04, 2001"
-RECIPE_MANUAL_CHECK_DATE_pn-lsb = "Feb 26, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-lsb = "Apr 18, 2012"
RECIPE_NO_UPDATE_REASON_pn-lsb = "1.4 is fixed version of LSB Test"
RECIPE_MAINTAINER_pn-lsb = "Saul Wold <sgw@linux.intel.com>"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* [CONSOLIDATED PULL 43/43] kernel: Fix packaging issue
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (41 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 42/43] distro_tracking: Update Manual Check Saul Wold
@ 2012-04-20 16:45 ` Saul Wold
2012-04-23 15:39 ` Darren Hart
2012-04-24 10:43 ` [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Richard Purdie
43 siblings, 1 reply; 52+ messages in thread
From: Saul Wold @ 2012-04-20 16:45 UTC (permalink / raw)
To: openembedded-core
Remove /etc since it is empty, when creating a machine that does not
deliver any module config files, the /etc is empty and is then warned
about not being shipped, so we remove it.
This occurs in the routerstationpro with the following warning:
WARNING: For recipe linux-yocto, the following files/directories were installed but not shipped in any package:
WARNING: /etc
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/kernel.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 3519e7c..e8f0f9a 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -464,7 +464,7 @@ python populate_packages_prepend () {
# avoid warnings. removedirs only raises an OSError if an empty
# directory cannot be removed.
dvar = d.getVar('PKGD', True)
- for dir in ["%s/etc/modprobe.d" % (dvar), "%s/etc/modules-load.d" % (dvar)]:
+ for dir in ["%s/etc/modprobe.d" % (dvar), "%s/etc/modules-load.d" % (dvar), "%s/etc" % (dvar)]:
if len(os.listdir(dir)) == 0:
os.rmdir(dir)
--
1.7.7.6
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [CONSOLIDATED PULL 43/43] kernel: Fix packaging issue
2012-04-20 16:45 ` [CONSOLIDATED PULL 43/43] kernel: Fix packaging issue Saul Wold
@ 2012-04-23 15:39 ` Darren Hart
0 siblings, 0 replies; 52+ messages in thread
From: Darren Hart @ 2012-04-23 15:39 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 04/20/2012 09:45 AM, Saul Wold wrote:
> Remove /etc since it is empty, when creating a machine that does not
> deliver any module config files, the /etc is empty and is then warned
> about not being shipped, so we remove it.
>
> This occurs in the routerstationpro with the following warning:
> WARNING: For recipe linux-yocto, the following files/directories were installed but not shipped in any package:
> WARNING: /etc
>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Acked-by: Darren Hart <dvhart@linux.intel.com>
> ---
> meta/classes/kernel.bbclass | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 3519e7c..e8f0f9a 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -464,7 +464,7 @@ python populate_packages_prepend () {
> # avoid warnings. removedirs only raises an OSError if an empty
> # directory cannot be removed.
> dvar = d.getVar('PKGD', True)
> - for dir in ["%s/etc/modprobe.d" % (dvar), "%s/etc/modules-load.d" % (dvar)]:
> + for dir in ["%s/etc/modprobe.d" % (dvar), "%s/etc/modules-load.d" % (dvar), "%s/etc" % (dvar)]:
> if len(os.listdir(dir)) == 0:
> os.rmdir(dir)
>
--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up
2012-04-20 16:44 [CONSOLIDATED PULL 00/43] Post 1.2 Catch Up Saul Wold
` (42 preceding siblings ...)
2012-04-20 16:45 ` [CONSOLIDATED PULL 43/43] kernel: Fix packaging issue Saul Wold
@ 2012-04-24 10:43 ` Richard Purdie
43 siblings, 0 replies; 52+ messages in thread
From: Richard Purdie @ 2012-04-24 10:43 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2012-04-20 at 09:44 -0700, Saul Wold wrote:
> This is a series of patches that I have collected during the
> 1.2 stabilization time, the large set of changes from Mark H
> for update-alternatives.
>
> This also includes some packaging updates from me to remove
> more warnings, with this set, we build package warning free with
> the exectption of the nativesdk (eglibc 2.15 introduced a new
> install target). So we are close to enabling this as an ERROR,
> at least in the poky distro.
I've gone through this and merged it onto my master-next branch.
There are a few other pending changes on master-next including a fixed
automake upgrade.
I did not take all of Mark's update-alternatives changes, I want to
revisit the whole manual link thing as I still don't like it. I did take
the ones which just converted code to use the class which didn't involve
manual links.
Cheers,
Richard
^ permalink raw reply [flat|nested] 52+ messages in thread