Re: [OE-core] [PATCH] var/volatile: Mount it if doing ro-rfs
On Mar 11, 2015, at 7:53 AM, Khem Raj raj.k...@gmail.com wrote: On Wednesday, March 11, 2015, Richard Purdie richard.pur...@linuxfoundation.org mailto:richard.pur...@linuxfoundation.org wrote: On Wed, 2015-03-11 at 08:33 +, Khem Raj wrote: - Do not mount /var/volatile to be tmpfs always only when generating readonly rootfs - Generate var-volatile.mount unit when using system in readonly-rootfs to mount /var/volatile as tmpfs - for sysvinit, mount /var/volatile to be tmpfs if its not already mounted so - Use RequiresMountsFor instead of After=, so systemd figures out the needed dependencies for making /var/volatile accessible for journald and not us. Change-Id: I0b176b3e1c1e88e84d2c93154aac04cef565d8ea Signed-off-by: Khem Raj raj.k...@gmail.com javascript:; --- meta/classes/image.bbclass | 1 + meta/recipes-core/base-files/base-files/fstab | 1 - meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh | 2 +- meta/recipes-core/systemd/systemd/journald-volatile.conf | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) Which combinations has this been tested with? Given the time the patch has existed for, I'm sceptical all the combinations we need have been tested, I'd love to be wrong. This is a pretty major change of behaviour and given the problems previous changes have caused, I'm very very very nervous about what issues this is going to cause :(. Systemd in both ways but not sysvinit Just when you think all is well, I just sent a V2, that seemed to work on x86 emulator, but due diligence is better I don’t have sysvinit setups, its fine if it doesn’t go in, the fact that patch is out there folks can always back port after release. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] how many ways to delete/de-activate a recipe's task?
i recall that richard purdie might have explained this once but i have no idea where that post is and i need to add something to it, anyway ... how many ways are there to delete a task from a recipe, and what are the differences? so far, i've seen: 1) bitbake supports a deltask directive 2) you can use the [noexec] task flag 3) i've also seen redefining the task with a no-op : command so what are the differences, and when would someone use one over the others? thanks. rday -- Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] var/volatile: Mount it if doing ro-rfs
On 11 March 2015 at 18:07, Khem Raj raj.k...@gmail.com wrote: + grep -q tmpfs /var/volatile /proc/mounts || mount -t tmpfs -o strictatime tmpfs /var/volatile What is someone uses tmpfs[tab]/var/volatile? This should match on arbitrary whitespace. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] var/volatile: Mount it if doing ro-rfs
On Mar 11, 2015 2:02 PM, Burton, Ross ross.bur...@intel.com wrote: On 11 March 2015 at 18:07, Khem Raj raj.k...@gmail.com wrote: + grep -q tmpfs /var/volatile /proc/mounts || mount -t tmpfs -o strictatime tmpfs /var/volatile What is someone uses tmpfs[tab]/var/volatile? This should match on arbitrary whitespace. Yes. But my commit does not make it worse than it already is. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] lib/oeqa/runtime/systemd: Add a basic runtime test for the journal
The test_systemd_journal() test will fail if journalctl exits with a non-zero exit status. The exit status is non-zero even if there are no journal files, which is what drove the creation of this test. [Yocto #7388] Signed-off-by: Randy Witt randy.e.w...@linux.intel.com --- meta/lib/oeqa/runtime/systemd.py | 6 ++ 1 file changed, 6 insertions(+) diff --git a/meta/lib/oeqa/runtime/systemd.py b/meta/lib/oeqa/runtime/systemd.py index 1451698..5935edd 100644 --- a/meta/lib/oeqa/runtime/systemd.py +++ b/meta/lib/oeqa/runtime/systemd.py @@ -86,3 +86,9 @@ class SystemdServiceTests(SystemdTest): self.systemctl('is-enabled', 'avahi-daemon.service', expected=1) self.systemctl('enable', 'avahi-daemon.service') self.systemctl('is-enabled', 'avahi-daemon.service') + +class SystemdJournalTests(SystemdTest): +@skipUnlessPassed('test_ssh') +def test_systemd_journal(self): +(status, output) = self.target.run('journalctl') +self.assertEqual(status, 0, output) -- 1.9.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] systemd: Instruct the journal to always be volatile
When the storage mode for the journal is auto if /var/log/journal exists then the journal will flush to /var/log/journal assuming that /var/log/journal is persistent. However /var/log - /var/volatile/log in poky, so even though /var/log/journal exists, it is still volatile. Since this can cause ordering issues due to /var/volatile needing to be mounted before the journal actually writes to it, just specify that the journal should always be volatile and never try to write to persistent storage. The journal will exist in /run/log/journal only. This also disables the After of the journal on var-volatile.mount since the ordering is no longer necessary when the journal is only stored in /run/log/journal. [Yocto #7388] Signed-off-by: Randy Witt randy.e.w...@linux.intel.com --- meta/recipes-core/systemd/systemd/journald-volatile.conf | 6 -- meta/recipes-core/systemd/systemd_219.bb | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/journald-volatile.conf diff --git a/meta/recipes-core/systemd/systemd/journald-volatile.conf b/meta/recipes-core/systemd/systemd/journald-volatile.conf deleted file mode 100644 index b11e160..000 --- a/meta/recipes-core/systemd/systemd/journald-volatile.conf +++ /dev/null @@ -1,6 +0,0 @@ -# If /var/volatile is a mount point then make sure to mount it before -# the journal starts. This is because base-files creates a symlink -# /var/log - /var/volatile/log. And if the journal starts before the mount -# happens, the journal will appear empty until restarted. -[Unit] -After=var-volatile.mount diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb index d5eed08..f3bb0c4 100644 --- a/meta/recipes-core/systemd/systemd_219.bb +++ b/meta/recipes-core/systemd/systemd_219.bb @@ -48,7 +48,6 @@ SRC_URI = git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol= file://00-create-volatile.conf \ file://init \ file://run-ptest \ - file://journald-volatile.conf \ S = ${WORKDIR}/git @@ -145,7 +144,6 @@ do_install() { install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ - install -D -m 0644 ${WORKDIR}/journald-volatile.conf ${D}${systemd_unitdir}/system/systemd-journald.service.d/journald-volatile.conf if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then install -d ${D}${sysconfdir}/init.d @@ -170,6 +168,8 @@ do_install() { # Enable journal to forward message to syslog daemon sed -i -e 's/.*ForwardToSyslog.*/ForwardToSyslog=yes/' ${D}${sysconfdir}/systemd/journald.conf + # Make the journal volatile by default. + sed -i -e 's/.*Storage.*/Storage=volatile/' ${D}${sysconfdir}/systemd/journald.conf # its needed in 216 upstream has fixed it with 919699ec301ea507edce4a619141ed22e789ac0d # don't order journal flushing afte remote-fs.target sed -i -e 's/ remote-fs.target$//' ${D}${systemd_unitdir}/system/systemd-journal-flush.service -- 1.9.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] lib/oeqa/runtime/systemd: Add a basic runtime test for the journal
Sorry, please ignore this previously submitted patch. On 03/11/2015 02:25 PM, Randy Witt wrote: The test_systemd_journal() test will fail if journalctl exits with a non-zero exit status. The exit status is non-zero even if there are no journal files, which is what drove the creation of this test. [Yocto #7388] Signed-off-by: Randy Witt randy.e.w...@linux.intel.com --- meta/lib/oeqa/runtime/systemd.py | 6 ++ 1 file changed, 6 insertions(+) diff --git a/meta/lib/oeqa/runtime/systemd.py b/meta/lib/oeqa/runtime/systemd.py index 1451698..5935edd 100644 --- a/meta/lib/oeqa/runtime/systemd.py +++ b/meta/lib/oeqa/runtime/systemd.py @@ -86,3 +86,9 @@ class SystemdServiceTests(SystemdTest): self.systemctl('is-enabled', 'avahi-daemon.service', expected=1) self.systemctl('enable', 'avahi-daemon.service') self.systemctl('is-enabled', 'avahi-daemon.service') + +class SystemdJournalTests(SystemdTest): +@skipUnlessPassed('test_ssh') +def test_systemd_journal(self): +(status, output) = self.target.run('journalctl') +self.assertEqual(status, 0, output) -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] how many ways to delete/de-activate a recipe's task?
On 3/11/15 11:30 AM, Robert P. J. Day wrote: i recall that richard purdie might have explained this once but i have no idea where that post is and i need to add something to it, anyway ... how many ways are there to delete a task from a recipe, and what are the differences? so far, i've seen: 1) bitbake supports a deltask directive The task and all it's dependencies go away. So anything dependent on it and the things it depends on, are no longer dependent. 2) you can use the [noexec] task flag The task and it's dependencies remain, but nothing is executed. 3) i've also seen redefining the task with a no-op : command The task is executed and does nothing. (I believe this dumps a stamp file and the noexec does not.. but I may be wrong.) --Mark so what are the differences, and when would someone use one over the others? thanks. rday -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] var/volatile: Mount it if doing ro-rfs
- Do not mount /var/volatile to be tmpfs always only when generating readonly rootfs - Generate var-volatile.mount unit when using system in readonly-rootfs to mount /var/volatile as tmpfs - for sysvinit, mount /var/volatile to be tmpfs if its not already mounted so - Use RequiresMountsFor instead of After=, so systemd figures out the needed dependencies for making /var/volatile accessible for journald and not us. Change-Id: I0b176b3e1c1e88e84d2c93154aac04cef565d8ea Signed-off-by: Khem Raj raj.k...@gmail.com --- meta/classes/image.bbclass | 1 + meta/recipes-core/base-files/base-files/fstab | 1 - meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh | 2 +- meta/recipes-core/systemd/systemd/journald-volatile.conf | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 89eb5f3..818af86 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -228,6 +228,7 @@ read_only_rootfs_hook () { fi if ${@bb.utils.contains(DISTRO_FEATURES, systemd, true, false, d)}; then + sed -e 's#/tmp#/var/volatile#g' ${IMAGE_ROOTFS}/lib/systemd/system/tmp.mount ${IMAGE_ROOTFS}/lib/systemd/system/var-volatile.mount # Update user database files so that services don't fail for a read-only systemd system for conffile in ${IMAGE_ROOTFS}/usr/lib/sysusers.d/systemd.conf ${IMAGE_ROOTFS}/usr/lib/sysusers.d/systemd-remote.conf; do [ -e $conffile ] || continue diff --git a/meta/recipes-core/base-files/base-files/fstab b/meta/recipes-core/base-files/base-files/fstab index 739b844..56b14d7 100644 --- a/meta/recipes-core/base-files/base-files/fstab +++ b/meta/recipes-core/base-files/base-files/fstab @@ -5,7 +5,6 @@ proc /procproc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbdevfs /proc/bus/usbusbdevfs noauto0 0 tmpfs/run tmpfs mode=0755,nodev,nosuid,strictatime 0 0 -tmpfs/var/volatiletmpfs defaults 0 0 # uncomment this if your device has a SD/MMC/Transflash slot #/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 diff --git a/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh b/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh index 1a0328d..3ff39f4 100644 --- a/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh @@ -29,7 +29,7 @@ is_on_read_only_partition () { if [ $1 = start ] ; then if [ `is_on_read_only_partition /var/lib` = yes ]; then - grep -q tmpfs /var/volatile /proc/mounts || mount /var/volatile + grep -q tmpfs /var/volatile /proc/mounts || mount -t tmpfs -o strictatime tmpfs /var/volatile mkdir -p /var/volatile/lib cp -a /var/lib/* /var/volatile/lib mount --bind /var/volatile/lib /var/lib diff --git a/meta/recipes-core/systemd/systemd/journald-volatile.conf b/meta/recipes-core/systemd/systemd/journald-volatile.conf index b11e160..9356a4e 100644 --- a/meta/recipes-core/systemd/systemd/journald-volatile.conf +++ b/meta/recipes-core/systemd/systemd/journald-volatile.conf @@ -3,4 +3,4 @@ # /var/log - /var/volatile/log. And if the journal starts before the mount # happens, the journal will appear empty until restarted. [Unit] -After=var-volatile.mount +RequiresMountsFor=/var/volatile -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] oe-setup-builddir: output message cleanup
Moved a Yoctoproject documentation banner to the end of the first-time run messages section [YOCTO #7368] Signed-off-by: Benjamin Esquivel benjamin.esqui...@linux.intel.com --- scripts/oe-setup-builddir | 32 +--- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index c91e079..f73aa34 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -66,6 +66,7 @@ if [ -n $TEMPLATECONF ]; then OECORENOTESCONF=$TEMPLATECONF/conf-notes.txt fi +unset SHOWYPDOC if [ -z $OECORELOCALCONF ]; then OECORELOCALCONF=$OEROOT/meta/conf/local.conf.sample fi @@ -77,15 +78,9 @@ different MACHINE (target hardware) or enable parallel build options to take advantage of multiple cores for example. See the file for more information as common configuration options are commented. -The Yocto Project has extensive documentation about OE including a reference manual -which can be found at: -http://yoctoproject.org/documentation - -For more information about OpenEmbedded see their website: -http://www.openembedded.org/ - EOM cp -f $OECORELOCALCONF $BUILDDIR/conf/local.conf +SHOWYPDOC=yes fi if [ -z $OECORELAYERCONF ]; then @@ -97,14 +92,6 @@ You had no conf/bblayers.conf file. The configuration file has been created for you with some default values. To add additional metadata layers into your configuration please add entries to this file. -The Yocto Project has extensive documentation about OE including a reference manual -which can be found at: -http://yoctoproject.org/documentation - -For more information about OpenEmbedded see their website: -http://www.openembedded.org/ - - EOM # Put the abosolute path to the layers in bblayers.conf so we can run @@ -114,12 +101,27 @@ EOM sed -e s|##OEROOT##|$OEROOT|g \ -e s|##COREBASE##|$OEROOT|g \ $OECORELAYERCONF $BUILDDIR/conf/bblayers.conf +SHOWYPDOC=yes fi # Prevent disturbing a new GIT clone in same console unset OECORELOCALCONF unset OECORELAYERCONF +# Ending the first-time run message. Show the YP Documentation banner. +if [ ! -z $SHOWYPDOC ]; then +cat EOM +The Yocto Project has extensive documentation about OE including a reference +manual which can be found at: +http://yoctoproject.org/documentation + +For more information about OpenEmbedded see their website: +http://www.openembedded.org/ + +EOM +#unset SHOWYPDOC +fi + cat EOM ### Shell environment set up for builds. ### -- 1.8.4.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] curl: remove samba from PACKAGECONFIG[smb] DEPENDS
Enabling support for the smb protocol does not create a build time dependency on samba. Signed-off-by: Andre McCurdy armccu...@gmail.com --- meta/recipes-support/curl/curl_7.40.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/curl/curl_7.40.0.bb b/meta/recipes-support/curl/curl_7.40.0.bb index d4b4ee3..4cde9c6 100644 --- a/meta/recipes-support/curl/curl_7.40.0.bb +++ b/meta/recipes-support/curl/curl_7.40.0.bb @@ -29,7 +29,7 @@ PACKAGECONFIG[gnutls] = --with-gnutls,--without-gnutls,gnutls PACKAGECONFIG[zlib] = --with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib PACKAGECONFIG[rtmpdump] = --with-librtmp,--without-librtmp,rtmpdump PACKAGECONFIG[libssh2] = --with-libssh2,--without-libssh2,libssh2 -PACKAGECONFIG[smb] = --enable-smb,--disable-smb,samba +PACKAGECONFIG[smb] = --enable-smb,--disable-smb, EXTRA_OECONF = --without-libidn \ --enable-crypto-auth \ -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/4] meta: 4 fixes
The following changes since commit 99f209a49a4390192b95184ff86bd6f973010111: layer.conf: bump version as error-report interface changed (2015-03-10 17:44:56 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/4fixes http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/4fixes Robert Yang (4): license.bbclass: set dirs for do_populate_lic_setscene mailx: disable parallel build kernelsrc.bbclass: fix KERNEL_VERSION pixbufcache.bbclass: add harfbuzz-native to PIXBUFCACHE_SYSROOT_DEP meta/classes/kernelsrc.bbclass|2 +- meta/classes/license.bbclass |2 ++ meta/classes/pixbufcache.bbclass |7 ++- meta/recipes-extended/mailx/mailx_12.5.bb |5 + 4 files changed, 14 insertions(+), 2 deletions(-) -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] kernelsrc.bbclass: fix KERNEL_VERSION
The kernel-abiversion is now in STAGING_KERNEL_BUILDDIR not in S. Fixed rpm pkg like perf: (note the None version) perf-None-r9.qemux86.rpm Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/classes/kernelsrc.bbclass |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernelsrc.bbclass b/meta/classes/kernelsrc.bbclass index 4208eff..9efd46a 100644 --- a/meta/classes/kernelsrc.bbclass +++ b/meta/classes/kernelsrc.bbclass @@ -4,7 +4,7 @@ do_unpack[depends] += virtual/kernel:do_patch do_unpack[noexec] = 1 do_patch[noexec] = 1 do_package[depends] += virtual/kernel:do_populate_sysroot -KERNEL_VERSION = ${@get_kernelversion_file(${S})} +KERNEL_VERSION = ${@get_kernelversion_file(${STAGING_KERNEL_BUILDDIR})} inherit linux-kernel-base -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] license.bbclass: set dirs for do_populate_lic_setscene
Fixed: ERROR: Build of do_populate_lic failed ERROR: Traceback (most recent call last): File bitbake/lib/bb/build.py, line 497, in exec_task return _exec_task(fn, task, d, quieterr) File bitbake/lib/bb/build.py, line 437, in _exec_task exec_func(func, localdata) File bitbake/lib/bb/build.py, line 212, in exec_func exec_func_python(func, d, runfile, cwd=adir) File /home/nxadm/nx/ala-blade44.1/builds-2015-03-09-163005/qemuppc_world_oe_bp/bitbake/lib/bb/build.py, line 237, in exec_func_python os.chdir(cwd) OSError: [Errno 2] No such file or directory: 'bitbake_build/tmp/work/ppc7400-wrs-linux/taglib/1.9.1-r0/build' When running setscene, the cwd is $B which maybe removed by autotools.bbclass or cmake.bbclass when rebuild. Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/classes/license.bbclass |2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 044b3b0..95e0121 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -438,6 +438,8 @@ do_populate_lic[sstate-outputdirs] = ${LICENSE_DIRECTORY}/ ROOTFS_POSTPROCESS_COMMAND_prepend = write_package_manifest; license_create_manifest; +do_populate_lic_setscene[dirs] = ${LICSSTATEDIR}/${PN} +do_populate_lic_setscene[cleandirs] = ${LICSSTATEDIR} python do_populate_lic_setscene () { sstate_setscene(d) } -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] mailx: disable parallel build
The makeconfig can't run parallelly, otherwise the checking results might be incorrect and lead to errors: fio.c:56:17: fatal error: ssl.h: No such file or directory Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-extended/mailx/mailx_12.5.bb |5 + 1 file changed, 5 insertions(+) diff --git a/meta/recipes-extended/mailx/mailx_12.5.bb b/meta/recipes-extended/mailx/mailx_12.5.bb index 080d71f..a53da3a 100644 --- a/meta/recipes-extended/mailx/mailx_12.5.bb +++ b/meta/recipes-extended/mailx/mailx_12.5.bb @@ -29,3 +29,8 @@ inherit autotools-brokensep CFLAGS_append = -D_BSD_SOURCE -DDEBIAN -I${S}/EXT EXTRA_OEMAKE = SENDMAIL=${sbindir}/sendmail +# The makeconfig can't run parallelly, otherwise the checking results +# might be incorrect and lead to errors: +# fio.c:56:17: fatal error: ssl.h: No such file or directory +# #include ssl.h +PARALLEL_MAKE = -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] pixbufcache.bbclass: add harfbuzz-native to PIXBUFCACHE_SYSROOT_DEP
Fixed: DEBUG: Executing shell function pixbufcache_sstate_postinst g_module_open() failed for sysroots/x86_64-linux/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.so: libharfbuzz.so.0: cannot open shared object file: No such file or directory Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/classes/pixbufcache.bbclass |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass index b8d75bd..9e6ecc8 100644 --- a/meta/classes/pixbufcache.bbclass +++ b/meta/classes/pixbufcache.bbclass @@ -67,6 +67,11 @@ pixbufcache_sstate_postinst() { # Packages that use this class should extend this variable with their runtime # dependencies. PIXBUFCACHE_SYSROOT_DEPS = -PIXBUFCACHE_SYSROOT_DEPS_class-native = ${@['gdk-pixbuf-native:do_populate_sysroot_setscene', '']['${BPN}' == 'gdk-pixbuf']} glib-2.0-native:do_populate_sysroot_setscene libffi-native:do_populate_sysroot_setscene libpng-native:do_populate_sysroot_setscene zlib-native:do_populate_sysroot_setscene +PIXBUFCACHE_SYSROOT_DEPS_class-native = \ +${@['gdk-pixbuf-native:do_populate_sysroot_setscene', '']['${BPN}' == 'gdk-pixbuf']} \ +glib-2.0-native:do_populate_sysroot_setscene libffi-native:do_populate_sysroot_setscene \ +libpng-native:do_populate_sysroot_setscene zlib-native:do_populate_sysroot_setscene \ +harfbuzz-native:do_populate_sysroot_setscene \ + do_populate_sysroot_setscene[depends] += ${PIXBUFCACHE_SYSROOT_DEPS} do_populate_sysroot[depends] += ${@d.getVar('PIXBUFCACHE_SYSROOT_DEPS', True).replace('_setscene','')} -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] util-linux: split libsmartcols into separate sub-package
This avoids util-linux-fdisk pulling in util-linux and all the associated sub-packages. Signed-off-by: Jonathan Liu net...@gmail.com --- meta/recipes-core/util-linux/util-linux.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 3d8a4d0..a081d95 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -28,7 +28,7 @@ SRC_URI = ${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin PACKAGES =+ util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ util-linux-swaponoff util-linux-losetup util-linux-umount \ util-linux-mount util-linux-readprofile util-linux-libblkid \ - util-linux-libmount util-linux-libuuid util-linux-uuidd \ + util-linux-libmount util-linux-libsmartcols util-linux-libuuid util-linux-uuidd \ util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ util-linux-mkfs util-linux-mcookie util-linux-reset \ util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \ @@ -89,6 +89,7 @@ FILES_util-linux-libblkid = ${base_libdir}/libblkid.so.* FILES_util-linux-libmount = ${base_libdir}/libmount.so.* FILES_util-linux-pylibmount = ${libdir}/${PYTHON_DIR}/dist-packages/libmount/pylibmount.so \ ${libdir}/${PYTHON_DIR}/dist-packages/libmount/__init__.* +FILES_util-linux-libsmartcols = ${base_libdir}/libsmartcols.so.* FILES_util-linux-libuuid = ${base_libdir}/libuuid.so.* FILES_util-linux-lscpu = ${bindir}/lscpu -- 2.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] sysprof: fix arm big-endian build.
Applying the existing ARM patch for armeb makes it work. Signed-off-by: Koen Kooi koen.k...@linaro.org --- meta/recipes-kernel/sysprof/sysprof_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb index e18aebf..19c3e10 100644 --- a/meta/recipes-kernel/sysprof/sysprof_git.bb +++ b/meta/recipes-kernel/sysprof/sysprof_git.bb @@ -12,6 +12,7 @@ SRC_URI = git://git.gnome.org/sysprof \ SRC_URI_append_arm = file://rmb-arm.patch +SRC_URI_append_armeb = file://rmb-arm.patch SRC_URI_append_mips = file://rmb-mips.patch SRC_URI_append_mips64 = file://rmb-mips.patch SRC_URI_append_mips64n32 = file://rmb-mips.patch -- 1.9.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [backport][dizzy][daisy] utils.bbclass: fix create_cmdline_wrapper
Hi Saul, Added to my pending branch for Daisy, I am doing a sweep of the list now for a 1.6.3 build later this week. Sau! I see this patch didn't make it to the just-built 'yocto-1.6.3.rc1'. Is there any problem with it? It's included in master and Dizzy but if it needs rework for Daisy I can do that. - Thanks Javier Viguera -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4] u-boot.inc: fix rename image error
Resolve mismatch between U-Boot configs and uboot image name. The ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} may alway be false and repeat compile or install so we need to check if ${type} match ${config} . Signed-off-by: Chunrong Guo b40...@freescale.com --- meta/recipes-bsp/u-boot/u-boot.inc | 85 -- 1 file changed, 35 insertions(+), 50 deletions(-) diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 6bdc86a..9b52971 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -66,20 +66,17 @@ do_compile () { if [ x${UBOOT_CONFIG} != x ] then for config in ${UBOOT_MACHINE}; do -for type in in ${UBOOT_CONFIG}; do -if [ ${type}x = inx ] +i=`expr $i + 1`; +for type in ${UBOOT_CONFIG}; do +j=`expr $j + 1`; +if [ $j -eq $i ] then -continue -fi -if [ -d ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} ] -then -break -else oe_runmake O=${config} ${config} oe_runmake O=${config} ${UBOOT_MAKE_TARGET} cp ${S}/${config}/${UBOOT_BINARY} ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} fi done +unset j done else oe_runmake ${UBOOT_MACHINE} @@ -92,20 +89,17 @@ do_install () { if [ x${UBOOT_CONFIG} != x ] then for config in ${UBOOT_MACHINE}; do -for type in in ${UBOOT_CONFIG}; do -if [ ${type}x = inx ] -then -continue -fi -if [ -d ${D}/boot/u-boot-${type}.${UBOOT_SUFFIX} ] +i=`expr $i + 1`; +for type in ${UBOOT_CONFIG}; do +j=`expr $j + 1`; +if [ $j -eq $i ] then -break -else install -d ${D}/boot install ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} ${D}/boot/u-boot-${type}.${UBOOT_SUFFIX} ln -sf u-boot-${type}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY} fi done +unset j done else install -d ${D}/boot @@ -123,20 +117,17 @@ do_install () { if [ x${UBOOT_CONFIG} != x ] then for config in ${UBOOT_MACHINE}; do -for type in in ${UBOOT_CONFIG}; do - if [ ${type}x = inx ] - then - continue - fi - if [ -d ${D}/boot/${SPL_IMAGE}-${type} ] - then - break - else +i=`expr $i + 1`; +for type in ${UBOOT_CONFIG}; do +j=`expr $j + 1`; +if [ $j -eq $i ] +then install ${S}/${config}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}-${type} ln -sf ${SPL_IMAGE}-${type} ${D}/boot/${SPL_BINARY}-${type} ln -sf ${SPL_IMAGE}-${type} ${D}/boot/${SPL_BINARY} - fi +fi done +unset j done else install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} @@ -157,15 +148,11 @@ do_deploy () { if [ x${UBOOT_CONFIG} != x ] then for config in ${UBOOT_MACHINE}; do -for type in in ${UBOOT_CONFIG}; do -if [ ${type}x = inx ] +i=`expr $i + 1`; +for type in ${UBOOT_CONFIG}; do +j=`expr $j + 1`; +if [ $j -eq $i ] then -continue -fi -if [ -d ${DEPLOYDIR}/u-boot-${type}.${UBOOT_SUFFIX} ] -then -break -else install -d ${DEPLOYDIR} install ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} ${DEPLOYDIR}/u-boot-${type}.${UBOOT_SUFFIX} cd ${DEPLOYDIR} @@ -173,6 +160,7 @@ do_deploy () { ln -sf u-boot-${type}.${UBOOT_SUFFIX} ${UBOOT_BINARY} fi done +unset j done else install -d ${DEPLOYDIR} @@ -190,23 +178,20 @@ do_deploy () { if [ x${UBOOT_CONFIG} != x ] then for config in ${UBOOT_MACHINE}; do - for type in in ${UBOOT_CONFIG}; do - if [ ${type}x = inx ] - then - continue - fi - if [ -d ${DEPLOYDIR}/${SPL_IMAGE}-${type} ] - then -
Re: [OE-core] [PATCH v2] directfb: Allow native builds of directfb 1.7.6
Hi Arndre, On 10.03.2015 23:32, Andre McCurdy wrote: Are you sure that excluding tslib-native from DEPENDS works? Since -lts is hardcoded in LDFLAGS (see directfb.inc) the linker won't run unless libts.so is found in sysroot (regardless of whether or not you configure with --with-inputdrivers=none). That being said, I don't know if -lts really needs to be hardcoded in LDFLAGS, it's been there since directfb was first imported into oe-core, with no explanation of comment. yes it works - tested it and made sure that there was no native libts around from a previous build. But you are right, this hardcoded -lts in LDFLAGS looks strange. I can take a look at this later since I need to build and test this anyway. Greetings Florian -- The dream of yesterday Florian Boor is the hope of todayTel: +49 271-771091-15 and the reality of tomorrow.Fax: +49 271-771091-19 [Robert Hutchings Goddard, 1904]florian.b...@kernelconcepts.de http://www.kernelconcepts.de/en -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] var/volatile: Mount it if doing ro-rfs
On Wed, 2015-03-11 at 08:33 +, Khem Raj wrote: - Do not mount /var/volatile to be tmpfs always only when generating readonly rootfs - Generate var-volatile.mount unit when using system in readonly-rootfs to mount /var/volatile as tmpfs - for sysvinit, mount /var/volatile to be tmpfs if its not already mounted so - Use RequiresMountsFor instead of After=, so systemd figures out the needed dependencies for making /var/volatile accessible for journald and not us. Change-Id: I0b176b3e1c1e88e84d2c93154aac04cef565d8ea Signed-off-by: Khem Raj raj.k...@gmail.com --- meta/classes/image.bbclass | 1 + meta/recipes-core/base-files/base-files/fstab | 1 - meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh | 2 +- meta/recipes-core/systemd/systemd/journald-volatile.conf | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) Which combinations has this been tested with? Given the time the patch has existed for, I'm sceptical all the combinations we need have been tested, I'd love to be wrong. This is a pretty major change of behaviour and given the problems previous changes have caused, I'm very very very nervous about what issues this is going to cause :(. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] var/volatile: Mount it if doing ro-rfs
- Do not mount /var/volatile to be tmpfs always only when generating readonly rootfs - Generate var-volatile.mount unit when using system in readonly-rootfs to mount /var/volatile as tmpfs - for sysvinit, mount /var/volatile to be tmpfs if its not already mounted so - Use RequiresMountsFor instead of After=, so systemd figures out the needed dependencies for making /var/volatile accessible for journald and not us. Change-Id: I0b176b3e1c1e88e84d2c93154aac04cef565d8ea Signed-off-by: Khem Raj raj.k...@gmail.com --- meta/classes/image.bbclass | 1 + meta/recipes-core/base-files/base-files/fstab | 1 - meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh | 2 +- meta/recipes-core/systemd/systemd/journald-volatile.conf | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 89eb5f3..7e49e7a 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -228,6 +228,7 @@ read_only_rootfs_hook () { fi if ${@bb.utils.contains(DISTRO_FEATURES, systemd, true, false, d)}; then + sed -i -e 's#/tmp#/var/volatile#g' ${IMAGE_ROOTFS}/lib/systemd/system/tmp.mount ${IMAGE_ROOTFS}/lib/systemd/system/var-volatile.mount # Update user database files so that services don't fail for a read-only systemd system for conffile in ${IMAGE_ROOTFS}/usr/lib/sysusers.d/systemd.conf ${IMAGE_ROOTFS}/usr/lib/sysusers.d/systemd-remote.conf; do [ -e $conffile ] || continue diff --git a/meta/recipes-core/base-files/base-files/fstab b/meta/recipes-core/base-files/base-files/fstab index 739b844..56b14d7 100644 --- a/meta/recipes-core/base-files/base-files/fstab +++ b/meta/recipes-core/base-files/base-files/fstab @@ -5,7 +5,6 @@ proc /procproc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 usbdevfs /proc/bus/usbusbdevfs noauto0 0 tmpfs/run tmpfs mode=0755,nodev,nosuid,strictatime 0 0 -tmpfs/var/volatiletmpfs defaults 0 0 # uncomment this if your device has a SD/MMC/Transflash slot #/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 diff --git a/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh b/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh index 1a0328d..3ff39f4 100644 --- a/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh @@ -29,7 +29,7 @@ is_on_read_only_partition () { if [ $1 = start ] ; then if [ `is_on_read_only_partition /var/lib` = yes ]; then - grep -q tmpfs /var/volatile /proc/mounts || mount /var/volatile + grep -q tmpfs /var/volatile /proc/mounts || mount -t tmpfs -o strictatime tmpfs /var/volatile mkdir -p /var/volatile/lib cp -a /var/lib/* /var/volatile/lib mount --bind /var/volatile/lib /var/lib diff --git a/meta/recipes-core/systemd/systemd/journald-volatile.conf b/meta/recipes-core/systemd/systemd/journald-volatile.conf index b11e160..9356a4e 100644 --- a/meta/recipes-core/systemd/systemd/journald-volatile.conf +++ b/meta/recipes-core/systemd/systemd/journald-volatile.conf @@ -3,4 +3,4 @@ # /var/log - /var/volatile/log. And if the journal starts before the mount # happens, the journal will appear empty until restarted. [Unit] -After=var-volatile.mount +RequiresMountsFor=/var/volatile -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] util-linux: split libsmartcols into separate sub-package
On 11 March 2015 at 12:37, Jonathan Liu net...@gmail.com wrote: Perhaps. I don't have experience in that area. Just done it, will send the patch once I've eaten lunch. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] util-linux: split libsmartcols into separate sub-package
On 11/03/2015 11:55 PM, Burton, Ross wrote: On 11 March 2015 at 12:37, Jonathan Liu net...@gmail.com mailto:net...@gmail.com wrote: Perhaps. I don't have experience in that area. Just done it, will send the patch once I've eaten lunch. Ross Thanks. Regards, Jonathan -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] linux-yocto-rt: removed duplicated line
On 2015-03-11 5:52 AM, Alexandru.Vaduva wrote: Seemed that the recipe contained redundant information. Indeed! Acked-by: Bruce Ashfield bruce.ashfi...@windriver.com Signed-off-by: Alexandru.Vaduva alexandru.vad...@enea.com --- meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb index 7dbf82c..bcfd754 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb @@ -23,5 +23,4 @@ COMPATIBLE_MACHINE = (qemux86|qemux86-64|qemuarm|qemuppc|qemumips) KERNEL_EXTRA_FEATURES ?= features/netfilter/netfilter.scc features/taskstats/taskstats.scc KERNEL_FEATURES_append = ${KERNEL_EXTRA_FEATURES} KERNEL_FEATURES_append_qemux86= cfg/sound.scc cfg/paravirt_kvm.scc -KERNEL_FEATURES_append_qemux86= cfg/sound.scc cfg/paravirt_kvm.scc KERNEL_FEATURES_append_qemux86-64= cfg/sound.scc -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] util-linux: split libsmartcols into separate sub-package
On 11 March 2015 at 07:00, Jonathan Liu net...@gmail.com wrote: This avoids util-linux-fdisk pulling in util-linux and all the associated sub-packages. util-linux is splitting so many packages and adding sub-packages so frequently, could we just do this dynamically? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] util-linux: split libsmartcols into separate sub-package
On 11/03/2015 11:31 PM, Burton, Ross wrote: On 11 March 2015 at 07:00, Jonathan Liu net...@gmail.com mailto:net...@gmail.com wrote: This avoids util-linux-fdisk pulling in util-linux and all the associated sub-packages. util-linux is splitting so many packages and adding sub-packages so frequently, could we just do this dynamically? Ross Perhaps. I don't have experience in that area. Regards, Jonathan -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] resolvconf: fix SRC_URI
Fixed: WARNING: Failed to fetch URL ftp://ftp.debian.org/debian/pool/main/r/resolvconf/resolvconf_1.76.tar.xz, attempting MIRRORS if available Signed-off-by: Robert Yang liezhi.y...@windriver.com --- .../resolvconf/resolvconf_1.76.bb |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.76.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.76.bb index 20a2c19..797e9b0 100644 --- a/meta/recipes-connectivity/resolvconf/resolvconf_1.76.bb +++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.76.bb @@ -11,12 +11,11 @@ AUTHOR = Thomas Hood HOMEPAGE = http://packages.debian.org/resolvconf; RDEPENDS_${PN} = bash -SRC_URI = ${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.xz \ +SRC_URI = http://snapshot.debian.org/archive/debian/20141013T184415Z/pool/main/r/${BPN}/${BPN}_1.76.tar.xz \ file://fix-path-for-busybox.patch \ file://99_resolvconf \ - SRC_URI[md5sum] = d78ce30ea068999cd3e0523300b27255 SRC_URI[sha256sum] = c9f40f7405b37399ddbf29ca4205b4911ee35cb9ffd9be7671faa2385b1fa573 -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] apt: fix SRC_URI
Fixed: WARNING: Failed to fetch URL ftp://ftp.debian.org/debian/pool/main/a/apt/apt_0.9.9.4.tar.gz, attempting MIRRORS if available Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-devtools/apt/apt.inc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc index 378021a..321934b 100644 --- a/meta/recipes-devtools/apt/apt.inc +++ b/meta/recipes-devtools/apt/apt.inc @@ -2,7 +2,7 @@ SUMMARY = Advanced front-end for dpkg LICENSE = GPLv2.0+ SECTION = base -SRC_URI = ${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \ +SRC_URI = http://snapshot.debian.org/archive/debian/20130726T154545Z/pool/main/a/${BPN}/${BPN}_${PV}.tar.gz \ file://no-ko-translation.patch \ file://use-host.patch \ file://makerace.patch \ -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] net-tools: fix SRC_URI
Fixed: WARNING: Failed to fetch URL ftp://ftp.debian.org/debian/pool/main/n/net-tools/net-tools_1.60-25.diff.gz;apply=no;name=patch, attempting MIRRORS if available Signed-off-by: Robert Yang liezhi.y...@windriver.com --- .../net-tools/net-tools_1.60-25.bb |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-25.bb b/meta/recipes-extended/net-tools/net-tools_1.60-25.bb index 0e4ee75..c47d69a 100644 --- a/meta/recipes-extended/net-tools/net-tools_1.60-25.bb +++ b/meta/recipes-extended/net-tools/net-tools_1.60-25.bb @@ -6,8 +6,8 @@ LICENSE = GPLv2+ LIC_FILES_CHKSUM = file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ file://ifconfig.c;beginline=11;endline=15;md5=d1ca372080ad5401e23ca0afc35cf9ba -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 \ +SRC_URI = http://snapshot.debian.org/archive/debian/20050312T00Z/pool/main/n/${BPN}/${BPN}_1.60.orig.tar.gz;name=tarball \ + http://snapshot.debian.org/archive/debian/20130511T214653Z/pool/main/n/${BPN}/${BPN}_${PV}.diff.gz;apply=no;name=patch \ file://net-tools-config.h \ file://net-tools-config.make \ file://ifconfig-interface-0-del-IP-will-remove-the-aliased-.patch \ -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] libevent: fix SRC_URI
The wget reported errors for the past URI since it can't follow the redirection well: Connecting to cloud.github.com (cloud.github.com)|54.192.140.6|:443... connected. OpenSSL: error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure Unable to establish SSL connection. Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-support/libevent/libevent_2.0.21.bb |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/libevent/libevent_2.0.21.bb b/meta/recipes-support/libevent/libevent_2.0.21.bb index 5a1ff3b..1230e92 100644 --- a/meta/recipes-support/libevent/libevent_2.0.21.bb +++ b/meta/recipes-support/libevent/libevent_2.0.21.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = file://LICENSE;md5=45c5316ff684bcfe2f9f86d8b1279559 PR = r1 -SRC_URI = http://github.com/downloads/libevent/libevent/${BPN}-${PV}-stable.tar.gz \ +SRC_URI = ${SOURCEFORGE_MIRROR}/levent/${BP}-stable.tar.gz \ file://obsolete_automake_macros.patch \ file://disable_tests.patch \ -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [V3 PATCH 0/5] meta: fix SRC_URI
* V3 Use git repo for xinetd. * V2: Use snapshot.debian.org for the invalid SRC_URI when possible as Ross suggested. * V1: Initial version // Robert The following changes since commit 99f209a49a4390192b95184ff86bd6f973010111: layer.conf: bump version as error-report interface changed (2015-03-10 17:44:56 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/uri http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/uri Robert Yang (5): xinetd: fixe HOMEPAGE and SRC_URI libevent: fix SRC_URI apt: fix SRC_URI net-tools: fix SRC_URI resolvconf: fix SRC_URI .../resolvconf/resolvconf_1.76.bb |3 +-- meta/recipes-devtools/apt/apt.inc |2 +- .../net-tools/net-tools_1.60-25.bb |4 ++-- meta/recipes-extended/xinetd/xinetd_2.3.15.bb |9 + meta/recipes-support/libevent/libevent_2.0.21.bb |2 +- 5 files changed, 10 insertions(+), 10 deletions(-) -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] systemd: Instruct the journal to always be volatile
On Mar 11, 2015, at 2:28 PM, Randy Witt randy.e.w...@linux.intel.com wrote: When the storage mode for the journal is auto if /var/log/journal exists then the journal will flush to /var/log/journal assuming that /var/log/journal is persistent. However /var/log - /var/volatile/log in poky, so even though /var/log/journal exists, it is still volatile. Since this can cause ordering issues due to /var/volatile needing to be mounted before the journal actually writes to it, just specify that the journal should always be volatile and never try to write to persistent storage. The journal will exist in /run/log/journal only. This also disables the After of the journal on var-volatile.mount since the ordering is no longer necessary when the journal is only stored in /run/log/journal. [Yocto #7388] This is not right. What if I want persistent logs.? the options is just gone. Both cases should work. /var/volatile should only be used when doing ro-rfs its not FHS specified anyway. Lets not go with this patch. Signed-off-by: Randy Witt randy.e.w...@linux.intel.com --- meta/recipes-core/systemd/systemd/journald-volatile.conf | 6 -- meta/recipes-core/systemd/systemd_219.bb | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/journald-volatile.conf diff --git a/meta/recipes-core/systemd/systemd/journald-volatile.conf b/meta/recipes-core/systemd/systemd/journald-volatile.conf deleted file mode 100644 index b11e160..000 --- a/meta/recipes-core/systemd/systemd/journald-volatile.conf +++ /dev/null @@ -1,6 +0,0 @@ -# If /var/volatile is a mount point then make sure to mount it before -# the journal starts. This is because base-files creates a symlink -# /var/log - /var/volatile/log. And if the journal starts before the mount -# happens, the journal will appear empty until restarted. -[Unit] -After=var-volatile.mount diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb index d5eed08..f3bb0c4 100644 --- a/meta/recipes-core/systemd/systemd_219.bb +++ b/meta/recipes-core/systemd/systemd_219.bb @@ -48,7 +48,6 @@ SRC_URI = git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol= file://00-create-volatile.conf \ file://init \ file://run-ptest \ - file://journald-volatile.conf \ S = ${WORKDIR}/git @@ -145,7 +144,6 @@ do_install() { install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ - install -D -m 0644 ${WORKDIR}/journald-volatile.conf ${D}${systemd_unitdir}/system/systemd-journald.service.d/journald-volatile.conf if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then install -d ${D}${sysconfdir}/init.d @@ -170,6 +168,8 @@ do_install() { # Enable journal to forward message to syslog daemon sed -i -e 's/.*ForwardToSyslog.*/ForwardToSyslog=yes/' ${D}${sysconfdir}/systemd/journald.conf + # Make the journal volatile by default. + sed -i -e 's/.*Storage.*/Storage=volatile/' ${D}${sysconfdir}/systemd/journald.conf # its needed in 216 upstream has fixed it with 919699ec301ea507edce4a619141ed22e789ac0d # don't order journal flushing afte remote-fs.target sed -i -e 's/ remote-fs.target$//' ${D}${systemd_unitdir}/system/systemd-journal-flush.service -- 1.9.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] var/volatile: Mount it if doing ro-rfs
On Wednesday, March 11, 2015, Richard Purdie richard.pur...@linuxfoundation.org wrote: On Wed, 2015-03-11 at 08:33 +, Khem Raj wrote: - Do not mount /var/volatile to be tmpfs always only when generating readonly rootfs - Generate var-volatile.mount unit when using system in readonly-rootfs to mount /var/volatile as tmpfs - for sysvinit, mount /var/volatile to be tmpfs if its not already mounted so - Use RequiresMountsFor instead of After=, so systemd figures out the needed dependencies for making /var/volatile accessible for journald and not us. Change-Id: I0b176b3e1c1e88e84d2c93154aac04cef565d8ea Signed-off-by: Khem Raj raj.k...@gmail.com javascript:; --- meta/classes/image.bbclass | 1 + meta/recipes-core/base-files/base-files/fstab | 1 - meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh | 2 +- meta/recipes-core/systemd/systemd/journald-volatile.conf | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) Which combinations has this been tested with? Given the time the patch has existed for, I'm sceptical all the combinations we need have been tested, I'd love to be wrong. This is a pretty major change of behaviour and given the problems previous changes have caused, I'm very very very nervous about what issues this is going to cause :(. Systemd in both ways but not sysvinit Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] util-linux: fix CVE-2014-9114
Backport a patch to fix CVE-2014-9114. The patch has been integrated in util-linux-2.26. [YOCTO #7180] Signed-off-by: Chen Qi qi.c...@windriver.com --- .../util-linux/util-linux/CVE-2014-9114.patch | 174 + meta/recipes-core/util-linux/util-linux_2.25.2.bb | 1 + 2 files changed, 175 insertions(+) create mode 100644 meta/recipes-core/util-linux/util-linux/CVE-2014-9114.patch diff --git a/meta/recipes-core/util-linux/util-linux/CVE-2014-9114.patch b/meta/recipes-core/util-linux/util-linux/CVE-2014-9114.patch new file mode 100644 index 000..5eaa08d --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/CVE-2014-9114.patch @@ -0,0 +1,174 @@ +Upstream-Status: Backport + +This patch is for CVE-2014-9114. +This patch should be removed once util-linux is upgraded to 2.26. + +Signed-off-by: Chen Qi qi.c...@windriver.com + +From 89e90ae7b2826110ea28c1c0eb8e7c56c3907bdc Mon Sep 17 00:00:00 2001 +From: Karel Zak k...@redhat.com +Date: Thu, 27 Nov 2014 13:39:35 +0100 +Subject: [PATCH] libblkid: care about unsafe chars in cache + +The high-level libblkid API uses /run/blkid/blkid.tab cache to +store probing results. The cache format is + + device NAME=value ...devname/device + +and unfortunately the cache code does not escape quotation marks: + + # mkfs.ext4 -L 'AAABBB' + + # cat /run/blkid/blkid.tab + ... + device ... LABEL=AAABBB .../dev/sdb1/device + +such string is later incorrectly parsed and blkid(8) returns +nonsenses. And for use-cases like + + # eval $(blkid -o export /dev/sdb1) + +it's also insecure. + +Note that mount, udevd and blkid -p are based on low-level libblkid +API, it bypass the cache and directly read data from the devices. + +The current udevd upstream does not depend on blkid(8) output at all, +it's directly linked with the library and all unsafe chars are encoded by +\xhex notation. + + # mkfs.ext4 -L 'X`/tmp/foo` ' /dev/sdb1 + # udevadm info --export-db | grep LABEL + ... + E: ID_FS_LABEL=X__/tmp/foo___ + E: ID_FS_LABEL_ENC=X\x22\x60\x2ftmp\x2ffoo\x60\x20\x22 + +Signed-off-by: Karel Zak k...@redhat.com +--- + libblkid/src/read.c | 21 ++--- + libblkid/src/save.c | 22 +- + misc-utils/blkid.8 | 5 - + misc-utils/blkid.c | 4 ++-- + 4 files changed, 45 insertions(+), 7 deletions(-) + +diff --git a/libblkid/src/read.c b/libblkid/src/read.c +index 0e91c9c..81ab0df 100644 +--- a/libblkid/src/read.c b/libblkid/src/read.c +@@ -252,15 +252,30 @@ static int parse_token(char **name, char **value, char **cp) + *value = skip_over_blank(*value + 1); + + if (**value == '') { +- end = strchr(*value + 1, ''); +- if (!end) { ++ char *p = end = *value + 1; ++ ++ /* convert 'foo\bar' to 'foobar' */ ++ while (*p) { ++ if (*p == '\\') { ++ p++; ++ *end = *p; ++ } else { ++ *end = *p; ++ if (*p == '') ++ break; ++ } ++ p++; ++ end++; ++ } ++ ++ if (*end != '') { + DBG(READ, ul_debug(unbalanced quotes at: %s, *value)); + *cp = *value; + return -BLKID_ERR_CACHE; + } + (*value)++; + *end = '\0'; +- end++; ++ end = ++p; + } else { + end = skip_over_word(*value); + if (*end) { +diff --git a/libblkid/src/save.c b/libblkid/src/save.c +index 8216f09..5e8bbee 100644 +--- a/libblkid/src/save.c b/libblkid/src/save.c +@@ -26,6 +26,21 @@ + + #include blkidP.h + ++ ++static void save_quoted(const char *data, FILE *file) ++{ ++ const char *p; ++ ++ fputc('', file); ++ for (p = data; p *p; p++) { ++ if ((unsigned char) *p == 0x22 || /* */ ++ (unsigned char) *p == 0x5c) /* \ */ ++ fputc('\\', file); ++ ++ fputc(*p, file); ++ } ++ fputc('', file); ++} + static int save_dev(blkid_dev dev, FILE *file) + { + struct list_head *p; +@@ -43,9 +58,14 @@ static int save_dev(blkid_dev dev, FILE *file) + + if (dev-bid_pri) + fprintf(file, PRI=\%d\, dev-bid_pri); ++ + list_for_each(p, dev-bid_tags) { + blkid_tag tag = list_entry(p, struct blkid_struct_tag, bit_tags); +- fprintf(file, %s=\%s\, tag-bit_name,tag-bit_val); ++ ++ fputc(' ', file); /* space between tags */ ++ fputs(tag-bit_name, file); /* tag NAME */ ++ fputc('=', file); /* separator between NAME and VALUE */ ++ save_quoted(tag-bit_val, file);/* tag
[OE-core] [PATCH 0/1] util-linux: fix CVE-2014-9114
The following changes since commit 99f209a49a4390192b95184ff86bd6f973010111: layer.conf: bump version as error-report interface changed (2015-03-10 17:44:56 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib ChenQi/util-linux-CVE-2014-9114 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/util-linux-CVE-2014-9114 Chen Qi (1): util-linux: fix CVE-2014-9114 .../util-linux/util-linux/CVE-2014-9114.patch | 174 + meta/recipes-core/util-linux/util-linux_2.25.2.bb | 1 + 2 files changed, 175 insertions(+) create mode 100644 meta/recipes-core/util-linux/util-linux/CVE-2014-9114.patch -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] util-linux: split libraries dynamically
util-linux has a number of utility libraries and not noticing a new one being added in an upgrade results in many of the split-out core tools depending on the entire package for the library. To prevent this happening in the future do the library packaging dynamically. As a side-effect libsmartcols.so is no longer packaged in util-linux so util-linux-fdisk no longer depends on the full util-linux. Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/recipes-core/util-linux/util-linux.inc | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index dd607ef..4cca897 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -27,8 +27,7 @@ SRC_URI = ${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin PACKAGES =+ util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ util-linux-swaponoff util-linux-losetup util-linux-umount \ - util-linux-mount util-linux-readprofile util-linux-libblkid \ - util-linux-libmount util-linux-libuuid util-linux-uuidd \ + util-linux-mount util-linux-readprofile util-linux-uuidd \ util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ util-linux-mkfs util-linux-mcookie util-linux-reset \ util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \ @@ -36,6 +35,8 @@ PACKAGES =+ util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd util-linux-findfs util-linux-getopt PACKAGES += ${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)} +PACKAGES_DYNAMIC = ^util-linux-lib.* + SHARED_EXTRA_OECONF = --disable-use-tty-group \ --disable-makeinstall-chown \ --enable-kill --enable-last --enable-mesg --enable-partx \ @@ -85,11 +86,8 @@ FILES_util-linux-hwclock = ${base_sbindir}/hwclock.${BPN} FILES_util-linux-findfs = ${sbindir}/findfs FILES_util-linux-getopt = ${base_bindir}/getopt.${BPN} -FILES_util-linux-libblkid = ${base_libdir}/libblkid.so.* -FILES_util-linux-libmount = ${base_libdir}/libmount.so.* FILES_util-linux-pylibmount = ${libdir}/${PYTHON_DIR}/dist-packages/libmount/pylibmount.so \ ${libdir}/${PYTHON_DIR}/dist-packages/libmount/__init__.* -FILES_util-linux-libuuid = ${base_libdir}/libuuid.so.* FILES_util-linux-lscpu = ${bindir}/lscpu FILES_util-linux-fsck = ${base_sbindir}/fsck* @@ -243,3 +241,10 @@ python do_package_prepend () { d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, '%s/%s' % (d.getVar('base_bindir', True), alt_name)) d.appendVar('ALTERNATIVE_%s' % (d.getVar('PN', True)), ' ' + alt_name) } + +python populate_packages_prepend() { +do_split_packages(d, '${base_libdir}', '^lib(.*)\.so\..*$', + output_pattern='util-linux-lib%s', + description='util-linux lib%s', + extra_depends='', prepend=True, allow_links=True) +} -- 1.7.10.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/4] license.bbclass: set dirs for do_populate_lic_setscene
On Wed, Mar 11, 2015 at 1:35 AM, Robert Yang liezhi.y...@windriver.com wrote: Fixed: ERROR: Build of do_populate_lic failed ERROR: Traceback (most recent call last): File bitbake/lib/bb/build.py, line 497, in exec_task return _exec_task(fn, task, d, quieterr) File bitbake/lib/bb/build.py, line 437, in _exec_task exec_func(func, localdata) File bitbake/lib/bb/build.py, line 212, in exec_func exec_func_python(func, d, runfile, cwd=adir) File /home/nxadm/nx/ala-blade44.1/builds-2015-03-09-163005/qemuppc_world_oe_bp/ bitbake/lib/bb/build.py, line 237, in exec_func_python os.chdir(cwd) OSError: [Errno 2] No such file or directory: 'bitbake_build/tmp/work/ppc7400-wrs-linux/taglib/1.9.1-r0/build' When running setscene, the cwd is $B which maybe removed by autotools.bbclass or cmake.bbclass when rebuild. Signed-off-by: Robert Yang liezhi.y...@windriver.com For reference: https://bugzilla.yoctoproject.org/show_bug.cgi?id=4634 -- Christopher Larson clarson at kergoth dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] systemd: Instruct the journal to always be volatile
On Wed, Mar 11, 2015 at 9:18 PM, randy.e.w...@linux.intel.com wrote: On Mar 11, 2015, at 2:28 PM, Randy Witt randy.e.w...@linux.intel.com wrote: When the storage mode for the journal is auto if /var/log/journal exists then the journal will flush to /var/log/journal assuming that /var/log/journal is persistent. However /var/log - /var/volatile/log in poky, so even though /var/log/journal exists, it is still volatile. Since this can cause ordering issues due to /var/volatile needing to be mounted before the journal actually writes to it, just specify that the journal should always be volatile and never try to write to persistent storage. The journal will exist in /run/log/journal only. This also disables the After of the journal on var-volatile.mount since the ordering is no longer necessary when the journal is only stored in /run/log/journal. [Yocto #7388] This is not right. What if I want persistent logs.? the options is just gone. Both cases should work. /var/volatile should only be used when doing ro-rfs its not FHS specified anyway. Lets not go with this patch. The distro could still change it with a bbappend or additional configuration files just like other settings. We don't have an option for a persistent journal so I'm curious, how would both cases work currently? No they dont and I have posted a patch which potentially should. Currently if a persistent journal is desired, the /var/log symlink has to be changed to point to persistent storage, or /var/volatile has to be dropped from /etc/fstab. These are also configuration changes. The lesser of the two evils seems to be making it so that the journal works in the volatile case, which is all we've ever supported in poky. If a user wanted a non-volatile journal it was left to them to do. poky is not only the distro thats fed with OE-Core there are several open ones and several which are maintained by companies I agree that the journal should be persistent, but I also agree with Richard that seems to be too big of a change in behavior when we're so close to the release point. what makes you think the change you posted is not intrusive, we have a regression compared to last release, this patch does not fix the regression, it infact pacifies some errors which are new and creates yet another behavior. think of people who will be migrating from 1.7 to 1.8 problems should be solved in best possible way. I am fine with whatever is accepted solution. I have no interest in push one or the other I do have a solution which fixes my problems therefore I am less concerned. Carrying a couple of local reverts it not a big of a deal. -Khem -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] systemd: Instruct the journal to always be volatile
On Mar 11, 2015, at 2:28 PM, Randy Witt randy.e.w...@linux.intel.com wrote: When the storage mode for the journal is auto if /var/log/journal exists then the journal will flush to /var/log/journal assuming that /var/log/journal is persistent. However /var/log - /var/volatile/log in poky, so even though /var/log/journal exists, it is still volatile. Since this can cause ordering issues due to /var/volatile needing to be mounted before the journal actually writes to it, just specify that the journal should always be volatile and never try to write to persistent storage. The journal will exist in /run/log/journal only. This also disables the After of the journal on var-volatile.mount since the ordering is no longer necessary when the journal is only stored in /run/log/journal. [Yocto #7388] This is not right. What if I want persistent logs.? the options is just gone. Both cases should work. /var/volatile should only be used when doing ro-rfs its not FHS specified anyway. Lets not go with this patch. The distro could still change it with a bbappend or additional configuration files just like other settings. We don't have an option for a persistent journal so I'm curious, how would both cases work currently? Currently if a persistent journal is desired, the /var/log symlink has to be changed to point to persistent storage, or /var/volatile has to be dropped from /etc/fstab. These are also configuration changes. The lesser of the two evils seems to be making it so that the journal works in the volatile case, which is all we've ever supported in poky. If a user wanted a non-volatile journal it was left to them to do. I agree that the journal should be persistent, but I also agree with Richard that seems to be too big of a change in behavior when we're so close to the release point. Signed-off-by: Randy Witt randy.e.w...@linux.intel.com --- meta/recipes-core/systemd/systemd/journald-volatile.conf | 6 -- meta/recipes-core/systemd/systemd_219.bb | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/journald-volatile.conf diff --git a/meta/recipes-core/systemd/systemd/journald-volatile.conf b/meta/recipes-core/systemd/systemd/journald-volatile.conf deleted file mode 100644 index b11e160..000 --- a/meta/recipes-core/systemd/systemd/journald-volatile.conf +++ /dev/null @@ -1,6 +0,0 @@ -# If /var/volatile is a mount point then make sure to mount it before -# the journal starts. This is because base-files creates a symlink -# /var/log - /var/volatile/log. And if the journal starts before the mount -# happens, the journal will appear empty until restarted. -[Unit] -After=var-volatile.mount diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb index d5eed08..f3bb0c4 100644 --- a/meta/recipes-core/systemd/systemd_219.bb +++ b/meta/recipes-core/systemd/systemd_219.bb @@ -48,7 +48,6 @@ SRC_URI = git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol= file://00-create-volatile.conf \ file://init \ file://run-ptest \ - file://journald-volatile.conf \ S = ${WORKDIR}/git @@ -145,7 +144,6 @@ do_install() { install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ -install -D -m 0644 ${WORKDIR}/journald-volatile.conf ${D}${systemd_unitdir}/system/systemd-journald.service.d/journald-volatile.conf if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then install -d ${D}${sysconfdir}/init.d @@ -170,6 +168,8 @@ do_install() { # Enable journal to forward message to syslog daemon sed -i -e 's/.*ForwardToSyslog.*/ForwardToSyslog=yes/' ${D}${sysconfdir}/systemd/journald.conf +# Make the journal volatile by default. +sed -i -e 's/.*Storage.*/Storage=volatile/' ${D}${sysconfdir}/systemd/journald.conf # its needed in 216 upstream has fixed it with 919699ec301ea507edce4a619141ed22e789ac0d # don't order journal flushing afte remote-fs.target sed -i -e 's/ remote-fs.target$//' ${D}${systemd_unitdir}/system/systemd-journal-flush.service -- 1.9.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] rootfs.py: fix logic error so that warnings are checked
The following changes since commit 99f209a49a4390192b95184ff86bd6f973010111: layer.conf: bump version as error-report interface changed (2015-03-10 17:44:56 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib ChenQi/rootfs-log-check http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/rootfs-log-check Chen Qi (1): rootfs.py: fix logic error so that warnings are checked meta/lib/oe/rootfs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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] rootfs.py: fix logic error so that warnings are checked
The following commit caused log checking for warnings not working for RPM rootfs. rootfs.py: ignore NOTE: when catching warnings The problem is that checking for warnings is always skipped because the following statement is always true. if 'log_check' or 'NOTE:' in line: This patch fixes the above problem so that warning checking in RPM rootfs can work again. Signed-off-by: Chen Qi qi.c...@windriver.com --- meta/lib/oe/rootfs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index dd7aa44..7e8d5d1 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -359,7 +359,7 @@ class RpmRootfs(Rootfs): log_path = self.d.expand(${T}/log.do_rootfs) with open(log_path, 'r') as log: for line in log.read().split('\n'): -if 'log_check' or 'NOTE:' in line: +if 'log_check' in line or 'NOTE:' in line: continue m = r.search(line) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core