[OE-core] [oe-core][PATCH] nfs-utils: fix the --with-statdpath= flag

2014-06-19 Thread Yao Xinpan
if --with-statdpath= is not the default value, will happen the following 
questions:
'Failed to open directory sm: No such file or directory'.

Submitted to nfs-utils mailing list here:


http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commitdiff;h=3b1457d219ceb1058d44bacc657581f13437ae40#patch1

This has been accepted into upstream nfs-utils so it will not be needed
for future versions.

Signed-off-by: Yao Xinpan 
---
 .../0001-statd-fixed-the-with-statdpath-flag.patch | 40 ++
 .../nfs-utils/nfs-utils_1.3.0.bb   |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 
meta/recipes-connectivity/nfs-utils/nfs-utils/0001-statd-fixed-the-with-statdpath-flag.patch

diff --git 
a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-statd-fixed-the-with-statdpath-flag.patch
 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-statd-fixed-the-with-statdpath-flag.patch
new file mode 100644
index 000..59a0935
--- /dev/null
+++ 
b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-statd-fixed-the-with-statdpath-flag.patch
@@ -0,0 +1,40 @@
+From 3b1457d219ceb1058d44bacc657581f13437ae40 Mon Sep 17 00:00:00 2001
+From: Steve Dickson 
+Date: Tue, 17 Jun 2014 13:28:53 -0400
+Subject: [PATCH] statd: fixed the --with-statdpath= flag
+
+Create the given path set with --with-statdpath
+
+Signed-off-by: chendt.f...@cn.fujitsu.com
+Reported-by: ya...@cn.fujitsu.com
+Signed-off-by: Steve Dickson 
+---
+ Makefile.am | 10 +-
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index ae7cd16..5824adc 100644
+--- a/Makefile.am
 b/Makefile.am
+@@ -54,13 +54,13 @@ install-data-hook:
+   touch $(DESTDIR)$(statedir)/xtab; chmod 644 $(DESTDIR)$(statedir)/xtab
+   touch $(DESTDIR)$(statedir)/etab; chmod 644 $(DESTDIR)$(statedir)/etab
+   touch $(DESTDIR)$(statedir)/rmtab; chmod 644 $(DESTDIR)$(statedir)/rmtab
+-  mkdir -p $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak
+-  touch $(DESTDIR)$(statedir)/state
+-  chmod go-rwx $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak 
$(DESTDIR)$(statedir)/state
+-  -chown $(statduser) $(DESTDIR)$(statedir)/sm 
$(DESTDIR)$(statedir)/sm.bak $(DESTDIR)$(statedir)/state
++  mkdir -p $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak
++  touch $(DESTDIR)$(statdpath)/state
++  chmod go-rwx $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak 
$(DESTDIR)$(statdpath)/state
++  -chown $(statduser) $(DESTDIR)$(statdpath)/sm 
$(DESTDIR)$(statdpath)/sm.bak $(DESTDIR)$(statdpath)/state
+ 
+ uninstall-hook:
+   rm $(DESTDIR)$(statedir)/xtab
+   rm $(DESTDIR)$(statedir)/etab
+   rm $(DESTDIR)$(statedir)/rmtab
+-  rm $(DESTDIR)$(statedir)/state
++  rm $(DESTDIR)$(statdpath)/state
+-- 
+1.8.4.2
+
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb 
b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb
index 8575647..c813d7f 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb
@@ -30,6 +30,7 @@ SRC_URI = 
"${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
file://nfs-mountd.service \
file://nfs-statd.service \
file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \
+   file://0001-statd-fixed-the-with-statdpath-flag.patch \
 "
 
 SRC_URI[md5sum] = "6e93a7997ca3a1eac56bf219adab72a8"
-- 
1.8.4.2

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH] syslinux: fix isohybird overflows on 32 bit system

2014-06-19 Thread Kai Kang
When call isohybrid with option '-u', it overflows on a 32 bits host. It
seeks to 512 bytes before the end of the image to install gpt header. If
the size of image is larger than LONG_MAX, it overflows fseek() and
cause error:

isohybrid: wrlinux-image-x86-64-20140505110100.iso: seek error - 8: Invalid 
argument

Replace fseek with fseeko to fix this issue.

Signed-off-by: Kai Kang 
---
 .../isohybrid-fix-overflow-on-32-bit-system.patch  | 40 ++
 meta/recipes-devtools/syslinux/syslinux_6.01.bb|  4 ++-
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 
meta/recipes-devtools/syslinux/files/isohybrid-fix-overflow-on-32-bit-system.patch

diff --git 
a/meta/recipes-devtools/syslinux/files/isohybrid-fix-overflow-on-32-bit-system.patch
 
b/meta/recipes-devtools/syslinux/files/isohybrid-fix-overflow-on-32-bit-system.patch
new file mode 100644
index 000..09a6945
--- /dev/null
+++ 
b/meta/recipes-devtools/syslinux/files/isohybrid-fix-overflow-on-32-bit-system.patch
@@ -0,0 +1,40 @@
+Upstream-Status: Backport
+
+Signed-off-by: Kai Kang 
+
+From bc360f8dbdf27bff07bb5db8d0ea9a7b10d8e3d1 Mon Sep 17 00:00:00 2001
+From: Kai Kang 
+Date: Fri, 20 Jun 2014 11:32:11 +0800
+Subject: [PATCH 1/2] isohybrid: fix overflow on 32 bit system
+
+When call isohybrid with option '-u', it overflows on a 32 bits host. It
+seeks to 512 bytes before the end of the image to install gpt header. If
+the size of image is larger than LONG_MAX, it overflows fseek() and
+cause error:
+
+isohybrid: image-x86-64-20140505110100.iso: seek error - 8: Invalid argument
+
+Replace fseek with fseeko to fix this issue.
+
+Signed-off-by: Kai Kang 
+Signed-off-by: H. Peter Anvin 
+---
+ utils/isohybrid.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/isohybrid.c b/utils/isohybrid.c
+index 410bb60..23fc6c0 100644
+--- a/utils/isohybrid.c
 b/utils/isohybrid.c
+@@ -1126,7 +1126,7 @@ main(int argc, char *argv[])
+* end of the image
+*/
+ 
+-  if (fseek(fp, (isostat.st_size + padding) - orig_gpt_size - 512,
++  if (fseeko(fp, (isostat.st_size + padding) - orig_gpt_size - 512,
+ SEEK_SET))
+   err(1, "%s: seek error - 8", argv[0]);
+ 
+-- 
+1.9.1
+
diff --git a/meta/recipes-devtools/syslinux/syslinux_6.01.bb 
b/meta/recipes-devtools/syslinux/syslinux_6.01.bb
index 89204b0..e8a1fd4 100644
--- a/meta/recipes-devtools/syslinux/syslinux_6.01.bb
+++ b/meta/recipes-devtools/syslinux/syslinux_6.01.bb
@@ -13,7 +13,9 @@ SRC_URI = 
"${KERNELORG_MIRROR}/linux/utils/boot/syslinux/6.xx/syslinux-${PV}.tar
file://0002-memscan-build-a-linked-list-of-memory-scanners.patch \
file://0003-PXELINUX-Add-bios-memscan-function.patch \

file://0004-pxe-use-bios_fbm-and-real_base_mem-to-calculate-free.patch \
-   file://syslinux-fix-parallel-building-issue.patch"
+   file://syslinux-fix-parallel-building-issue.patch \
+   file://isohybrid-fix-overflow-on-32-bit-system.patch \
+   "
 
 SRC_URI[md5sum] = "6945ee89e29119d459baed4937bbc534"
 SRC_URI[sha256sum] = 
"83a04cf81e6a46b80ee5a321926eea095af3498b04317e3674b46c125c7a5b43"
-- 
1.9.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] eglib is dead?

2014-06-19 Thread Mark Hatle

On 6/19/14, 7:35 PM, Yi Qingliang wrote:

Hello,

this morning I have seen that:
http://www.phoronix.com/scan.php?page=news_item&px=MTcyNDY

it said that the "eglibc" is a "dead project", and most feature had
been merged into "glibc" at version 2.19.

so maybe we should drop "eglibc", and switch back to "glibc"?


eglibc and glibc have been in sync since the beginning.  The only remaining 
difference between glibc and eglibc is the configurable libc interface. 
(Ability to change the configuration.)  Last time we discussed this, we were 
still trying to determine if we (OE) were going to try to keep that 
configuration active, or if were were going to go to a different libc for 'tiny' 
systems.


I don't believe a final decision has been made, but one way or another we will 
be moving to 'glibc' in the future.


My understanding is that eglibc 2.19 is still 'alive' and maintained, but will 
be the last version.


--Mark


Yi Qingliang
20140620



--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] eglib is dead?

2014-06-19 Thread Yi Qingliang
Hello,

this morning I have seen that:
http://www.phoronix.com/scan.php?page=news_item&px=MTcyNDY

it said that the "eglibc" is a "dead project", and most feature had 
been merged into "glibc" at version 2.19.

so maybe we should drop "eglibc", and switch back to "glibc"?

Yi Qingliang
20140620
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 2/2] udev-cache.default: set PROBE_PLATFORM_BUS to "yes" by default

2014-06-19 Thread Denys Dmytriyenko
From: Denys Dmytriyenko 

Force probing of "platform" bus by default.

Signed-off-by: Denys Dmytriyenko 
---
 meta/recipes-core/udev/udev/udev-cache.default | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-core/udev/udev/udev-cache.default 
b/meta/recipes-core/udev/udev/udev-cache.default
index 5c4937a..2093336 100644
--- a/meta/recipes-core/udev/udev/udev-cache.default
+++ b/meta/recipes-core/udev/udev/udev-cache.default
@@ -2,3 +2,4 @@
 
 # Comment this out to disable device cache
 DEVCACHE="/etc/dev.tar"
+PROBE_PLATFORM_BUS="yes"
-- 
2.0.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 1/2] udev: update init script for conditional probing of platform bus

2014-06-19 Thread Denys Dmytriyenko
From: Denys Dmytriyenko 

Make probing of "platform" bus conditional based on PROBE_PLATFORM_BUS
variable from /etc/default/udev-cache on subsequent boots when udev
cache is used. PROBE_PLATFORM_BUS has to be set to "yes" in order to
force probing on every boot, otherwise it uses the old default behaviour
of probing it just the first time.

This is helpful on modern SoCs where most of the low level peripheral
drivers are registered on the platform bus and need to be probed to load
the necessary modules and enable the connected buses and subsystems.

Signed-off-by: Denys Dmytriyenko 
---
 meta/recipes-core/udev/udev/init | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/udev/udev/init b/meta/recipes-core/udev/udev/init
index 410a650..f2c84d5 100644
--- a/meta/recipes-core/udev/udev/init
+++ b/meta/recipes-core/udev/udev/init
@@ -102,7 +102,12 @@ case "$1" in
 
 udevadm control --env=STARTUP=1
 if [ "$not_first_boot" != "" ];then
-udevadm trigger --action=add --subsystem-nomatch=tty 
--subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole 
--subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus  
--subsystem-nomatch=graphics   --subsystem-nomatch=backlight 
--subsystem-nomatch=video4linux  --subsystem-nomatch=platform
+if [ "$PROBE_PLATFORM_BUS" != "yes" ]; then
+PLATFORM_BUS_NOMATCH="--subsystem-nomatch=platform"
+else
+PLATFORM_BUS_NOMATCH=""
+fi
+udevadm trigger --action=add --subsystem-nomatch=tty 
--subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole 
--subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus 
--subsystem-nomatch=graphics --subsystem-nomatch=backlight 
--subsystem-nomatch=video4linux $PLATFORM_BUS_NOMATCH
 (udevadm settle --timeout=3; udevadm control --env=STARTUP=)&
 else
 udevadm trigger --action=add
-- 
2.0.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH v2] cmake: respect ${S} and ${B} patch problem

2014-06-19 Thread Miroslav Keš
> The cmake.bbclass currently generates the cmake command using the ${S}
> variable as the path where the top most CMakeLists.txt should be found.
> This works OK as along as the CMakeLists.txt is in the top level
> directory of the package source tree.
> But CMake doesn't require the directory tree to be structured that way.
> If the top level CMakeLists.txt is in a subdirectory of the package
> source tree AND the recipe needs to patch a file which is at a higher
> level the OE build is broken.
>
> I would propose to return the OECMAKE_SOURCEPATH variable to the
> cmake.bbclass, pass it to the cmake command as the "path to the CMake
> file", and set its default value to ${S}


On 06/17/14 22:36, Saul Wold wrote:
>
> Can you send this as a proper v2 patch please.
> Thanks
> Sau!

I'm doing it first time in my life. Hoping I understood the instructions 
correctly.

Mira

Signed-off-by: Miroslav Kes 
---
 meta/classes/cmake.bbclass | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index c9c15f3..f762792 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -23,6 +23,9 @@ OECMAKE_RPATH ?= ""
 OECMAKE_PERLNATIVE_DIR ??= ""
 OECMAKE_EXTRA_ROOT_PATH ?= ""
 
+# Path to the CMake file to process.
+OECMAKE_SOURCEPATH ?= "${S}"
+
 cmake_do_generate_toolchain_file() {
 cat > ${WORKDIR}/toolchain.cmake 

Re: [OE-core] [oe] Few archives to add on sources.oe.org

2014-06-19 Thread Paul Eggleton
Thanks!

On Thursday 19 June 2014 10:08:58 Tom King wrote:
> Yes,
> 
> its in there too.
> 
> Tom
> 
> 
> On Thu, Jun 19, 2014 at 9:59 AM, Paul Eggleton <
> 
> paul.eggle...@linux.intel.com> wrote:
> > Hi Tom,
> > 
> > Did cherokee also get added as requested earlier? (Sorry for the noise if
> > it
> > did, I just didn't see a reply.)
> > 
> > Cheers,
> > Paul
> > 
> > On Thursday 19 June 2014 09:09:33 Tom King wrote:
> > > Done
> > > 
> > > 
> > > On Thu, Jun 19, 2014 at 4:34 AM, Martin Jansa 
> > > 
> > > wrote:
> > > > Hi Tom,
> > > > 
> > > > can you please add:
> > > > IO-Tty-1.10.tar.gz
> > > > SQLAlchemy-0.7.9.tar.gz
> > > > fetchmail-6.3.26.tar.xz
> > > > usb-modeswitch-2.0.1.tar.bz2
> > > > usb-modeswitch-data-20130807.tar.bz2
> > > > 
> > > > to sources.oe.org? I can send you tarballs (or fetch them from
> > > > /home/jenkins/oe/shr-core-branches/downloads-missing/ on aruba)
> > > > 
> > > > The most annoying is fetchmail which is now fetching HTML page from
> > > > berlios (so checksum check fails instead of showing 404) :/. And user
> > > > needs to download it manually or use sources.oe.org as PREMIRROR, but
> > > > still better than nothing.
> > 
> > --
> > 
> > Paul Eggleton
> > Intel Open Source Technology Centre

-- 

Paul Eggleton
Intel Open Source Technology Centre
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [oe] Few archives to add on sources.oe.org

2014-06-19 Thread Tom King
Yes,

its in there too.

Tom


On Thu, Jun 19, 2014 at 9:59 AM, Paul Eggleton <
paul.eggle...@linux.intel.com> wrote:

> Hi Tom,
>
> Did cherokee also get added as requested earlier? (Sorry for the noise if
> it
> did, I just didn't see a reply.)
>
> Cheers,
> Paul
>
> On Thursday 19 June 2014 09:09:33 Tom King wrote:
> > Done
> >
> >
> > On Thu, Jun 19, 2014 at 4:34 AM, Martin Jansa 
> >
> > wrote:
> > > Hi Tom,
> > >
> > > can you please add:
> > > IO-Tty-1.10.tar.gz
> > > SQLAlchemy-0.7.9.tar.gz
> > > fetchmail-6.3.26.tar.xz
> > > usb-modeswitch-2.0.1.tar.bz2
> > > usb-modeswitch-data-20130807.tar.bz2
> > >
> > > to sources.oe.org? I can send you tarballs (or fetch them from
> > > /home/jenkins/oe/shr-core-branches/downloads-missing/ on aruba)
> > >
> > > The most annoying is fetchmail which is now fetching HTML page from
> > > berlios (so checksum check fails instead of showing 404) :/. And user
> > > needs to download it manually or use sources.oe.org as PREMIRROR, but
> > > still better than nothing.
>
> --
>
> Paul Eggleton
> Intel Open Source Technology Centre
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] usbinit, weston-init, run-postinsts, qt-demo-init: Drop allarch

2014-06-19 Thread Paul Eggleton
On Thursday 19 June 2014 18:39:22 Martin Jansa wrote:
> On Thu, Jun 19, 2014 at 02:54:59PM +0100, Paul Eggleton wrote:
> > Hi Martin,
> > 
> > On Thursday 19 June 2014 13:23:42 Martin Jansa wrote:
> > > * update-rc.d.bbclass now adds dependency on TUNE_PKGARCH initscripts,
> > > so
> > > these cannot be allarch
> > 
> > As I've said before, I really dislike this change. The system should be
> > made to handle the situation properly instead of working around the
> > issue.
>
> This one is new :) (I think) I had clean state (with my unmerged
> changes) with dylan (now I'm testing dora, daisy, master as well), these
> are "new" as the initscripts dependency was added recently.

I'm aware that it's a new instance, but of the same situation.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [oe] Few archives to add on sources.oe.org

2014-06-19 Thread Paul Eggleton
Hi Tom,

Did cherokee also get added as requested earlier? (Sorry for the noise if it 
did, I just didn't see a reply.)

Cheers,
Paul

On Thursday 19 June 2014 09:09:33 Tom King wrote:
> Done
> 
> 
> On Thu, Jun 19, 2014 at 4:34 AM, Martin Jansa 
> 
> wrote:
> > Hi Tom,
> > 
> > can you please add:
> > IO-Tty-1.10.tar.gz
> > SQLAlchemy-0.7.9.tar.gz
> > fetchmail-6.3.26.tar.xz
> > usb-modeswitch-2.0.1.tar.bz2
> > usb-modeswitch-data-20130807.tar.bz2
> > 
> > to sources.oe.org? I can send you tarballs (or fetch them from
> > /home/jenkins/oe/shr-core-branches/downloads-missing/ on aruba)
> > 
> > The most annoying is fetchmail which is now fetching HTML page from
> > berlios (so checksum check fails instead of showing 404) :/. And user
> > needs to download it manually or use sources.oe.org as PREMIRROR, but
> > still better than nothing.

-- 

Paul Eggleton
Intel Open Source Technology Centre
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] usbinit, weston-init, run-postinsts, qt-demo-init: Drop allarch

2014-06-19 Thread Martin Jansa
On Thu, Jun 19, 2014 at 02:54:59PM +0100, Paul Eggleton wrote:
> Hi Martin,
> 
> On Thursday 19 June 2014 13:23:42 Martin Jansa wrote:
> > * update-rc.d.bbclass now adds dependency on TUNE_PKGARCH initscripts, so
> > these cannot be allarch
> 
> As I've said before, I really dislike this change. The system should be made 
> to handle the situation properly instead of working around the issue.

This one is new :) (I think) I had clean state (with my unmerged
changes) with dylan (now I'm testing dora, daisy, master as well), these
are "new" as the initscripts dependency was added recently.

-- 
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com


signature.asc
Description: Digital signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] Few archives to add on sources.oe.org

2014-06-19 Thread Tom King
Done


On Thu, Jun 19, 2014 at 4:34 AM, Martin Jansa 
wrote:

> Hi Tom,
>
> can you please add:
> IO-Tty-1.10.tar.gz
> SQLAlchemy-0.7.9.tar.gz
> fetchmail-6.3.26.tar.xz
> usb-modeswitch-2.0.1.tar.bz2
> usb-modeswitch-data-20130807.tar.bz2
>
> to sources.oe.org? I can send you tarballs (or fetch them from
> /home/jenkins/oe/shr-core-branches/downloads-missing/ on aruba)
>
> The most annoying is fetchmail which is now fetching HTML page from
> berlios (so checksum check fails instead of showing 404) :/. And user
> needs to download it manually or use sources.oe.org as PREMIRROR, but
> still better than nothing.
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] usbinit, weston-init, run-postinsts, qt-demo-init: Drop allarch

2014-06-19 Thread Paul Eggleton
Hi Martin,

On Thursday 19 June 2014 13:23:42 Martin Jansa wrote:
> * update-rc.d.bbclass now adds dependency on TUNE_PKGARCH initscripts, so
> these cannot be allarch

As I've said before, I really dislike this change. The system should be made 
to handle the situation properly instead of working around the issue.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] perl: strip RPATH from libxml-parser-perl Expat.so

2014-06-19 Thread Koen Kooi

Op 19 jun. 2014, om 00:48 heeft Paul Gortmaker  
het volgende geschreven:

> To fix:
> 
> ERROR: QA Issue: package libxml-parser-perl contains bad RPATH 
> /home/paul/poky/build/tmp/sysroots/intel-corei7-64/usr/lib64 in file 
> /home/paul/poky/build/tmp/work/corei7-64-poky-linux/libxml-parser-perl/2.41-r3/packages-split/libxml-parser-perl/usr/lib64/perl/vendor_perl/5.14.3/auto/XML/Parser/Expat/Expat.so
> ERROR: QA run found fatal errors. Please consider fixing them.
> ERROR: Function failed: do_package_qa
> ERROR: Logfile of failure stored in: 
> /home/paul/poky/build/tmp/work/corei7-64-poky-linux/libxml-parser-perl/2.41-r3/temp/log.do_package.28544
> ERROR: Task 4102 
> (/home/paul/poky/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb, 
> do_package) failed with exit code '1'
> 
> ...which showed up when enabling a multilib build.
> 
> Signed-off-by: Paul Gortmaker 
> 
> diff --git a/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb 
> b/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb
> index 43a8a84518d3..2488aacb682c 100644
> --- a/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb
> +++ b/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb
> @@ -27,6 +27,7 @@ do_configure_append() {
> do_compile() {
>   export LIBC="$(find ${STAGING_DIR_TARGET}/${base_libdir}/ -name 
> 'libc-*.so')"
>   cpan_do_compile
> + chrpath -d ${S}/blib/arch/auto/XML/Parser/Expat/Expat.so

That only works for x86 builds.
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] Few archives to add on sources.oe.org

2014-06-19 Thread Martin Jansa
Hi Tom,

can you please add:
IO-Tty-1.10.tar.gz
SQLAlchemy-0.7.9.tar.gz
fetchmail-6.3.26.tar.xz
usb-modeswitch-2.0.1.tar.bz2
usb-modeswitch-data-20130807.tar.bz2

to sources.oe.org? I can send you tarballs (or fetch them from
/home/jenkins/oe/shr-core-branches/downloads-missing/ on aruba)

The most annoying is fetchmail which is now fetching HTML page from
berlios (so checksum check fails instead of showing 404) :/. And user
needs to download it manually or use sources.oe.org as PREMIRROR, but
still better than nothing.


signature.asc
Description: Digital signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH] usbinit, weston-init, run-postinsts, qt-demo-init: Drop allarch

2014-06-19 Thread Martin Jansa
* update-rc.d.bbclass now adds dependency on TUNE_PKGARCH initscripts, so these 
cannot be allarch

Signed-off-by: Martin Jansa 
---
 meta/recipes-bsp/usbinit/usbinit.bb  | 2 +-
 meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb | 2 +-
 meta/recipes-graphics/wayland/weston-init.bb | 2 +-
 meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-bsp/usbinit/usbinit.bb 
b/meta/recipes-bsp/usbinit/usbinit.bb
index aba44b4..bc36824 100644
--- a/meta/recipes-bsp/usbinit/usbinit.bb
+++ b/meta/recipes-bsp/usbinit/usbinit.bb
@@ -15,7 +15,7 @@ do_install() {
 install usb-gether ${D}${sysconfdir}/init.d
 }
 
-inherit update-rc.d allarch
+inherit update-rc.d
 
 INITSCRIPT_NAME = "usb-gether"
 INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
diff --git a/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb 
b/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb
index 64f85c2..4eec578 100644
--- a/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb
+++ b/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb
@@ -9,7 +9,7 @@ SRC_URI = "file://run-postinsts \
file://run-postinsts.init \
file://run-postinsts.service"
 
-inherit allarch systemd update-rc.d
+inherit systemd update-rc.d
 
 INITSCRIPT_NAME = "run-postinsts"
 INITSCRIPT_PARAMS = "start 99 S ."
diff --git a/meta/recipes-graphics/wayland/weston-init.bb 
b/meta/recipes-graphics/wayland/weston-init.bb
index 38b78bc..ae306c9 100644
--- a/meta/recipes-graphics/wayland/weston-init.bb
+++ b/meta/recipes-graphics/wayland/weston-init.bb
@@ -11,7 +11,7 @@ do_install() {
install -m755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston
 }
 
-inherit allarch update-rc.d
+inherit update-rc.d
 
 RDEPENDS_${PN} = "weston kbd"
 
diff --git a/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb 
b/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
index fff3620..a2f51d4 100644
--- a/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
+++ b/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
@@ -11,7 +11,7 @@ do_install() {
install -m 0755 ${WORKDIR}/qtdemo-init ${D}${sysconfdir}/init.d/qtdemo
 }
 
-inherit update-rc.d allarch
+inherit update-rc.d
 
 INITSCRIPT_NAME = "qtdemo"
 INITSCRIPT_PARAMS = "start 99 5 2 . stop 19 0 1 6 ."
-- 
2.0.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [DO-NOT-MERGE][RFC][PATCH] DO-NOT-MERGE: distutils3.bbclass: Don't use MACHINE variable

2014-06-19 Thread Martin Jansa
The original patch says this about MACHINE variables:

Use MACHINE for sysroot when not building for build host

Python's machinery replaces directories in sysroot path to match OE's
staging area sysroots. Earlier we use to have HOST_SYS represent sysroot
always but now we use MACHINE to represent target sysroots but HOST_SYS
to represent host sysroot. This patch caters to that difference

But I think we need to find some different solution, because right now the only
user of distutils3 bbclass python3-distribute becames effectivelly MACHINE_ARCH
because of this. Detected with sstate-diff-machines.sh script:

 == Comparing signatures for python3-distribute.do_populate_sysroot.sigdata 
between qemux86 and qemux86copy ==
  Hash for dependent task python3-distribute_0.6.32.bb.do_install changed from 
ef2f64ea6aecf1f9c2c6a0f201c52f67 to 7afd17fd366b28cf4a0353c7dd5e1c5b

  $ bitbake-diffsigs 
sstate-diff/1403174194/qemux86*/i586*/python3-distribute*/*do_install*
basehash changed from 5311d29c25ff324645de9c17cdefe083 to 
2f079b81b13427faddeb040e7a115965
Variable MACHINE value changed from 'qemux86copy' to 'qemux86'
Hash for dependent task python3-distribute_0.6.32.bb.do_compile changed 
from 4fcb29eb2a0df7bef2f9806a0d9cdd92 to e7df3cdd7b82733d69c87f1822b7177b

  $ bitbake-diffsigs 
sstate-diff/1403174194/qemux86*/i586*/python3-distribute*/*do_compile*
basehash changed from 870a9e01c2c4eb73dd57451eeb2a7f0c to 
c061ae11d7f16d74d49f667243a21be0
Variable MACHINE value changed from 'qemux86copy' to 'qemux86'

Signed-off-by: Martin Jansa 
---
 meta/classes/distutils3.bbclass | 28 
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/meta/classes/distutils3.bbclass b/meta/classes/distutils3.bbclass
index bbd645c..8cf29d5 100644
--- a/meta/classes/distutils3.bbclass
+++ b/meta/classes/distutils3.bbclass
@@ -9,14 +9,9 @@ DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \
 --install-data=${D}/${datadir}"
 
 distutils3_do_compile() {
-if [ ${BUILD_SYS} != ${HOST_SYS} ]; then
-SYS=${MACHINE}
-else
-SYS=${HOST_SYS}
-fi
 STAGING_INCDIR=${STAGING_INCDIR} \
 STAGING_LIBDIR=${STAGING_LIBDIR} \
-BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \
+BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \
 build ${DISTUTILS_BUILD_ARGS} || \
 bbfatal "${PYTHON_PN} setup.py build_ext execution failed."
@@ -24,42 +19,27 @@ distutils3_do_compile() {
 
 distutils3_stage_headers() {
 install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
-if [ ${BUILD_SYS} != ${HOST_SYS} ]; then
-SYS=${MACHINE}
-else
-SYS=${HOST_SYS}
-fi
-BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \
+BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py 
install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
 bbfatal "${PYTHON_PN} setup.py install_headers execution failed."
 }
 
 distutils3_stage_all() {
-if [ ${BUILD_SYS} != ${HOST_SYS} ]; then
-SYS=${MACHINE}
-else
-SYS=${HOST_SYS}
-fi
 STAGING_INCDIR=${STAGING_INCDIR} \
 STAGING_LIBDIR=${STAGING_LIBDIR} \
 install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
 PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \
-BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \
+BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py 
install ${DISTUTILS_STAGE_ALL_ARGS} || \
 bbfatal "${PYTHON_PN} setup.py install (stage) execution failed."
 }
 
 distutils3_do_install() {
 install -d ${D}${PYTHON_SITEPACKAGES_DIR}
-if [ ${BUILD_SYS} != ${HOST_SYS} ]; then
-SYS=${MACHINE}
-else
-SYS=${HOST_SYS}
-fi
 STAGING_INCDIR=${STAGING_INCDIR} \
 STAGING_LIBDIR=${STAGING_LIBDIR} \
 PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \
-BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \
+BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
 ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py 
install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS} 
|| \
 bbfatal "${PYTHON_PN} setup.py install execution failed."
 
-- 
2.0.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 1/3] syslinux.bbclass: Ensure MLPREFIX is applied to depends flag

2014-06-19 Thread Ming Liu
Add MLPREFIX to depends flag to ensure the correct syslinux is
dependended upon.

Signed-off-by: Ming Liu 
---
 meta/classes/syslinux.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass
index 8964d3f..b9701bf 100644
--- a/meta/classes/syslinux.bbclass
+++ b/meta/classes/syslinux.bbclass
@@ -17,7 +17,7 @@
 # ${SYSLINUX_SERIAL_TTY} - Set alternate console=tty... kernel boot argument
 # ${SYSLINUX_KERNEL_ARGS} - Add additional kernel arguments
 
-do_bootimg[depends] += "syslinux:do_populate_sysroot \
+do_bootimg[depends] += "${MLPREFIX}syslinux:do_populate_sysroot \
 syslinux-native:do_populate_sysroot"
 
 SYSLINUXCFG  = "${S}/syslinux.cfg"
-- 
1.8.4.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 3/3] gummiboot.bbclass: Ensure MLPREFIX is applied to depends flag

2014-06-19 Thread Ming Liu
Add MLPREFIX to depends flag to ensure the correct gummiboot is
dependended upon.

Signed-off-by: Ming Liu 
---
 meta/classes/gummiboot.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/gummiboot.bbclass b/meta/classes/gummiboot.bbclass
index 0214652..dae1977 100644
--- a/meta/classes/gummiboot.bbclass
+++ b/meta/classes/gummiboot.bbclass
@@ -6,8 +6,8 @@
 # Set EFI_PROVIDER = "gummiboot" to use gummiboot on your live images instead 
of grub-efi
 # (images built by bootimage.bbclass or boot-directdisk.bbclass)
 
-do_bootimg[depends] += "gummiboot:do_deploy"
-do_bootdirectdisk[depends] += "gummiboot:do_deploy"
+do_bootimg[depends] += "${MLPREFIX}gummiboot:do_deploy"
+do_bootdirectdisk[depends] += "${MLPREFIX}gummiboot:do_deploy"
 
 EFIDIR = "/EFI/BOOT"
 
-- 
1.8.4.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 2/3] grub-efi.bbclass: Ensure MLPREFIX is applied to depends flag

2014-06-19 Thread Ming Liu
Add MLPREFIX to depends flag to ensure the correct grub-efi is
dependended upon.

Signed-off-by: Ming Liu 
---
 meta/classes/grub-efi.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass
index 5c80c17..505d032 100644
--- a/meta/classes/grub-efi.bbclass
+++ b/meta/classes/grub-efi.bbclass
@@ -15,8 +15,8 @@
 # ${GRUB_OPTS} - additional options to add to the config, ';' delimited # 
(optional)
 # ${GRUB_TIMEOUT} - timeout before executing the deault label (optional)
 
-do_bootimg[depends] += "grub-efi:do_deploy"
-do_bootdirectdisk[depends] += "grub-efi:do_deploy"
+do_bootimg[depends] += "${MLPREFIX}grub-efi:do_deploy"
+do_bootdirectdisk[depends] += "${MLPREFIX}grub-efi:do_deploy"
 
 GRUB_SERIAL ?= "console=ttyS0,115200"
 GRUBCFG = "${S}/grub.cfg"
-- 
1.8.4.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH] eglibc (2.19): fix hardcoded /sbin path

2014-06-19 Thread Matthieu Crapet
Apply for ldconfig and sln packages.

Signed-off-by: Matthieu Crapet 
---
 .../eglibc/eglibc-2.19/fix_am_rootsbindir.patch| 32 ++
 meta/recipes-core/eglibc/eglibc-package.inc|  2 +-
 meta/recipes-core/eglibc/eglibc.inc| 13 +
 meta/recipes-core/eglibc/eglibc_2.19.bb|  3 +-
 4 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100644 
meta/recipes-core/eglibc/eglibc-2.19/fix_am_rootsbindir.patch

diff --git a/meta/recipes-core/eglibc/eglibc-2.19/fix_am_rootsbindir.patch 
b/meta/recipes-core/eglibc/eglibc-2.19/fix_am_rootsbindir.patch
new file mode 100644
index 000..ac1e2e8
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.19/fix_am_rootsbindir.patch
@@ -0,0 +1,32 @@
+sysdeps/gnu/configure.ac: handle correctly $libc_cv_rootsbindir
+
+Upstream-Status:Pending
+Signed-off-by: Matthieu Crapet 
+
+diff --git a/libc/sysdeps/gnu/configure b/libc/sysdeps/gnu/configure
+index e7f0e43..687beab 100644
+--- a/libc/sysdeps/gnu/configure
 b/libc/sysdeps/gnu/configure
+@@ -42,6 +42,6 @@ case "$prefix" in
+   else
+ libc_cv_localstatedir=$localstatedir
+fi
+-  libc_cv_rootsbindir=/sbin
++  test -n "$libc_cv_rootsbindir" || libc_cv_rootsbindir=/sbin
+   ;;
+ esac
+diff --git a/libc/sysdeps/gnu/configure.ac b/libc/sysdeps/gnu/configure.ac
+index ce251df..57c1e77 100644
+--- a/libc/sysdeps/gnu/configure.ac
 b/libc/sysdeps/gnu/configure.ac
+@@ -42,6 +42,6 @@ case "$prefix" in
+   else
+ libc_cv_localstatedir=$localstatedir
+fi
+-  libc_cv_rootsbindir=/sbin
++  test -n "$libc_cv_rootsbindir" || libc_cv_rootsbindir=/sbin
+   ;;
+ esac
+-- 
+2.0.0
+
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc 
b/meta/recipes-core/eglibc/eglibc-package.inc
index 6721819..d5d407f 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -39,7 +39,7 @@ FILES_libsegfault = "${base_libdir}/libSegFault*"
 FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*"
 FILES_libmemusage = "${base_libdir}/libmemusage.so"
 FILES_eglibc-extra-nss = "${base_libdir}/libnss_*-*.so 
${base_libdir}/libnss_*.so.*"
-FILES_sln = "/sbin/sln"
+FILES_sln = "${base_sbindir}/sln"
 FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map 
${libdir}/libc_pic/*.o"
 FILES_libsotruss = "${libdir}/audit/sotruss-lib.so"
 FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}"
diff --git a/meta/recipes-core/eglibc/eglibc.inc 
b/meta/recipes-core/eglibc/eglibc.inc
index 3a623bb..68128e9 100644
--- a/meta/recipes-core/eglibc/eglibc.inc
+++ b/meta/recipes-core/eglibc/eglibc.inc
@@ -43,11 +43,14 @@ require eglibc-options.inc
 
 LEAD_SONAME = "libc.so"
 
-CACHED_CONFIGUREVARS += "ac_cv_path_KSH=${base_bindir}/bash \
-   ac_cv_path_BASH_SHELL=${base_bindir}/bash \
-   libc_cv_localedir=${localedir} \
-  libc_cv_ssp=no \
-  "
+CACHED_CONFIGUREVARS += " \
+  ac_cv_path_KSH=${base_bindir}/bash \
+  ac_cv_path_BASH_SHELL=${base_bindir}/bash \
+  libc_cv_slibdir=${base_libdir} \
+  libc_cv_rootsbindir=${base_sbindir} \
+  libc_cv_localedir=${localedir} \
+  libc_cv_ssp=no \
+"
 
 GLIBC_EXTRA_OECONF ?= ""
 GLIBC_EXTRA_OECONF_class-nativesdk = ""
diff --git a/meta/recipes-core/eglibc/eglibc_2.19.bb 
b/meta/recipes-core/eglibc/eglibc_2.19.bb
index 10b4bb1..2d354cb 100644
--- a/meta/recipes-core/eglibc/eglibc_2.19.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.19.bb
@@ -26,6 +26,7 @@ SRC_URI = 
"http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr25
file://fix-tibetian-locales.patch \
file://ppce6500-32b_slow_ieee754_sqrt.patch \
file://grok_gold.patch \
+   file://fix_am_rootsbindir.patch;striplevel=2 \
   "
 SRC_URI[md5sum] = "197836c2ba42fb146e971222647198dd"
 SRC_URI[sha256sum] = 
"baaa030531fc308f7820c46acdf8e1b2f8e3c1f40bcd28b6e440d1c95d170d4c"
@@ -66,8 +67,6 @@ python __anonymous () {
d.getVar('TARGET_OS', True))
 }
 
-export libc_cv_slibdir = "${base_libdir}"
-
 EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
 --without-cvs --disable-profile \
 --disable-debug --without-gd \
-- 
2.0.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 0/1] Don't force volatile directory to be a link if already mounted.

2014-06-19 Thread Kai Kang
The following changes since commit 5b1c329804f9f3fadcc46452390f537052ff7d0e:

  bitbake: bitbake-user-manual-fetching.xml: Grammar, typo, and tweaks. 
(2014-06-18 13:48:39 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib kangkai/volatile
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/volatile

Kai Kang (1):
  initscripts: update populate-volatile.sh

 .../initscripts/initscripts-1.0/populate-volatile.sh   | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

-- 
1.9.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 1/1] initscripts: update populate-volatile.sh

2014-06-19 Thread Kai Kang
If a partition such as /tmp mounted on a volatile directory which create
by script populate-volatile.sh from initscripts, it will show errors.

In /var/log/boot, error message:

Thu Jun 19 05:39:09 2014: bootlogd.
Thu Jun 19 05:39:10 2014: rm: cannot remove '/tmp': Device or resource busy

Check volatile directories and if it is be mounted then don't force make
it as a link.

Signed-off-by: Kai Kang 
---
 .../initscripts/initscripts-1.0/populate-volatile.sh   | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

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 e707b20..904037e 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
@@ -72,10 +72,12 @@ link_file() {
if [ -L \"$2\" ]; then
[ \"\$(readlink -f \"$2\")\" != \"\$(readlink -f \"$1\")\" ] && 
{ rm -f \"$2\"; ln -sf \"$1\" \"$2\"; };
elif [ -d \"$2\" ]; then
-   cp -a $2/* $1 2>/dev/null;
-   cp -a $2/.[!.]* $1 2>/dev/null;
-   rm -rf \"$2\";
-   ln -sf \"$1\" \"$2\";
+   if awk '\$2 == \"$2\" {exit 1}' /proc/mounts; then
+   cp -a $2/* $1 2>/dev/null;
+   cp -a $2/.[!.]* $1 2>/dev/null;
+   rm -rf \"$2\";
+   ln -sf \"$1\" \"$2\";
+   fi
else
ln -sf \"$1\" \"$2\";
fi
-- 
1.9.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core