* [PATCH 1/6] run-postinsts: fix opkg data path
2012-03-09 16:21 [PATCH 0/6] Pending patches on O.S. Systems' tree Otavio Salvador
@ 2012-03-09 16:21 ` Otavio Salvador
2012-03-09 16:21 ` [PATCH 2/6] image.bbclass: fix rootfs generation without package management tools Otavio Salvador
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Otavio Salvador @ 2012-03-09 16:21 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
.../dpkg/run-postinsts/run-postinsts | 4 ++--
.../dpkg/run-postinsts/run-postinsts.awk | 2 +-
meta/recipes-devtools/dpkg/run-postinsts_1.0.bb | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts b/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts
index 584a92e..5f6442c 100755
--- a/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts
+++ b/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts
@@ -8,8 +8,8 @@
PKGSYSTEM=/var/lib/dpkg
if [ ! -e $PKGSYSTEM/status ]; then
- if [ -e /usr/lib/opkg/status ]; then
- PKGSYSTEM=/usr/lib/opkg
+ if [ -e /var/lib/opkg/status ]; then
+ PKGSYSTEM=/var/lib/opkg
else
echo "No package system found"
exit 1
diff --git a/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts.awk b/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts.awk
index d92200b..18a0492 100644
--- a/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts.awk
+++ b/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts.awk
@@ -11,7 +11,7 @@ BEGIN {
if (rc==0)
pkgdir="/var/lib/dpkg/info"
else
- pkgdir="/usr/lib/opkg/info"
+ pkgdir="/var/lib/opkg/info"
package=""
}
/Package:.*/ {
diff --git a/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb b/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb
index f8f3368..7438a10 100644
--- a/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb
+++ b/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Run postinstall scripts on device using awk"
SECTION = "devel"
-PR = "r7"
+PR = "r8"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
--
1.7.2.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/6] image.bbclass: fix rootfs generation without package management tools
2012-03-09 16:21 [PATCH 0/6] Pending patches on O.S. Systems' tree Otavio Salvador
2012-03-09 16:21 ` [PATCH 1/6] run-postinsts: fix opkg data path Otavio Salvador
@ 2012-03-09 16:21 ` Otavio Salvador
2012-03-09 16:21 ` [PATCH 3/6] rootfs_rpm.bbclass: rename postinst trigger script Otavio Salvador
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Otavio Salvador @ 2012-03-09 16:21 UTC (permalink / raw)
To: openembedded-core
When building without package management tools the
ROOTFS_BOOTSTRAP_INSTALL packages need to be available to provide the
bare minimal for rootfs unconfigure postinsts to be on first boot.
Those packages where being include in core-image.bbclass' based images
however every image needs those available for proper rootfs generation.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/classes/core-image.bbclass | 2 --
meta/classes/image.bbclass | 7 +++++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index 668297b..e2ad0fc 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -51,8 +51,6 @@ CORE_IMAGE_BASE_INSTALL = '\
task-core-boot \
task-base-extended \
\
- ${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \
- \
${CORE_IMAGE_EXTRA_INSTALL} \
'
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index a62eb2c..533f53c 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -5,7 +5,7 @@ inherit imagetest-${IMAGETEST}
LICENSE = "MIT"
PACKAGES = ""
-RDEPENDS += "${IMAGE_INSTALL} ${LINGUAS_INSTALL} ${NORMAL_FEATURE_INSTALL}"
+RDEPENDS += "${IMAGE_INSTALL} ${LINGUAS_INSTALL} ${NORMAL_FEATURE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL}"
RRECOMMENDS += "${NORMAL_FEATURE_INSTALL_OPTIONAL}"
INHIBIT_DEFAULT_DEPS = "1"
@@ -14,6 +14,9 @@ INHIBIT_DEFAULT_DEPS = "1"
IMAGE_FEATURES ?= ""
IMAGE_FEATURES[type] = "list"
+# rootfs bootstrap install
+ROOTFS_BOOTSTRAP_INSTALL = "${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)}"
+
# packages to install from features
FEATURE_INSTALL = "${@' '.join(oe.packagegroup.required_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}"
FEATURE_INSTALL_OPTIONAL = "${@' '.join(oe.packagegroup.optional_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}"
@@ -52,7 +55,7 @@ PACKAGE_GROUP_doc-pkgs[optional] = "1"
IMAGE_INSTALL ?= ""
IMAGE_INSTALL[type] = "list"
IMAGE_BASENAME[export] = "1"
-export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${FEATURE_INSTALL}"
+export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL} ${FEATURE_INSTALL}"
PACKAGE_INSTALL_ATTEMPTONLY ?= "${FEATURE_INSTALL_OPTIONAL}"
# Images are generally built explicitly, do not need to be part of world.
--
1.7.2.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/6] rootfs_rpm.bbclass: rename postinst trigger script
2012-03-09 16:21 [PATCH 0/6] Pending patches on O.S. Systems' tree Otavio Salvador
2012-03-09 16:21 ` [PATCH 1/6] run-postinsts: fix opkg data path Otavio Salvador
2012-03-09 16:21 ` [PATCH 2/6] image.bbclass: fix rootfs generation without package management tools Otavio Salvador
@ 2012-03-09 16:21 ` Otavio Salvador
2012-03-09 16:21 ` [PATCH 4/6] opkg: " Otavio Salvador
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Otavio Salvador @ 2012-03-09 16:21 UTC (permalink / raw)
To: openembedded-core
Use 'run-postinsts' as trigger script name as it describes better the
intent of it.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/classes/rootfs_rpm.bbclass | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 48133f0..9039b21 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -112,7 +112,7 @@ EOF
install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
# Stop $i getting expanded below...
i=\$i
- cat > ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure << EOF
+ cat > ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts << EOF
#!/bin/sh
for i in /etc/rpm-postinsts/*; do
echo "Running postinst $i..."
@@ -122,9 +122,9 @@ for i in /etc/rpm-postinsts/*; do
echo "ERROR: postinst $i failed."
fi
done
-rm -f ${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
+rm -f ${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts
EOF
- chmod 0755 ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
+ chmod 0755 ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts
install -d ${IMAGE_ROOTFS}/${sysconfdir}
echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version
--
1.7.2.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/6] opkg: rename postinst trigger script
2012-03-09 16:21 [PATCH 0/6] Pending patches on O.S. Systems' tree Otavio Salvador
` (2 preceding siblings ...)
2012-03-09 16:21 ` [PATCH 3/6] rootfs_rpm.bbclass: rename postinst trigger script Otavio Salvador
@ 2012-03-09 16:21 ` Otavio Salvador
2012-03-09 16:21 ` [PATCH 5/6] dpkg: " Otavio Salvador
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Otavio Salvador @ 2012-03-09 16:21 UTC (permalink / raw)
To: openembedded-core
Use 'run-postinsts' as trigger script name as it describes better the
intent of it.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-devtools/opkg/opkg.inc | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index a67066f..689bd4a 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -11,7 +11,7 @@ DEPENDS_virtclass-native = "curl-native"
DEPENDS_virtclass-nativesdk = "curl-nativesdk"
PE = "1"
-INC_PR = "r7"
+INC_PR = "r8"
FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/opkg"
@@ -60,9 +60,9 @@ if [ "x$D" != "x" ]; then
# this happens at S98 where our good 'ole packages script used to run
echo "#!/bin/sh
opkg-cl configure
-rm -f /${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
-" > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
- chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
+rm -f /${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts
+" > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts
+ chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts
fi
update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100
--
1.7.2.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 5/6] dpkg: rename postinst trigger script
2012-03-09 16:21 [PATCH 0/6] Pending patches on O.S. Systems' tree Otavio Salvador
` (3 preceding siblings ...)
2012-03-09 16:21 ` [PATCH 4/6] opkg: " Otavio Salvador
@ 2012-03-09 16:21 ` Otavio Salvador
2012-03-09 16:21 ` [PATCH 6/6] connman: update to 0.79 Otavio Salvador
2012-03-13 16:29 ` [PATCH 0/6] Pending patches on O.S. Systems' tree Saul Wold
6 siblings, 0 replies; 8+ messages in thread
From: Otavio Salvador @ 2012-03-09 16:21 UTC (permalink / raw)
To: openembedded-core
Use 'run-postinsts' as trigger script name as it describes better the
intent of it.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-devtools/dpkg/dpkg.inc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 69fd50a..09bfbbc 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -42,9 +42,9 @@ do_install_prepend () {
# this happens at S98 where our good 'ole packages script used to run
printf "#!/bin/sh
dpkg --configure -a
-rm -f ${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
-" > ${D}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
- chmod 0755 ${D}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
+rm -f ${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts
+" > ${D}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts
+ chmod 0755 ${D}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts
}
do_install_append () {
--
1.7.2.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 6/6] connman: update to 0.79
2012-03-09 16:21 [PATCH 0/6] Pending patches on O.S. Systems' tree Otavio Salvador
` (4 preceding siblings ...)
2012-03-09 16:21 ` [PATCH 5/6] dpkg: " Otavio Salvador
@ 2012-03-09 16:21 ` Otavio Salvador
2012-03-13 16:29 ` [PATCH 0/6] Pending patches on O.S. Systems' tree Saul Wold
6 siblings, 0 replies; 8+ messages in thread
From: Otavio Salvador @ 2012-03-09 16:21 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
.../connman/add_xuser_dbus_permission.patch | 12 +++++++-----
.../connman/connman/disable_alg-test.patch | 18 +++++++++---------
.../connman/{connman_0.78.bb => connman_0.79.bb} | 6 ++----
3 files changed, 18 insertions(+), 18 deletions(-)
rename meta/recipes-connectivity/connman/{connman_0.78.bb => connman_0.79.bb} (79%)
diff --git a/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch b/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch
index 764c689..aa7a910 100644
--- a/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch
+++ b/meta/recipes-connectivity/connman/connman/add_xuser_dbus_permission.patch
@@ -5,18 +5,20 @@ Upstream-Status: Inappropriate [configuration]
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
-diff -ruN connman-0.65-orig/src/connman-dbus.conf connman-0.65/src/connman-dbus.conf
---- connman-0.65-orig/src/connman-dbus.conf 2011-03-04 09:34:49.000000000 +0800
-+++ connman-0.65/src/connman-dbus.conf 2011-03-04 09:35:21.000000000 +0800
-@@ -7,6 +7,12 @@
- <allow send_interface="net.connman.Agent"/>
+diff --git a/src/connman-dbus.conf b/src/connman-dbus.conf
+index 98a773e..cbe2ba3 100644
+--- a/src/connman-dbus.conf
++++ b/src/connman-dbus.conf
+@@ -8,6 +8,13 @@
<allow send_interface="net.connman.Counter"/>
+ <allow send_interface="net.connman.Notification"/>
</policy>
+ <policy user="xuser">
+ <allow own="net.connman"/>
+ <allow send_destination="net.connman"/>
+ <allow send_interface="net.connman.Agent"/>
+ <allow send_interface="net.connman.Counter"/>
++ <allow send_interface="net.connman.Notification"/>
+ </policy>
<policy at_console="true">
<allow send_destination="net.connman"/>
diff --git a/meta/recipes-connectivity/connman/connman/disable_alg-test.patch b/meta/recipes-connectivity/connman/connman/disable_alg-test.patch
index 44ad768..f5cea00 100644
--- a/meta/recipes-connectivity/connman/connman/disable_alg-test.patch
+++ b/meta/recipes-connectivity/connman/connman/disable_alg-test.patch
@@ -1,4 +1,4 @@
-From b9a20c8eb61b600ced284646a1bea588fdd8a5ea Mon Sep 17 00:00:00 2001
+From 3ebba424d56919018733064ad9e0ab8790d2bf1d Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 16 Dec 2011 19:31:59 -0200
Subject: [PATCH] Disable building of alg-test
@@ -15,23 +15,23 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index d5a76f9..d42a766 100644
+index a6509f1..93618a3 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -144,7 +144,7 @@ noinst_PROGRAMS += tools/wispr tools/supplicant-test \
+@@ -145,7 +145,7 @@ noinst_PROGRAMS += tools/wispr tools/supplicant-test \
tools/dbus-test tools/polkit-test \
tools/iptables-test tools/tap-test tools/wpad-test \
tools/stats-tool tools/private-network-test \
-- tools/alg-test unit/test-session
-+ unit/test-session
+- tools/alg-test unit/test-session unit/test-ippool \
++ unit/test-session unit/test-ippool \
+ unit/test-nat
tools_wispr_SOURCES = $(gweb_sources) tools/wispr.c
- tools_wispr_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv
diff --git a/configure.ac b/configure.ac
-index f63fea8..67bfe85 100644
+index 3dca02e..3b2da4d 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -437,9 +437,6 @@ if (test "${enable_tools}" = "yes"); then
+@@ -419,9 +419,6 @@ if (test "${enable_tools}" = "yes"); then
AC_MSG_ERROR(GnuTLS library is required))
AC_SUBST(GNUTLS_CFLAGS)
AC_SUBST(GNUTLS_LIBS)
@@ -42,5 +42,5 @@ index f63fea8..67bfe85 100644
AM_CONDITIONAL(TOOLS, test "${enable_tools}" = "yes")
--
-1.7.7.3
+1.7.9.1
diff --git a/meta/recipes-connectivity/connman/connman_0.78.bb b/meta/recipes-connectivity/connman/connman_0.79.bb
similarity index 79%
rename from meta/recipes-connectivity/connman/connman_0.78.bb
rename to meta/recipes-connectivity/connman/connman_0.79.bb
index c73cad9..0c3a6fe 100644
--- a/meta/recipes-connectivity/connman/connman_0.78.bb
+++ b/meta/recipes-connectivity/connman/connman_0.79.bb
@@ -1,9 +1,7 @@
require connman.inc
-PR = "r6"
-
-# 0.78 tag
-SRCREV = "02f5d5fe2d7c71514a6387ba2b772b42d8e8d297"
+# 0.79 tag
+SRCREV = "442b1fe603e005814f592a3dbcf0d0bfb13f961c"
SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \
file://add_xuser_dbus_permission.patch \
file://ethernet_default.patch \
--
1.7.2.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 0/6] Pending patches on O.S. Systems' tree
2012-03-09 16:21 [PATCH 0/6] Pending patches on O.S. Systems' tree Otavio Salvador
` (5 preceding siblings ...)
2012-03-09 16:21 ` [PATCH 6/6] connman: update to 0.79 Otavio Salvador
@ 2012-03-13 16:29 ` Saul Wold
6 siblings, 0 replies; 8+ messages in thread
From: Saul Wold @ 2012-03-13 16:29 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 03/09/2012 08:21 AM, Otavio Salvador wrote:
> The following changes since commit 50dc8bfbac42b9a9b52a2f7d0568740c41790c13:
>
> rpm 5.4.0: Add rpmdeps-oecore to replace rpmdeps for package.bbclass (2012-03-09 06:39:52 -0800)
>
> are available in the git repository at:
> git://github.com/OSSystems/oe-core master
> https://github.com/OSSystems/oe-core/tree/HEAD
>
> Otavio Salvador (6):
> run-postinsts: fix opkg data path
> image.bbclass: fix rootfs generation without package management tools
> rootfs_rpm.bbclass: rename postinst trigger script
> opkg: rename postinst trigger script
> dpkg: rename postinst trigger script
Already replied as merged
> connman: update to 0.79
>
Merged connman into OE-Core
Thanks
Sau!
> meta/classes/core-image.bbclass | 2 --
> meta/classes/image.bbclass | 7 +++++--
> meta/classes/rootfs_rpm.bbclass | 6 +++---
> .../connman/add_xuser_dbus_permission.patch | 12 +++++++-----
> .../connman/connman/disable_alg-test.patch | 18 +++++++++---------
> .../connman/{connman_0.78.bb => connman_0.79.bb} | 6 ++----
> meta/recipes-devtools/dpkg/dpkg.inc | 6 +++---
> .../dpkg/run-postinsts/run-postinsts | 4 ++--
> .../dpkg/run-postinsts/run-postinsts.awk | 2 +-
> meta/recipes-devtools/dpkg/run-postinsts_1.0.bb | 2 +-
> meta/recipes-devtools/opkg/opkg.inc | 8 ++++----
> 11 files changed, 37 insertions(+), 36 deletions(-)
> rename meta/recipes-connectivity/connman/{connman_0.78.bb => connman_0.79.bb} (79%)
>
^ permalink raw reply [flat|nested] 8+ messages in thread