[OE-core] [PATCH] cairo: Adds libxext in X11DEPENDS.
From: Noor Ahsan noor_ah...@mentor.com
* cairo was giving redefinition error of struct _XLinearGradient,
struct _XCircle and struct _XRadialGradient.
* cario now depends on libxext. Adding that dependency resolved
above errors.
* Verified it on P2020RDB.
* Bump PR.
Signed-off-by: Noor Ahsan noor_ah...@mentor.com
---
meta/recipes-graphics/cairo/cairo.inc |2 +-
meta/recipes-graphics/cairo/cairo_1.12.8.bb |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/cairo/cairo.inc
b/meta/recipes-graphics/cairo/cairo.inc
index 3059fae..217e297 100644
--- a/meta/recipes-graphics/cairo/cairo.inc
+++ b/meta/recipes-graphics/cairo/cairo.inc
@@ -10,7 +10,7 @@ HOMEPAGE = http://cairographics.org;
BUGTRACKER = http://bugs.freedesktop.org;
SECTION = libs
LICENSE = MPL-1 LGPLv2.1
-X11DEPENDS = virtual/libx11 libsm libxrender
+X11DEPENDS = virtual/libx11 libsm libxrender libxext
DEPENDS = libpng fontconfig pixman glib-2.0
PACKAGECONFIG ??= ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'gtk-directfb',
'', d)}
diff --git a/meta/recipes-graphics/cairo/cairo_1.12.8.bb
b/meta/recipes-graphics/cairo/cairo_1.12.8.bb
index 058854c..567a17f 100644
--- a/meta/recipes-graphics/cairo/cairo_1.12.8.bb
+++ b/meta/recipes-graphics/cairo/cairo_1.12.8.bb
@@ -2,7 +2,7 @@ require cairo.inc
LIC_FILES_CHKSUM = file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77
-PR = r0
+PR = r1
SRC_URI = http://cairographics.org/releases/cairo-${PV}.tar.xz;
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] RFC: systemd integration
On Wed, Dec 19, 2012 at 07:20:45PM +0200, Radu Moisan wrote: Hi guys, I have prepared a branch on poky-contrib (rmoisan/systemd) where I pulled systemd from meta-openembedded. The goal is to merge this into oe-core, so please take a look and give me your feedback on stuff that needs work or things that I might have done wrong, so that I can prepare it for merge. At this point core-image-minimal and core-image-sato both boot fine with systemd. There still are a few warnings but not critical(at runtime), at least in my opinion, you may want to take a look at those too. You can activate systemd by *DISTRO_FEATURES_INITMAN = systemd* Is this correct? http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/meta/recipes-extended/pam/libpam_1.1.6.bb?h=rmoisan/systemdid=d31d804ad76829de039f3b41d7b45ffcc25e69b5 Shouldn't it be added to common-session only when systemd is enabled? Is '|-' some special syntax for palm config? session required|-pam_systemd.so Cheers, -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/27] Christmas Fixes!
On Tue, 2012-12-25 at 14:53 -0800, Saul Wold wrote: Richard, After much hair pulling, I have a change set that builds cleanly other than webkit (which was broken before). More patch testing over the next few days! Happy Holidays to all Thanks Saul, I merged these. Happy holidays all! Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH][for-danny] arch-armv4.inc: add --fix-v4bx to TARGET_LD_KERNEL_ARCH only for armv4 and strongarm1100
* without this patch it does apply --fix-v4bx not only to armv4, but
also all higher (because they also have armv4 in TUNE_FEATURES)
* it causes SIGILL on armv4t
http://lists.linuxtogo.org/pipermail/openembedded-devel/2012-November/042298.html
* someone please test on armv4 device (I tested only bitbake -e output
that it's correctly applied with DEFAULTTUNE == armv4
* maybe we can should fix this in binutils instead (both 2.22 and 2.23
are affected)
Signed-off-by: Martin Jansa martin.ja...@gmail.com
Signed-off-by: Saul Wold s...@linux.intel.com
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
---
meta/conf/machine/include/arm/arch-armv4.inc | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/meta/conf/machine/include/arm/arch-armv4.inc
b/meta/conf/machine/include/arm/arch-armv4.inc
index cb747ac..075366a 100644
--- a/meta/conf/machine/include/arm/arch-armv4.inc
+++ b/meta/conf/machine/include/arm/arch-armv4.inc
@@ -4,7 +4,13 @@ ARMPKGARCH ?= armv4
TUNEVALID[armv4] = Enable instructions for ARMv4
TUNE_CCARGS += ${@bb.utils.contains(TUNE_FEATURES, armv4,
-march=armv4${ARMPKGSFX_THUMB}, , d)}
-TARGET_LD_KERNEL_ARCH += ${@bb.utils.contains(TUNE_FEATURES, armv4,
--fix-v4bx, , d)}
+# enable --fix-v4bx when we have armv4 in TUNE_FEATURES, but then disable it
when we have also armv5 or thumb
+# maybe we should extend bb.utils.contains to support check for any
checkvalues in value, now it does
+# checkvalues.issubset(val) which cannot be used for negative test of foo
neither bar in value
+FIX_V4BX_ARMV4 = ${@bb.utils.contains(TUNE_FEATURES, armv4, --fix-v4bx,
, d)}
+FIX_V4BX_ARMV5 = ${@bb.utils.contains(TUNE_FEATURES, armv5, ,
${FIX_V4BX_ARMV4}, d)}
+FIX_V4BX = ${@bb.utils.contains(TUNE_FEATURES, thumb, ,
${FIX_V4BX_ARMV5}, d)}
+TARGET_LD_KERNEL_ARCH += ${FIX_V4BX}
MACHINEOVERRIDES .= ${@bb.utils.contains(TUNE_FEATURES, armv4, :armv4,
,d)}
require conf/machine/include/arm/arch-arm.inc
--
1.8.0.2
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 14/15] pcmanfm: upgrade to 1.1.0
On 12/24/2012 12:34 AM, Constantin Musca wrote:
pcmanfm_fix_for_automake_1.12.patch: removed
- problem not reprodicible anymore
owl-window-menu.patch: removed
- not needed anymore
Signed-off-by: Constantin Musca constantinx.mu...@intel.com
---
.../pcmanfm/files/owl-window-menu.patch| 81 --
.../files/pcmanfm_fix_for_automake_1.12.patch | 35 --
.../{pcmanfm_0.9.10.bb = pcmanfm_1.1.0.bb}| 11 ++-
3 files changed, 4 insertions(+), 123 deletions(-)
delete mode 100644 meta/recipes-sato/pcmanfm/files/owl-window-menu.patch
delete mode 100644
meta/recipes-sato/pcmanfm/files/pcmanfm_fix_for_automake_1.12.patch
rename meta/recipes-sato/pcmanfm/{pcmanfm_0.9.10.bb = pcmanfm_1.1.0.bb} (76%)
Seems to be an issue with this when I built it for ARM:
arm-poky-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork --sysroot=/intel/builds/world/tmp/sysroots/qemuarm -DHAVE_CONFIG_H
-I. -I.. -DPACKAGE_DATA_DIR=\/usr/share/pcmanfm\ -DPACKAGE_UI_DIR=\/usr/share/pcmanfm/ui\
-DPACKAGE_LOCALE_DIR=\/usr/share/locale\ -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT
-DG_DISABLE_CHECKS -pthread -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/glib-2.0
-I/intel/builds/world/tmp/sysroots/qemuarm/usr/lib/glib-2.0/include -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/gio-unix-2.0/
-I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/pango-1.0 -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/gtk-2.0
-I/intel/builds/world/tmp/sysroots/qemuarm/usr/lib/gtk-2.0/include -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/atk-1.0
-I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/cairo -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/gdk-pixbuf-2.0
-I/intel/builds/world/
tmp/sysroots/qemuarm/usr/include/pixman-1
-I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/freetype2
-I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/libpng15
-DG_DISABLE_CAST_CHECKS -Wall -Werror-implicit-function-declaration -O2 -pipe
-g -feliminate-unused-debug-types -c -o pcmanfm-pref.o `test -f 'pref.c' ||
echo './'`pref.c
arm-poky-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork --sysroot=/intel/builds/world/tmp/sysroots/qemuarm -DHAVE_CONFIG_H
-I. -I.. -DPACKAGE_DATA_DIR=\/usr/share/pcmanfm\ -DPACKAGE_UI_DIR=\/usr/share/pcmanfm/ui\
-DPACKAGE_LOCALE_DIR=\/usr/share/locale\ -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT
-DG_DISABLE_CHECKS -pthread -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/glib-2.0
-I/intel/builds/world/tmp/sysroots/qemuarm/usr/lib/glib-2.0/include -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/gio-unix-2.0/
-I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/pango-1.0 -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/gtk-2.0
-I/intel/builds/world/tmp/sysroots/qemuarm/usr/lib/gtk-2.0/include -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/atk-1.0
-I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/cairo -I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/gdk-pixbuf-2.0
-I/intel/builds/world/
tmp/sysroots/qemuarm/usr/include/pixman-1
-I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/freetype2
-I/intel/builds/world/tmp/sysroots/qemuarm/usr/include/libpng15
-DG_DISABLE_CAST_CHECKS -Wall -Werror-implicit-function-declaration -O2 -pipe
-g -feliminate-unused-debug-types -c -o pcmanfm-utils.o `test -f 'utils.c' ||
echo './'`utils.c
tab-page.c:24:26: fatal error: libfm/fm-gtk.h: No such file or directory
compilation terminated.
app-config.c:26:26: fatal error: libfm/fm-gtk.h: No such file or directory
compilation terminated.
make[2]: *** [pcmanfm-app-config.o] Error 1
make[2]: *** Waiting for unfinished jobs
make[2]: *** [pcmanfm-tab-page.o] Error 1
pref.c:26:22: fatal error: libfm/fm.h: No such file or directory
compilation terminated.
make[2]: *** [pcmanfm-pref.o] Error 1
volume-manager.c:27:26: fatal error: libfm/fm-gtk.h: No such file or directory
compilation terminated.
make[2]: *** [pcmanfm-volume-manager.o] Error 1
In file included from utils.c:22:0:
utils.h:26:26: fatal error: libfm/fm-gtk.h: No such file or directory
compilation terminated.
make[2]: *** [pcmanfm-utils.o] Error 1
In file included from desktop.c:27:0:
desktop.h:27:26: fatal error: libfm/fm-gtk.h: No such file or directory
compilation terminated.
make[2]: *** [pcmanfm-desktop.o] Error 1
In file included from main-win.c:34:0:
pcmanfm.h:26:22: fatal error: libfm/fm.h: No such file or directory
compilation terminated.
make[2]: *** [pcmanfm-main-win.o] Error 1
pcmanfm.c:39:26: fatal error: libfm/fm-gtk.h: No such file or directory
compilation terminated.
make[2]: *** [pcmanfm-pcmanfm.o] Error 1
make[2]: Leaving directory
`/intel/builds/world/tmp/work/armv5te-poky-linux-gnueabi/pcmanfm/1.1.0-r0/pcmanfm-1.1.0/src'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory
[OE-core] Denzil 1.2.2 development nearly complete
Hi everyone, I wanted to make sure the community is aware that I am wrapping things up for our next denzil stable release, 1.2.2. We've had some discussions about this at the Technical Team Meetings, but I thought I'd send this out to the mailing lists as well. The current status of my testing branches can be found here: oe-core based tree: http://git.openembedded.org/openembedded-core-contrib/log/?h=sgarman/denzil-next and my poky-based tree: http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=sgarman/denzil-next I will be submitting a pull request to Richard soon to get these patches merged to the official denzil branches of the oe-core and poky repositories, respectively. If anyone has outstanding patches they need in denzil (or that I've overlooked), please get them to me as soon as possible. To see a list of bugs addressed during the 1.2.2 release cycle, do a Bugzilla search for bugs with a Target Milestone of 1.2.2. Our QA team will be back on Monday, January 7, and will begin another full-pass test cycle on denzil. If they don't find any new bugs and can verify the recently fixed bugs in denzil, our goal is to release 1.2.2 shortly thereafter. Scott -- Scott Garman Embedded Linux Engineer - Yocto Project Intel Open Source Technology Center ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] State of bitbake world
On Mon, Dec 24, 2012 at 10:12:42AM +0100, Martin Jansa wrote: Few more are failing when it's built without DISTRO setting (and also without gold) http://jenkins.nas-admin.org/job/shr-core-branches_world_qemuarm/28/consoleFull meta-openembedded/meta-systemd/recipes-core/systemd/systemd_git.bb, do_package_write_ipk Systemd issues seems the same as Eric reported from denzil: 09:51:56 JaMa|Off this is with latest master and I've reported it too while ago.. looks like some conflict in bitbake cache or something like that 09:52:44 JaMa|Off ERROR: Error executing a python function in /home/jenkins/shr/shr-core-branches/shr-core/meta-openembedded/meta-systemd/recipes-core/systemd/systemd_git.bb: 09:52:45 JaMa|Off OSError: [Errno 2] No such file or directory: '/home/jenkins/shr/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/udev/182-r3/packages-split/udev-systemd' 09:53:09 ericben JaMa|Off: I also have this one yes during build. 09:53:09 JaMa|Off python task from systemd recipe is trying to use workdir from udev recipe I've reproduced this issue with 3 very simple recipes and filled it https://bugzilla.yoctoproject.org/show_bug.cgi?id=3645 signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] iproute2: DEPENDS on iptables
Make sure iproute rebuilds when iptables is updated Signed-off-by: Saul Wold s...@linux.intel.com --- meta/recipes-connectivity/iproute2/iproute2.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc index d8b1a17..41957ce 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2.inc @@ -9,7 +9,7 @@ LICENSE = GPLv2+ LIC_FILES_CHKSUM = file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ file://ip/ip.c;beginline=3;endline=8;md5=689d691d0410a4b64d3899f8d6e31817 -DEPENDS = flex-native bison-native +DEPENDS = flex-native bison-native iptables inherit update-alternatives -- 1.8.0.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3 0/4] read-only rootfs support
From: Chen Qi qi.c...@windriver.com The series of patches add support to read-only rootfs. The main idea is to use symbolic links to create the illuion that some directories are writable in case of a read-only rootfs. This set of patches have been tested on minimal images with and without 'read-only-rootfs' image feature enabled. Everything is OK. For sato images, everything is the same as before if 'read-only-rootfs' is not enabled. With 'read-only-rootfs' enabled, sato image could work if graphic interface is diabled. When all postinstall problems are resolved, sato image should work well (maybe with some small changes in volatiles-readonly-sato conf file). The following changes since commit 90c0eb29f0b41e4ac2d3d17ebad7295c2ebdc02a: rootfs_rpm.bbclass: remove debug code (2012-12-19 21:43:55 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib ChenQi/readonly-rootfs http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/readonly-rootfs Chen Qi (4): sysvinit: add ROOTFS_READ_ONLY variable to rcS-default image.bbclass: add two hook funtions to support read-only rootfs core-image.bbclass: support read-only-rootfs image feature initscripts: support read-only rootfs meta/classes/core-image.bbclass|7 +- meta/classes/image.bbclass | 29 ++ .../initscripts/initscripts-1.0/bootmisc.sh|9 +- .../initscripts-1.0/populate-volatile.sh | 281 ++-- .../initscripts/initscripts-1.0/volatiles |1 + .../initscripts-1.0/volatiles-readonly-minimal |8 + .../initscripts-1.0/volatiles-readonly-sato| 14 + meta/recipes-core/initscripts/initscripts_1.0.bb | 11 +- meta/recipes-core/sysvinit/sysvinit/rcS-default|4 + meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb |2 +- 10 files changed, 210 insertions(+), 156 deletions(-) create mode 100644 meta/recipes-core/initscripts/initscripts-1.0/volatiles-readonly-minimal create mode 100644 meta/recipes-core/initscripts/initscripts-1.0/volatiles-readonly-sato -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] sysvinit: add ROOTFS_READ_ONLY variable to rcS-default
From: Chen Qi qi.c...@windriver.com
This variable indicates whether the rootfs is intended to be read-only
or not. Changing this value from 'no' to 'yes' on a currently running
system with read-write rootfs and rebooting will give the user a working
system with read-only rootfs.
However, it is not suggested to change its value. Normally, if a read-only
rootfs is required, we should build an image with 'read-only-rootfs' image
feature.
[YOCTO #3406]
Signed-off-by: Chen Qi qi.c...@windriver.com
---
meta/recipes-core/sysvinit/sysvinit/rcS-default |4
meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb |2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/sysvinit/sysvinit/rcS-default
b/meta/recipes-core/sysvinit/sysvinit/rcS-default
index 3c9dea9..88907a5 100644
--- a/meta/recipes-core/sysvinit/sysvinit/rcS-default
+++ b/meta/recipes-core/sysvinit/sysvinit/rcS-default
@@ -23,3 +23,7 @@ FSCKFIX=yes
#TICKADJ=1
# Enable caching in populate-volatile.sh
VOLATILE_ENABLE_CACHE=yes
+# Indicate whether the rootfs is intended to be read-only or not.
+# Setting ROOTFS_READ_ONLY to yes and rebooting will give you a read-only
rootfs.
+# Normally you should not change this value.
+ROOTFS_READ_ONLY=no
\ No newline at end of file
diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
index de073b8..bf6a29b 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 = r9
+PR = r10
RDEPENDS_${PN} = ${PN}-inittab
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] image.bbclass: add two hook funtions to support read-only rootfs
From: Chen Qi qi.c...@windriver.com
read_only_rootfs_hook: this funtion is invoked only if 'read-only-rootfs'
is in IMAGE_FEATURES. It tweaks some basic files and makes populate-
volatile.sh script run at rootfs time.
choose_volatile_conf_file: this function properly chooses the right
conf file for volatile storage handling according to the IMAGE_FEATURES.
[YOCTO #3406]
Signed-off-by: Chen Qi qi.c...@windriver.com
---
meta/classes/image.bbclass | 29 +
1 file changed, 29 insertions(+)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 8bf718a..15d42d0 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -394,6 +394,35 @@ zap_root_password () {
mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd
}
+# A hook function to support read-only-rootfs IMAGE_FEATURES
+read_only_rootfs_hook () {
+ # Tweak the mount option in fstab
+ sed '/rootfs/ s/defaults/ro/' ${IMAGE_ROOTFS}/etc/fstab
${IMAGE_ROOTFS}/etc/fstab.new
+ mv ${IMAGE_ROOTFS}/etc/fstab.new ${IMAGE_ROOTFS}/etc/fstab
+ # Change the value of ROOTFS_READ_ONLY in /etc/default/rcS to yes
+ sed 's/ROOTFS_READ_ONLY=no/ROOTFS_READ_ONLY=yes/'
${IMAGE_ROOTFS}/etc/default/rcS ${IMAGE_ROOTFS}/etc/default/rcS.new
+ mv ${IMAGE_ROOTFS}/etc/default/rcS.new ${IMAGE_ROOTFS}/etc/default/rcS
+ # Run populate-volatile.sh at rootfs time to set up basic files
+ # and directories to support read-only rootfs.
+ if [ ! -e ${IMAGE_ROOTFS}/etc/init.d/populate-volatile.sh ]; then
+ echo ${IMAGE_ROOTFS}/etc/init.d/populate-volatile.sh doesn't
exist.
+ exit 1
+ else
+ ${IMAGE_ROOTFS}/etc/init.d/populate-volatile.sh
+ fi
+}
+
+# Choose the correct config file for volatile storage handling according to
the image type
+choose_volatile_conf_file () {
+ if ${@base_contains(IMAGE_FEATURES, x11-sato, true, false ,d)};
then
+ cp
${IMAGE_ROOTFS}/etc/default/volatiles_stage/volatiles-readonly-sato \
+ ${IMAGE_ROOTFS}/etc/default/volatiles/00_core_readonly
+ else
+ cp
${IMAGE_ROOTFS}/etc/default/volatiles_stage/volatiles-readonly-minimal \
+ ${IMAGE_ROOTFS}/etc/default/volatiles/00_core_readonly
+ fi
+}
+
# allow openssh accept login with empty password string
openssh_allow_empty_password () {
if [ -e ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config ]; then
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] core-image.bbclass: support read-only-rootfs image feature
From: Chen Qi qi.c...@windriver.com
Two hook functions are appended to ROOTFS_POSTPROCESS_COMMAND
properly to support the 'read-only-rootfs' image feature.
[YOCTO #3406]
Signed-off-by: Chen Qi qi.c...@windriver.com
---
meta/classes/core-image.bbclass |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index 2e67018..dc8fdc3 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -28,6 +28,7 @@ LIC_FILES_CHKSUM =
file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
# - dev-pkgs- development packages (headers, etc.) for all
installed packages in the rootfs
# - dbg-pkgs- debug symbol packages for all installed packages in
the rootfs
# - doc-pkgs- documentation packages for all installed packages in
the rootfs
+# - read-only-rootfs- tweaks an image to support read-only rootfs
#
PACKAGE_GROUP_x11 = packagegroup-core-x11
PACKAGE_GROUP_x11-base = packagegroup-core-x11-base
@@ -73,9 +74,11 @@ inherit image
# Create /etc/timestamp during image construction to give a reasonably sane
default time setting
ROOTFS_POSTPROCESS_COMMAND += rootfs_update_timestamp ;
-
+# Choose the correct configuartion files for volatile storage handling
+ROOTFS_POSTPROCESS_COMMAND += choose_volatile_conf_file ;
# Zap the root password if debug-tweaks feature is not enabled
ROOTFS_POSTPROCESS_COMMAND += '${@base_contains(IMAGE_FEATURES,
debug-tweaks, , zap_root_password ; ,d)}'
# Allow openssh accept empty password login if both debug-tweaks and
ssh-server-openssh are enabled
ROOTFS_POSTPROCESS_COMMAND += '${@base_contains(IMAGE_FEATURES,
debug-tweaks ssh-server-openssh, openssh_allow_empty_password; , ,d)}'
-
+# Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is
enabled
+ROOTFS_POSTPROCESS_COMMAND += '${@base_contains(IMAGE_FEATURES,
read-only-rootfs, read_only_rootfs_hook; , ,d)}'
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] initscripts: support read-only rootfs
From: Chen Qi qi.c...@windriver.com
To support a read-only rootfs, we use symbolic links which point
to volatile storage to create the illusion that some directories
are writable.
Improve populate-volatile.sh script to support read-only rootfs.
Add two default config files specific to read-only-rootfs image.
[YOCTO #3406]
Signed-off-by: Chen Qi qi.c...@windriver.com
---
.../initscripts/initscripts-1.0/bootmisc.sh|9 +-
.../initscripts-1.0/populate-volatile.sh | 281 ++--
.../initscripts/initscripts-1.0/volatiles |1 +
.../initscripts-1.0/volatiles-readonly-minimal |8 +
.../initscripts-1.0/volatiles-readonly-sato| 14 +
meta/recipes-core/initscripts/initscripts_1.0.bb | 11 +-
6 files changed, 171 insertions(+), 153 deletions(-)
create mode 100644
meta/recipes-core/initscripts/initscripts-1.0/volatiles-readonly-minimal
create mode 100644
meta/recipes-core/initscripts/initscripts-1.0/volatiles-readonly-sato
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
index 4f76cb4..3b5a47f 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
@@ -54,14 +54,7 @@ fi
#
# This is as good a place as any for a sanity check
-# /tmp should be a symlink to /var/tmp to cut down on the number
-# of mounted ramdisks.
-if test ! -L /tmp test -d /var/tmp
-then
- rm -rf /tmp
- ln -sf /var/tmp /tmp
-fi
-
+#
# Set the system clock from hardware clock
# If the timestamp is more recent than the current time,
# use the timestamp instead.
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
index d2175d7..2691173 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
@@ -8,192 +8,187 @@
# Short-Description: Populate the volatile filesystem
### END INIT INFO
-. /etc/default/rcS
-
-CFGDIR=/etc/default/volatiles
-TMPROOT=/var/tmp
+# Get ROOT_DIR
+DIRNAME=`dirname $0`
+ROOT_DIR=`echo $DIRNAME | sed -ne 's:etc/.*::p'`
+
+. ${ROOT_DIR}/etc/default/rcS
+# When running populat-volatile.sh at rootfs time, disable cache.
+[ $ROOT_DIR != / ] VOLATILE_ENABLE_CACHE=no
+# If rootfs is read-only, disable cache.
+[ $ROOTFS_READ_ONLY = yes ] VOLATILE_ENABLE_CACHE=no
+# All above statements will be moved to a central place, say var.sh which
+# encapsulates '. /etc/default/rcS'.
+
+CFGDIR=${ROOT_DIR}/etc/default/volatiles
+TMPROOT=${ROOT_DIR}/var/volatile/tmp
COREDEF=00_core
+COREDEF_READONLY=00_core_readonly
-[ ${VERBOSE} != no ] echo Populating volatile Filesystems.
+[ ${VERBOSE} != no ] echo Setting up basic files related to volatile
storage under ${ROOT_DIR}.
create_file() {
- EXEC=
- touch \$1\;
- chown ${TUSER}.${TGROUP} $1 || echo \Failed to set owner -${TUSER}-
for -$1-.\ /dev/tty0 21;
- chmod ${TMODE} $1 || echo \Failed to set mode -${TMODE}- for -$1-.\
/dev/tty0 21
+ EXEC=
+ touch \$1\;
+ chown ${TUSER}.${TGROUP} $1 || echo \Failed to set owner -${TUSER}-
for -$1-.\ /dev/null 21;
+ chmod ${TMODE} $1 || echo \Failed to set mode -${TMODE}- for -$1-.\
/dev/null 21
test $VOLATILE_ENABLE_CACHE = yes echo $EXEC
/etc/volatile.cache.build
[ -e $1 ] {
- [ ${VERBOSE} != no ] echo Target already exists. Skipping.
+ [ ${VERBOSE} != no ] echo Target $1 already exists.
Skipping.
} || {
- eval $EXEC
+ if [ $ROOT_DIR = / ]; then
+ eval $EXEC
+ else
+ # Some operations at rootfs time may fail and should
fail,
+ # but these failures should not be logged.
+ eval $EXEC /dev/null 21
+ fi
}
}
mk_dir() {
EXEC=
mkdir -p \$1\;
- chown ${TUSER}.${TGROUP} $1 || echo \Failed to set owner -${TUSER}-
for -$1-.\ /dev/tty0 21;
- chmod ${TMODE} $1 || echo \Failed to set mode -${TMODE}- for -$1-.\
/dev/tty0 21
+ chown ${TUSER}.${TGROUP} $1 || echo \Failed to set owner -${TUSER}-
for -$1-.\ 21;
+ chmod ${TMODE} $1 || echo \Failed to set mode -${TMODE}- for -$1-.\
21
test $VOLATILE_ENABLE_CACHE = yes echo $EXEC
/etc/volatile.cache.build
[ -e $1 ] {
- [ ${VERBOSE} != no ] echo Target already exists. Skipping.
+ [ ${VERBOSE} != no ] echo Target ${1} already exists.
Skipping.
} || {
- eval $EXEC
+ if [ $ROOT_DIR = / ]; then
+ eval $EXEC
+ else
+ # Some operations at rootfs time may fail and should
fail,
+# but these failures should not
[OE-core] [PATCH 1/3] autoconf: update RDEDENDS
The only file Glob.so provided by perl-module-file will be moved to
package perl-module-file-glob. So remove perl-module-file from RDEDENDS.
Signed-off-by: Kang Kai kai.k...@windriver.com
---
meta/recipes-devtools/autoconf/autoconf.inc |1 -
meta/recipes-devtools/autoconf/autoconf_2.69.bb |2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/autoconf/autoconf.inc
b/meta/recipes-devtools/autoconf/autoconf.inc
index 2c46117..2fde9d4 100644
--- a/meta/recipes-devtools/autoconf/autoconf.inc
+++ b/meta/recipes-devtools/autoconf/autoconf.inc
@@ -14,7 +14,6 @@ RDEPENDS_${PN} = m4 gnu-config \
perl-module-constant \
perl-module-errno \
perl-module-exporter \
- perl-module-file \
perl-module-file-basename \
perl-module-file-compare \
perl-module-file-copy \
diff --git a/meta/recipes-devtools/autoconf/autoconf_2.69.bb
b/meta/recipes-devtools/autoconf/autoconf_2.69.bb
index 730c89e..7512951 100644
--- a/meta/recipes-devtools/autoconf/autoconf_2.69.bb
+++ b/meta/recipes-devtools/autoconf/autoconf_2.69.bb
@@ -1,6 +1,6 @@
require autoconf.inc
-PR = r10
+PR = r11
PARALLEL_MAKE =
--
1.7.5.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] V2: Perl: update package split and inner dependencies
Because there is a pending perl-tests patch on the maillist, I didn't bump up PR. V2: This version update pacakge split script that make the same name A.pm and A.so files into one package. And update autoconf rdependency. The following changes since commit 90c0eb29f0b41e4ac2d3d17ebad7295c2ebdc02a: rootfs_rpm.bbclass: remove debug code (2012-12-19 21:43:55 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib kangkai/perl-depends http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/perl-depends Kang Kai (3): autoconf: update RDEDENDS perl: update RPROVIDES and popuate_package script perl: update dependency creating script meta/recipes-devtools/autoconf/autoconf.inc|1 - meta/recipes-devtools/autoconf/autoconf_2.69.bb|2 +- .../recipes-devtools/perl/perl-rdepends_5.14.2.inc | 2336 +++- meta/recipes-devtools/perl/perl_5.14.2.bb |9 +- 4 files changed, 2293 insertions(+), 55 deletions(-) -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] perl: update RPROVIDES and popuate_package script
File warnings/register.pm has been moved to package perl, update
RPROVIDES_perl to provides perl-module-warnings-register for backward
compatibility.
Update populate_package script for:
1 Way to deal directory 'Module/' is not right, it creates packages
whose names end with '-pm'. Update to drop these packages.
2 Deal directory 'auto/' to put same name module file(.pm) and library
file(.so) into one package. That because .pm file requires the same
name .so file at runtime.
[Part of Yocto 3338]
Signed-off-by: Kang Kai kai.k...@windriver.com
---
meta/recipes-devtools/perl/perl_5.14.2.bb |9 +
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb
b/meta/recipes-devtools/perl/perl_5.14.2.bb
index 4dac5ce..76006a0 100644
--- a/meta/recipes-devtools/perl/perl_5.14.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.14.2.bb
@@ -250,7 +250,8 @@ FILES_${PN} = ${bindir}/perl ${bindir}/perl${PV} \
${libdir}/perl/${PV}/warnings \
${libdir}/perl/${PV}/vars.pm \
-RPROVIDES_${PN} += perl-module-strict perl-module-vars perl-module-config
perl-module-warnings
+RPROVIDES_${PN} += perl-module-strict perl-module-vars perl-module-config
perl-module-warnings \
+perl-module-warnings-register
FILES_${PN}-dev = ${libdir}/perl/${PV}/CORE
FILES_${PN}-lib = ${libdir}/libperl.so* \
${libdir}/perl5 \
@@ -304,9 +305,9 @@ PACKAGES_append = perl-modules
python populate_packages_prepend () {
libdir = d.expand('${libdir}/perl/${PV}')
-do_split_packages(d, libdir, 'auto/(Encode/.[^/]*)/.*', 'perl-module-%s',
'perl module %s', recursive=True, allow_dirs=False, match_path=True,
prepend=False)
-do_split_packages(d, libdir, 'auto/([^/]*)/.*', 'perl-module-%s', 'perl
module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)
-do_split_packages(d, libdir, 'Module/([^\/]*).*', 'perl-module-%s', 'perl
module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)
+do_split_packages(d, libdir, 'auto/(.*)/[^/]*\.(so|ld|ix|al)',
'perl-module-%s', 'perl module %s', recursive=True, match_path=True,
prepend=False)
+do_split_packages(d, libdir, 'Module/([^\/]*)\.pm', 'perl-module-%s',
'perl module %s', recursive=True, allow_dirs=False, match_path=True,
prepend=False)
+do_split_packages(d, libdir, 'Module/([^\/]*)/.*', 'perl-module-%s', 'perl
module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)
do_split_packages(d, libdir,
'(^(?!(CPAN\/|CPANPLUS\/|Module\/|unicore\/|auto\/)[^\/]).*)\.(pm|pl|e2x)',
'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False,
match_path=True, prepend=False)
d.setVar(RRECOMMENDS_${PN}-modules, d.getVar('PACKAGES',
True).replace('${PN}-modules ', '').replace('${PN}-dbg ',
'').replace('${PN}-misc ', '').replace('${PN}-dev ', '').replace('${PN}-pod ',
'').replace('${PN}-doc ', ''))
}
--
1.7.5.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
