[OE-core] [PATCH 0/5] V2: Redirect output of postinstall scripts
When image feature "debug-tweaks" enabled, redirect output of postinstall scripts to a log file when image first boot. [YOCTO #3223] The following changes since commit 2cc4fe4a0874c42421b1bf3fa100160a9e60a9da: upstream_tracking.inc: Coonectivity and multimedia packages updates (2013-02-25 05:58:20 -0800) are available in the git repository at: git://git.pokylinux.org/poky-contrib kangkai/debug-tweaks http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/debug-tweaks Kang Kai (5): opkg: save output of postinst scripts when image first boot rootfs_deb: remove run-postinsts from ROOTFS_PKGMANAGE dpkg: save output of postinstall scripts when image firstboot rootfs_rpm: move run-postinsts scripts to rpm recipe rpm: save output of postinstall scripts when image first boot meta/classes/rootfs_deb.bbclass|2 +- meta/classes/rootfs_rpm.bbclass| 23 --- meta/recipes-devtools/dpkg/dpkg.inc|8 +--- meta/recipes-devtools/opkg/opkg.inc|5 - meta/recipes-devtools/rpm/rpm_5.4.9.bb | 27 +++ 5 files changed, 37 insertions(+), 28 deletions(-) -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] rootfs_rpm: move run-postinsts scripts to rpm recipe
Move run-postinsts scripts from rootfs_rpm.bbclass to rpm recipe. That is the same way for dpkg and opkg to deal the post install scripts. Signed-off-by: Kang Kai --- meta/classes/rootfs_rpm.bbclass| 23 --- meta/recipes-devtools/rpm/rpm_5.4.9.bb | 23 +++ 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index 9dc2bf9..3442d48 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass @@ -29,11 +29,6 @@ do_rootfs[vardepsexclude] += "BUILDNAME" RPM_PREPROCESS_COMMANDS = "package_update_index_rpm; " RPM_POSTPROCESS_COMMANDS = "rpm_setup_smart_target_config; " -# -# Allow distributions to alter when [postponed] package install scripts are run -# -POSTINSTALL_INITPOSITION ?= "98" - rpmlibdir = "/var/lib/rpm" opkglibdir = "${localstatedir}/lib/opkg" @@ -114,24 +109,6 @@ fakeroot rootfs_rpm_do_rootfs () { fi done - install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d - # Stop $i getting expanded below... - i=\$i - cat > ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts << EOF -#!/bin/sh -for i in \`ls /etc/rpm-postinsts/\`; do - i=/etc/rpm-postinsts/$i - echo "Running postinst $i..." - if [ -f $i ] && $i; then - rm $i - else - echo "ERROR: postinst $i failed." - fi -done -rm -f ${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts -EOF - chmod 0755 ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts - install -d ${IMAGE_ROOTFS}/${sysconfdir} echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb index 39b0481..0b014b6 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb @@ -369,6 +369,11 @@ do_configure() { oe_runconf } +# +# Allow distributions to alter when [postponed] package install scripts are run +# +POSTINSTALL_INITPOSITION ?= "98" + do_install_append() { sed -i -e 's,%__check_files,#%%__check_files,' ${D}/${libdir}/rpm/macros sed -i -e 's,%__scriptlet_requires,#%%__scriptlet_requires,' ${D}/${libdir}/rpm/macros @@ -445,6 +450,24 @@ do_install_append() { rm -rf ${D}/var/lib/wdj ${D}/var/cache/wdj rm -f ${D}/${libdir}/rpm/bin/api-sanity-checker.pl + + install -d ${D}/${sysconfdir}/rcS.d + # Stop $i getting expanded below... + i=\$i + cat > ${D}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts << EOF +#!/bin/sh +for i in \`ls /etc/rpm-postinsts/\`; do + i=/etc/rpm-postinsts/$i + echo "Running postinst $i..." + if [ -f $i ] && $i; then + rm $i + else + echo "ERROR: postinst $i failed." + fi +done +rm -f ${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts +EOF + chmod 0755 ${D}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts } do_install_append_class-native() { -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] dpkg: save output of postinstall scripts when image firstboot
When image feature "debug-tweaks" enabled, save output of postinstall scripts to log file /var/log/postinstall.log when image first boot. And the log file can be configured. It also needs image feature "package-management" enabled. If not, package run-postinsts will be installed and then all packages will be configured by it. Command 'dpkg --configure' outputs nothing. [YOCTO #3223] Signed-off-by: Kang Kai --- meta/recipes-devtools/dpkg/dpkg.inc |8 +--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index fd26c8a..0bc1ae8 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Package maintenance system for Debian." LICENSE = "GPLv2.0+" SECTION = "base" -INC_PR = "r18" +INC_PR = "r19" SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.xz \ file://ignore_extra_fields.patch" @@ -35,13 +35,15 @@ do_configure () { autotools_do_configure } +POSTLOG ?= "/var/log/postinstall.log" +REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>${POSTLOG} 2>&1', '', d)}" DPKG_INIT_POSITION ?= "98" do_install_prepend () { install -d ${D}/${sysconfdir}/rcS.d # this happens at S98 where our good 'ole packages script used to run - printf "#!/bin/sh -dpkg --configure -a + echo "#!/bin/sh +dpkg --configure -a ${REDIRECT_CMD} rm -f ${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts " > ${D}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts chmod 0755 ${D}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] opkg: save output of postinst scripts when image first boot
When image feature "debug-tweaks" enabled, save output of postinstall scripts to log file /var/log/postinstall.log when image first boot. And the log file can be configured. It also needs image feature "package-management" enabled. If not, package run-postinsts will be installed and then all packages will be configured by it. Command 'opkg configure' outputs nothing. [YOCTO #3223] Signed-off-by: Kang Kai --- meta/recipes-devtools/opkg/opkg.inc |5 - 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc index 8d48006..f9c1202 100644 --- a/meta/recipes-devtools/opkg/opkg.inc +++ b/meta/recipes-devtools/opkg/opkg.inc @@ -57,13 +57,16 @@ do_install_append_class-native() { fi } +POSTLOG ?= "/var/log/postinstall.log" +REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>${POSTLOG} 2>&1', '', d)}" + pkg_postinst_${PN} () { #!/bin/sh if [ "x$D" != "x" ]; then install -d $D${sysconfdir}/rcS.d # this happens at S98 where our good 'ole packages script used to run echo "#!/bin/sh -opkg-cl configure +opkg-cl configure ${REDIRECT_CMD} rm -f /${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts " > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] rootfs_deb: remove run-postinsts from ROOTFS_PKGMANAGE
Remove package run-postinsts from ROOTFS_PKGMANAGE. run-postinsts has already added in ROOTFS_PKGMANAGE_BOOTSTRAP and then added to rootfs conditionally by checking image feature "package-management". Signed-off-by: Kang Kai --- meta/classes/rootfs_deb.bbclass |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass index 92a6579..a3c3767 100644 --- a/meta/classes/rootfs_deb.bbclass +++ b/meta/classes/rootfs_deb.bbclass @@ -2,7 +2,7 @@ # Copyright 2006-2007 Openedhand Ltd. # -ROOTFS_PKGMANAGE = "run-postinsts dpkg apt" +ROOTFS_PKGMANAGE = "dpkg apt" ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts" do_rootfs[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot" -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] rpm: save output of postinstall scripts when image first boot
When image feature "debug-tweaks" is enabled, save output of post install script to log file which can be configured when image first boot. [YOCTO #3223] Signed-off-by: Kang Kai --- meta/recipes-devtools/rpm/rpm_5.4.9.bb |6 +- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb index 0b014b6..cdfb5ff 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb @@ -223,6 +223,7 @@ FILES_${PN} = "${bindir}/rpm \ ${libdir}/rpm/bin/wget \ /var/lib/rpm \ /var/cache/rpm \ + ${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts \ " FILES_${PN}-dbg += "${libdir}/rpm/.debug \ @@ -374,6 +375,9 @@ do_configure() { # POSTINSTALL_INITPOSITION ?= "98" +POSTLOG ?= "/var/log/postinstall.log" +REDIRECT_CMD = "${@base_contains('IMAGE_FEATURES', 'debug-tweaks', '>>${POSTLOG} 2>&1', '', d)}" + do_install_append() { sed -i -e 's,%__check_files,#%%__check_files,' ${D}/${libdir}/rpm/macros sed -i -e 's,%__scriptlet_requires,#%%__scriptlet_requires,' ${D}/${libdir}/rpm/macros @@ -459,7 +463,7 @@ do_install_append() { for i in \`ls /etc/rpm-postinsts/\`; do i=/etc/rpm-postinsts/$i echo "Running postinst $i..." - if [ -f $i ] && $i; then + if [ -f $i ] && $i ${REDIRECT_CMD}; then rm $i else echo "ERROR: postinst $i failed." -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/5] automake-1.13 and upstream version updates
On 26 February 2013 09:52, Saul Wold wrote: > > There seems to be some issue lurking here with configure and libtool. > > Sau! libffi seems to include all the libtool m4-files, updated between libffi-3.0.11 and libffi-3.0.12. These might be incompatible with libtool files in your system, or does the build force them to be replaced (libtoolize -f)? I've got around a bit similar problems (not in OE, but building in general) by simply deleting m4/libtool.m4 m4/lt*.m4 from the project, and letting libtoolize/autoreconf to place correct versions there instead. Could you test that? - ML ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] lsbtest: sync test suite packages version
Update file packages_list after sync test suite packages version with upstream. Check date: Feb 20, 2103 Bump up PR. Signed-off-by: Kang Kai --- meta/recipes-extended/lsb/lsbtest/packages_list | 10 +- meta/recipes-extended/lsb/lsbtest_1.0.bb|2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/recipes-extended/lsb/lsbtest/packages_list b/meta/recipes-extended/lsb/lsbtest/packages_list index c3172e0..dc3c002 100644 --- a/meta/recipes-extended/lsb/lsbtest/packages_list +++ b/meta/recipes-extended/lsb/lsbtest/packages_list @@ -3,22 +3,22 @@ LSB_ARCH="lsbarch" BASE_PACKAGES_LIST="lsb-setup-4.1.0-1.noarch.rpm" -RUNTIME_BASE_PACKAGES_LIST="lsb-dist-checker-4.1.0.10-2.targetarch.rpm \ +RUNTIME_BASE_PACKAGES_LIST="lsb-dist-checker-4.1.0.11-1.targetarch.rpm \ lsb-tet3-lite-3.7-23.lsb4.targetarch.rpm \ lsb-tet3-lite-devel-3.7-23.lsb4.targetarch.rpm \ lsb-xvfb-1.2.0-21.targetarch.rpm \ " -RUNTIME_PACKAGES_LIST="lsb-cmdchk-4.1.4-2.targetarch.rpm \ - lsb-libchk-4.1.4-2.targetarch.rpm \ +RUNTIME_PACKAGES_LIST="lsb-cmdchk-4.1.4-3.targetarch.rpm \ + lsb-libchk-4.1.4-3.targetarch.rpm \ lsb-qm-2.2-8.lsb4.targetarch.rpm \ - lsb-task-dist-testkit-4.1.2-1.noarch.rpm \ + lsb-task-dist-testkit-4.1.3-1.noarch.rpm \ lsb-test-core-4.1.12-2.targetarch.rpm \ lsb-test-cpp-t2c-4.1.0-1.targetarch.rpm \ lsb-test-desktop-4.1.7-1.targetarch.rpm \ lsb-test-desktop-t2c-4.1.2-2.targetarch.rpm \ lsb-test-libstdcpp-4.1.0-18.lsb4.targetarch.rpm \ - lsb-test-olver-core-4.1.3-7.targetarch.rpm \ + lsb-test-olver-core-4.1.4-1.targetarch.rpm \ lsb-test-perl-4.1.6-2.noarch.rpm \ lsb-test-printing-4.1.2-1.targetarch.rpm \ lsb-test-python-4.1.5-1.targetarch.rpm \ diff --git a/meta/recipes-extended/lsb/lsbtest_1.0.bb b/meta/recipes-extended/lsb/lsbtest_1.0.bb index 3dcfc0d..8973e09 100644 --- a/meta/recipes-extended/lsb/lsbtest_1.0.bb +++ b/meta/recipes-extended/lsb/lsbtest_1.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "automate test for lsb" SECTION = "console/utils" LICENSE = "GPLv2" -PR = "r2" +PR = "r3" LIC_FILES_CHKSUM = "file://LSB_Test.sh;beginline=3;endline=16;md5=7063bb54b04719df0716b513447f4fc0" -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Update lsb packages version list
The following changes since commit 2cc4fe4a0874c42421b1bf3fa100160a9e60a9da: upstream_tracking.inc: Coonectivity and multimedia packages updates (2013-02-25 05:58:20 -0800) are available in the git repository at: git://git.pokylinux.org/poky-contrib kangkai/update-lsb http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/update-lsb Kang Kai (1): lsbtest: sync test suite packages version meta/recipes-extended/lsb/lsbtest/packages_list | 10 +- meta/recipes-extended/lsb/lsbtest_1.0.bb|2 +- 2 files changed, 6 insertions(+), 6 deletions(-) -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] gst-plugins-bad and EXTRA_OECONF
Hi, recently my builds fail with obscure errors like: gst-plugins-bad: | /usr/lib/x86_64-linux-gnu/libxml2.so: file not recognized: File format not recognized | collect2: error: ld returned 1 exit status This is caused by sdl-config from my buildhost, though gst-plugins-bad has EXTRA_OECONF += "... --disable-sdl ... --disable-orc" It seems to be ignored: checking for ORC... yes checking for usable orcc... /work/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/orcc ... configure: *** checking feature: SDL plug-in *** configure: *** for plug-ins: sdlvideosink sdlaudiosink *** checking for sdl-config... /usr/bin/sdl-config checking for SDL - version >= 0.11.0... cross compiling; assumed OK... yes configure: *** These plugins will be built: sdlvideosink sdlaudiosink Maybe anyone can reproduce this error with: bitbake -ccleansstate libsdl gst-plugins-bad && bitbake gst-plugins-bad (eventually manual deletion of sdl-config in /usr/bin/crosscripts is necessary) Is this a known bug? -- Regards Samuel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] lttng-ust: cannot find -llttng-ust-tracepoint
The following changes since commit 2cc4fe4a0874c42421b1bf3fa100160a9e60a9da: upstream_tracking.inc: Coonectivity and multimedia packages updates (2013-02-25 05:58:20 -0800) are available in the git repository at: git://git.pokylinux.org/poky-contrib robert/lttng-ust http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/lttng-ust Robert Yang (1): lttng-ust: cannot find -llttng-ust-tracepoint .../lttng-ust/depends-liblttng-ust-tracepoin.patch | 30 ++ meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb | 4 ++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch -- 1.7.11.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] lttng-ust: cannot find -llttng-ust-tracepoint
liblttng_ust.la should depend on liblttng-ust-tracepoint.la, otherwise there maybe a parallel build issue when building liblttng_ust.la: ld: cannot find -llttng-ust-tracepoint [YOCTO #3934] Signed-off-by: Robert Yang --- .../lttng-ust/depends-liblttng-ust-tracepoin.patch | 30 ++ meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb | 4 ++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch diff --git a/meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch b/meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch new file mode 100644 index 000..458a8d4 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch @@ -0,0 +1,30 @@ +liblttng_ust.la should depend on liblttng-ust-tracepoint.la + +liblttng_ust.la should depend on liblttng-ust-tracepoint.la, otherwise +there maybe a parallel build issue: + +ld: cannot find -llttng-ust-tracepoint + +Upstream-Status: Pending + +Signed-off-by: Robert Yang +--- + liblttng-ust/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am +--- a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am +@@ -67,7 +67,8 @@ liblttng_ust_la_LIBADD = \ + -llttng-ust-tracepoint \ + $(top_builddir)/snprintf/libustsnprintf.la \ + $(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \ +- liblttng-ust-runtime.la liblttng-ust-support.la ++ liblttng-ust-runtime.la liblttng-ust-support.la \ ++ liblttng-ust-tracepoint.la + + if LTTNG_UST_BUILD_WITH_LIBUUID + liblttng_ust_la_LIBADD += -luuid +-- +1.7.11.2 + diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb b/meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb index 20c8b3d..6c2ca04 100644 --- a/meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb +++ b/meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb @@ -22,7 +22,9 @@ PV = "2.1.0" PR = "r0" PE = "2" -SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git" +SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git \ + file://depends-liblttng-ust-tracepoin.patch \ + " S = "${WORKDIR}/git" -- 1.7.11.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/7] Create ext* filesystems using debugfs
===Contents=== * Summary * Brief design * Test info * The rootfs generation time changes * The rootfs size changes * Summary: The ext3 and ext4 rootfs generation relied on genext2fs and flipping some bits to "convert" the ext2 filesystem to ext3 and ext4 in the past, now we use the mkfs.ext3/ext4 to create the image, and use mkdebugfs.sh to copy the files to the image. * Brief design: - Upgrade the e2fsprogs to the update to date version (the git repo) which contains the "symlink" command in debugfs shell that we need. - Replace the current genext2fs command with mkdebugfs.sh in image_types.bbclass. - The new steps to generate the root filesystem are: -> use "dd" command to make rootfs.ext* file -> run "mkfs.ext* rootfs.ext*" to create the filesystem -> run the mkdebugfs.sh to generate the root filesystem * Test info: (MACHINE = qemuarm, IMAGE_FSTYPES = "ext2 ext3 ext4 tar.bz2") $ bitbake core-image-minimal core-image-sato meta-toolchain-sdk core-image-sato-sdk $ runqemu runqemu qemuarm core-image-sato ext3 $ runqemu runqemu qemuarm core-image-minimal ext3 All of them are OK * The rootfs generation time changes - For a core-image-minimal generation (IMAGE_FSTYPES="tar.bz2 ext3"): Before: $ time bitbake core-image-minimal real1m10.823s user0m37.108s sys 0m15.894s After: $ time bitbake core-image-minimal real1m17.501s user0m29.304s sys 0m20.731s # 7 seconds lost. - For a core-image-sato generation (IMAGE_FSTYPES="tar.bz2 ext3"): Before: $ time bitbake core-image-sato real11m10.645s user2m43.503s sys 1m1.589s After: $ time bitbake core-image-sato real11m53.131s user3m18.988s sys 2m8.350s # 43 seconds lost. * The rootfs size changes - The image size are the same by "ls -h", but different by "du -sh": (core-image-sato) $ ls -lh BEFORE.rootfs.ext3 AFTER.rootfs.ext3 | awk '{print $5"\t"$NF}' 357M BEFORE.rootfs.ext3 357M AFTER.rootfs.ext3 $ du -sh BEFORE.rootfs.ext3 AFTER.rootfs.ext3 238MBEFORE.rootfs.ext3 357MAFTER.rootfs.ext3 It seems that the genext2fs has optimized the rootfs generation. // Robert The following changes since commit 2cc4fe4a0874c42421b1bf3fa100160a9e60a9da: upstream_tracking.inc: Coonectivity and multimedia packages updates (2013-02-25 05:58:20 -0800) are available in the git repository at: git://git.pokylinux.org/poky-contrib robert/e2fsprogs http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/e2fsprogs Robert Yang (7): e2fsprogs: upgrade to the git version (rename only) e2fsprogs: upgrade to the git version e2fsprogs: add the original mkdebugfs.sh mkdebugfs.sh: convert the tab to 4 spaces mkdebugfs.sh: several fixes e2fsprogs: ship mkfsdebug.sh image_types.bbclass: replace genext2fs with mkdebugfs.sh meta/classes/image_types.bbclass | 45 +--- meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 4 +- .../{e2fsprogs-1.42.6 => e2fsprogs}/acinclude.m4 | 0 .../fallocate.patch| 0 .../e2fsprogs/e2fsprogs/mkdebugfs.sh | 82 ++ .../{e2fsprogs-1.42.6 => e2fsprogs}/mkdir.patch| 0 .../remove.ldconfig.call.patch | 0 .../{e2fsprogs_1.42.6.bb => e2fsprogs_git.bb} | 6 +- 8 files changed, 106 insertions(+), 31 deletions(-) rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42.6 => e2fsprogs}/acinclude.m4 (100%) rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42.6 => e2fsprogs}/fallocate.patch (100%) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdebugfs.sh rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42.6 => e2fsprogs}/mkdir.patch (100%) rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42.6 => e2fsprogs}/remove.ldconfig.call.patch (100%) rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.42.6.bb => e2fsprogs_git.bb} (92%) -- 1.7.11.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/7] e2fsprogs: upgrade to the git version (rename only)
We will replace the "genext2fs" command in the bbclass with the debugfs command from e2fsprogs, and we need the "symlink" subcommand in the debugfs which only exists in the up-to-date git repo currently, so change the source to use the git repo. renamed:e2fsprogs-1.42.6/acinclude.m4 -> e2fsprogs/acinclude.m4 renamed:e2fsprogs-1.42.6/fallocate.patch -> e2fsprogs/fallocate.patch renamed:e2fsprogs-1.42.6/mkdir.patch -> e2fsprogs/mkdir.patch renamed:e2fsprogs-1.42.6/remove.ldconfig.call.patch -> e2fsprogs/remove.ldconfig.call.patch renamed:e2fsprogs_1.42.6.bb -> e2fsprogs_git.bb [YOCTO #3848] Signed-off-by: Robert Yang --- .../e2fsprogs/{e2fsprogs-1.42.6 => e2fsprogs}/acinclude.m4| 0 .../e2fsprogs/{e2fsprogs-1.42.6 => e2fsprogs}/fallocate.patch | 0 .../e2fsprogs/{e2fsprogs-1.42.6 => e2fsprogs}/mkdir.patch | 0 .../e2fsprogs/{e2fsprogs-1.42.6 => e2fsprogs}/remove.ldconfig.call.patch | 0 meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.42.6.bb => e2fsprogs_git.bb} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42.6 => e2fsprogs}/acinclude.m4 (100%) rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42.6 => e2fsprogs}/fallocate.patch (100%) rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42.6 => e2fsprogs}/mkdir.patch (100%) rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42.6 => e2fsprogs}/remove.ldconfig.call.patch (100%) rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.42.6.bb => e2fsprogs_git.bb} (100%) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.6/acinclude.m4 b/meta/recipes-devtools/e2fsprogs/e2fsprogs/acinclude.m4 similarity index 100% rename from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.6/acinclude.m4 rename to meta/recipes-devtools/e2fsprogs/e2fsprogs/acinclude.m4 diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.6/fallocate.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/fallocate.patch similarity index 100% rename from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.6/fallocate.patch rename to meta/recipes-devtools/e2fsprogs/e2fsprogs/fallocate.patch diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.6/mkdir.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir.patch similarity index 100% rename from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.6/mkdir.patch rename to meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir.patch diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.6/remove.ldconfig.call.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/remove.ldconfig.call.patch similarity index 100% rename from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.6/remove.ldconfig.call.patch rename to meta/recipes-devtools/e2fsprogs/e2fsprogs/remove.ldconfig.call.patch diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.6.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb similarity index 100% rename from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.6.bb rename to meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb -- 1.7.11.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/7] e2fsprogs: add the original mkdebugfs.sh
This script is from Darren Hart, it will be used for creating the extX filesystem from a given directory, which will replace the genext2fs in image_types.bbclass. It isn't shipp in e2fsprogs package at the moment, just add it intact, and will do more work on it in the following commits. [YOCTO #3848] Signed-off-by: Robert Yang --- .../e2fsprogs/e2fsprogs/mkdebugfs.sh | 49 ++ 1 file changed, 49 insertions(+) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdebugfs.sh diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdebugfs.sh b/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdebugfs.sh new file mode 100644 index 000..5dfa380 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdebugfs.sh @@ -0,0 +1,49 @@ +#!/bin/sh +SRCDIR=$1 +DEVICE=$2 +DEBUGFS="debugfs/debugfs" + +yes | mkfs.ext4 test.img + +{ + CWD="/" + find $SRCDIR | while read FILE; do + #TGT=${FILE#$SRCDIR} + TGT=$(basename "${FILE#$SRCDIR}") + DIR=$(dirname "${FILE#$SRCDIR}") + + # Skip the root dir + if [ -z "$TGT" ]; then + continue + fi + + if [ "$DIR" != "$CWD" ]; then + echo "cd $DIR" + CWD="$DIR" + fi + + case $(stat -c "%F" $FILE) in + "directory") + echo "mkdir $TGT" + ;; + "regular file") + echo "write $FILE $TGT" + ;; + "symbolic link") + LINK_TGT=$(ls -l $FILE | sed -e 's/.*-> //') + echo "symlink $TGT $LINK_TGT" + ;; + "block special file") + DEVNO=$(stat -c "%t %T" $FILE) + echo "mknod $TGT b $DEVNO" + ;; + "character special file") + DEVNO=$(stat -c "%t %T" $FILE) + echo "mknod $TGT c $DEVNO" + ;; + *) + echo "Unknown file $FILE" 1>&2 + ;; + esac + done +} | $DEBUGFS -w -f /dev/stdin $DEVICE -- 1.7.11.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/7] e2fsprogs: upgrade to the git version
Change the source from tarball to git repo, and upgrade it to the up-to-date git version. [YOCTO #3848] Signed-off-by: Robert Yang --- meta/recipes-devtools/e2fsprogs/e2fsprogs.inc| 4 +++- meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc index aea74f7..d8ae037 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc @@ -19,8 +19,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b48f21d765b875bd10400975d12c1ca2 \ SECTION = "base" DEPENDS = "util-linux" -SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \ +SRC_URI = "git://git.kernel.org/pub/scm/fs/ext2/${BPN}.git;protocol=git \ file://mkdir.patch" +S = "${WORKDIR}/git" + inherit autotools gettext diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb index e6d90a1..70255ce 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb @@ -6,8 +6,8 @@ SRC_URI += "file://acinclude.m4 \ file://remove.ldconfig.call.patch \ " -SRC_URI[md5sum] = "9e444c240c1001b3292d108fbad0f49c" -SRC_URI[sha256sum] = "726b5919edeaee5b077d7a5b602284f1453ea31cf499efa433af26c679b667a5" +SRCREV = "fca8b1b2416c384b91b4fe00d6d37cfccb8fb3d5" +PV = "1.43-WIP+git${SRCPV}" EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid --disable-uuidd" EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs" -- 1.7.11.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/7] mkdebugfs.sh: convert the tab to 4 spaces
[YOCTO #3848] Signed-off-by: Robert Yang --- .../e2fsprogs/e2fsprogs/mkdebugfs.sh | 74 +++--- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdebugfs.sh b/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdebugfs.sh index 5dfa380..41a13cb 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdebugfs.sh +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdebugfs.sh @@ -6,44 +6,44 @@ DEBUGFS="debugfs/debugfs" yes | mkfs.ext4 test.img { - CWD="/" - find $SRCDIR | while read FILE; do - #TGT=${FILE#$SRCDIR} - TGT=$(basename "${FILE#$SRCDIR}") - DIR=$(dirname "${FILE#$SRCDIR}") +CWD="/" +find $SRCDIR | while read FILE; do +#TGT=${FILE#$SRCDIR} +TGT=$(basename "${FILE#$SRCDIR}") +DIR=$(dirname "${FILE#$SRCDIR}") - # Skip the root dir - if [ -z "$TGT" ]; then - continue - fi +# Skip the root dir +if [ -z "$TGT" ]; then +continue +fi - if [ "$DIR" != "$CWD" ]; then - echo "cd $DIR" - CWD="$DIR" - fi +if [ "$DIR" != "$CWD" ]; then +echo "cd $DIR" +CWD="$DIR" +fi - case $(stat -c "%F" $FILE) in - "directory") - echo "mkdir $TGT" - ;; - "regular file") - echo "write $FILE $TGT" - ;; - "symbolic link") - LINK_TGT=$(ls -l $FILE | sed -e 's/.*-> //') - echo "symlink $TGT $LINK_TGT" - ;; - "block special file") - DEVNO=$(stat -c "%t %T" $FILE) - echo "mknod $TGT b $DEVNO" - ;; - "character special file") - DEVNO=$(stat -c "%t %T" $FILE) - echo "mknod $TGT c $DEVNO" - ;; - *) - echo "Unknown file $FILE" 1>&2 - ;; - esac - done +case $(stat -c "%F" $FILE) in +"directory") +echo "mkdir $TGT" +;; +"regular file") +echo "write $FILE $TGT" +;; +"symbolic link") +LINK_TGT=$(ls -l $FILE | sed -e 's/.*-> //') +echo "symlink $TGT $LINK_TGT" +;; +"block special file") +DEVNO=$(stat -c "%t %T" $FILE) +echo "mknod $TGT b $DEVNO" +;; +"character special file") +DEVNO=$(stat -c "%t %T" $FILE) +echo "mknod $TGT c $DEVNO" +;; +*) +echo "Unknown file $FILE" 1>&2 +;; +esac +done } | $DEBUGFS -w -f /dev/stdin $DEVICE -- 1.7.11.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/7] e2fsprogs: ship mkfsdebug.sh
Ship mkfsdebug.sh, it will be installed to /usr/bin/mkfsdebug.sh and used for replacing the genext2fs in image_types.bbclass. [YOCTO #3848] Signed-off-by: Robert Yang --- meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb index 70255ce..1609d42 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb @@ -4,6 +4,7 @@ PR = "r0" SRC_URI += "file://acinclude.m4 \ file://remove.ldconfig.call.patch \ +file://mkdebugfs.sh \ " SRCREV = "fca8b1b2416c384b91b4fe00d6d37cfccb8fb3d5" @@ -41,6 +42,7 @@ do_install_append () { mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir} mv ${D}${base_libdir}/pkgconfig ${D}${libdir} fi + install -m 0755 ${WORKDIR}/mkdebugfs.sh ${D}${bindir} } RDEPENDS_e2fsprogs = "e2fsprogs-badblocks" -- 1.7.11.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/7] mkdebugfs.sh: several fixes
Fix mkdebugfs.sh: * Add a simple usage * Add checking for the number of the parameters * Add the "regular empty file" and "fifo" file type * Set mode, uid and gid for the file * Save the command lines to a file and batch run them [YOCTO #3848] Signed-off-by: Robert Yang --- .../e2fsprogs/e2fsprogs/mkdebugfs.sh | 43 +++--- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdebugfs.sh b/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdebugfs.sh index 41a13cb..88abc35 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdebugfs.sh +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdebugfs.sh @@ -1,10 +1,25 @@ #!/bin/sh + +do_usage () { +cat << _EOF +Usage: mkdebugfs.sh +Create an ext2/ext3/ext4 filesystem from a directory or file + + source: The source directory or file + device: The target device + +_EOF +exit 1 +} + +[ $# -ne 2 ] && do_usage + SRCDIR=$1 DEVICE=$2 -DEBUGFS="debugfs/debugfs" - -yes | mkfs.ext4 test.img +DEBUGFS="debugfs" +CMD_FILE=`mktemp` +# Save the debugfs command lines to a file, then run them { CWD="/" find $SRCDIR | while read FILE; do @@ -26,7 +41,7 @@ yes | mkfs.ext4 test.img "directory") echo "mkdir $TGT" ;; -"regular file") +"regular file" | "regular empty file") echo "write $FILE $TGT" ;; "symbolic link") @@ -41,9 +56,27 @@ yes | mkfs.ext4 test.img DEVNO=$(stat -c "%t %T" $FILE) echo "mknod $TGT c $DEVNO" ;; +"fifo") +echo "mknod $TGT p" +;; *) echo "Unknown file $FILE" 1>&2 ;; esac + +# Set the file mode +MY_MODE=$(stat -c "%f" $FILE) +echo "sif $TGT mode 0x$MY_MODE" + +# Set uid and gid +MY_UID=$(stat -c "%u" $FILE) +echo "sif $TGT uid $MY_UID" +MY_GID=$(stat -c "%g" $FILE) +echo "sif $TGT gid $MY_GID" done -} | $DEBUGFS -w -f /dev/stdin $DEVICE +} > $CMD_FILE + +# Run the command lines +$DEBUGFS -w -f $CMD_FILE $DEVICE + +rm -f $CMD_FILE -- 1.7.11.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/7] image_types.bbclass: replace genext2fs with mkdebugfs.sh
The ext3 and ext4 rootfs generation relied on genext2fs and flipping some bits to "convert" the ext2 filesystem to ext3 and ext4 in the past, now we use the mkfs.ext3/ext4 to create the image, and use mkdebugfs.sh to copy the files to the image. [YOCTO #3848] Signed-off-by: Robert Yang --- meta/classes/image_types.bbclass | 45 +++- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 6bb113d..92f85ed 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -135,34 +135,23 @@ IMAGE_CMD_sum.jffs2 = "${IMAGE_CMD_jffs2} && sumtool -i ${DEPLOY_DIR_IMAGE}/${IM IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}" -IMAGE_CMD_ext2 () { - rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} - genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2 - mv ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 - rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} -} +oe_mkext234fs () { + fstype=$1 + extra_imagecmd="" -IMAGE_CMD_ext3 () { - genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 - tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 -} + if [ $# -gt 1 ]; then + shift + extra_imagecmd=$@ + fi -oe_mkext4fs () { - genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} $1 - tune2fs -O extents,uninit_bg,dir_index,has_journal $1 - e2fsck -yfDC0 $1 || chk=$? - case $chk in - 0|1|2) - ;; - *) - return $chk - ;; - esac + dd if=/dev/zero of=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.$fstype count=$ROOTFS_SIZE bs=1k + yes | mkfs.$fstype $extra_imagecmd ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.$fstype + mkdebugfs.sh ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.$fstype } -IMAGE_CMD_ext4 () { - oe_mkext4fs ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 -} +IMAGE_CMD_ext2 = "oe_mkext234fs ext2 ${EXTRA_IMAGECMD}" +IMAGE_CMD_ext3 = "oe_mkext234fs ext3 ${EXTRA_IMAGECMD}" +IMAGE_CMD_ext4 = "oe_mkext234fs ext4 ${EXTRA_IMAGECMD}" IMAGE_CMD_btrfs () { mkfs.btrfs -b `expr ${ROOTFS_SIZE} \* 1024` ${EXTRA_IMAGECMD} -r ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.btrfs @@ -212,7 +201,7 @@ JFFS2_ENDIANNESS ?= "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--little- JFFS2_ERASEBLOCK ?= "0x4" EXTRA_IMAGECMD_jffs2 ?= "--pad ${JFFS2_ENDIANNESS} --eraseblock=${JFFS2_ERASEBLOCK} --no-cleanmarkers" -# Change these if you want default genext2fs behavior (i.e. create minimal inode number) +# Change these if you want default mkfs behavior (i.e. create minimal inode number) EXTRA_IMAGECMD_ext2 ?= "-i 8192" EXTRA_IMAGECMD_ext3 ?= "-i 8192" EXTRA_IMAGECMD_ext4 ?= "-i 8192" @@ -223,9 +212,9 @@ IMAGE_DEPENDS = "" IMAGE_DEPENDS_jffs2 = "mtd-utils-native" IMAGE_DEPENDS_sum.jffs2 = "mtd-utils-native" IMAGE_DEPENDS_cramfs = "cramfs-native" -IMAGE_DEPENDS_ext2 = "genext2fs-native" -IMAGE_DEPENDS_ext3 = "genext2fs-native e2fsprogs-native" -IMAGE_DEPENDS_ext4 = "genext2fs-native e2fsprogs-native" +IMAGE_DEPENDS_ext2 = "e2fsprogs-native" +IMAGE_DEPENDS_ext3 = "e2fsprogs-native" +IMAGE_DEPENDS_ext4 = "e2fsprogs-native" IMAGE_DEPENDS_btrfs = "btrfs-tools-native" IMAGE_DEPENDS_squashfs = "squashfs-tools-native" IMAGE_DEPENDS_squashfs-lzma = "squashfs-tools-native" -- 1.7.11.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] connman: enable connman client
On 25/02/13 23:53, Saul Wold wrote: On 02/25/2013 12:51 AM, Iorga, Cristian wrote: Changes from V1: - connman client is explicitly enabled - ${B} is used instead of ${S} (in this specific case are the same, it will be changed later on) Please add these to a proper commit message. Also, there was some discussion prior about putting the connmanctl in a separate package, that does not seem to have happened here. It could go into the -tools packages that already exists or it's own package connman-ctl? I know Jack M. mentioned looking into this also, so let's be sure to coordinate this. Yes, that was my suggestion. I'm blocked at the moment by a binutils failure I can't shift, so currently unable to contribute. I would suggest putting it in a new connman-client package which is a 2 minute change and test. Thanks Sau! I know Jack M. mentioned looking into this also, so let's be sure to coordinate this. -Original Message- From: Iorga, Cristian Sent: Monday, February 25, 2013 10:49 AM To: openembedded-core@lists.openembedded.org Cc: Iorga, Cristian Subject: [PATCH V2] connman: enable connman client connmanctl is now included when connman is installed Signed-off-by: Cristian Iorga --- meta/recipes-connectivity/connman/connman.inc |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index b61e2af..b0ede60 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -20,7 +20,7 @@ DEPENDS = "dbus glib-2.0 ppp iptables gnutls \ ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \ " -INC_PR = "r17" +INC_PR = "r18" TIST = "--enable-tist" TIST_powerpc = "" @@ -38,7 +38,7 @@ EXTRA_OECONF += "\ --enable-tools \ --enable-test \ --disable-polkit \ ---disable-client \ +--enable-client \ --enable-fake \ ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '', d)} \ " @@ -73,6 +73,7 @@ do_install_append() { install -d ${D}${bindir} install -m 0755 ${S}/tools/*-test ${D}${bindir} install -m 0755 ${S}/tools/wispr ${D}${bindir} +install -m 0755 ${B}/client/connmanctl ${D}${bindir} # We don't need to package an empty directory rmdir ${D}${libdir}/connman/scripts -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- Jack Mitchell (j...@embed.me.uk) Embedded Systems Engineer http://www.embed.me.uk -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] connman: enable connman client
Hello all, So, what is the general agreement here? I placed connmanctl in the same package as connman because it is a very valuable tool, which should go in by default if connman is present also. It should not belong to connman-test, because it is used to control connman, not test it. If you want it to be in a connman-ctl package, just let me know and I will do the changes, re-test, and re-send the patch. Regards, Cristian -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Jack Mitchell Sent: Tuesday, February 26, 2013 11:25 AM To: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH V2] connman: enable connman client On 25/02/13 23:53, Saul Wold wrote: > On 02/25/2013 12:51 AM, Iorga, Cristian wrote: >> Changes from V1: >> - connman client is explicitly enabled >> - ${B} is used instead of ${S} (in this specific case are the >> same, it will be changed later on) >> > Please add these to a proper commit message. > > Also, there was some discussion prior about putting the connmanctl in > a separate package, that does not seem to have happened here. > > It could go into the -tools packages that already exists or it's own > package connman-ctl? > > I know Jack M. mentioned looking into this also, so let's be sure to > coordinate this. Yes, that was my suggestion. I'm blocked at the moment by a binutils failure I can't shift, so currently unable to contribute. I would suggest putting it in a new connman-client package which is a 2 minute change and test. > > Thanks > Sau! > >> I know Jack M. mentioned looking into this also, so let's be sure to >> coordinate this. -Original Message- >> From: Iorga, Cristian >> Sent: Monday, February 25, 2013 10:49 AM >> To: openembedded-core@lists.openembedded.org >> Cc: Iorga, Cristian >> Subject: [PATCH V2] connman: enable connman client >> >> connmanctl is now included when connman is installed >> >> Signed-off-by: Cristian Iorga >> --- >> meta/recipes-connectivity/connman/connman.inc |5 +++-- >> 1 file changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/meta/recipes-connectivity/connman/connman.inc >> b/meta/recipes-connectivity/connman/connman.inc >> index b61e2af..b0ede60 100644 >> --- a/meta/recipes-connectivity/connman/connman.inc >> +++ b/meta/recipes-connectivity/connman/connman.inc >> @@ -20,7 +20,7 @@ DEPENDS = "dbus glib-2.0 ppp iptables gnutls \ >> ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', >> d)} \ >> " >> >> -INC_PR = "r17" >> +INC_PR = "r18" >> >> TIST = "--enable-tist" >> TIST_powerpc = "" >> @@ -38,7 +38,7 @@ EXTRA_OECONF += "\ >> --enable-tools \ >> --enable-test \ >> --disable-polkit \ >> ---disable-client \ >> +--enable-client \ >> --enable-fake \ >> ${@base_contains('DISTRO_FEATURES', 'systemd', >> '--with-systemdunitdir=${systemd_unitdir}/system/', '', d)} \ " >> @@ -73,6 +73,7 @@ do_install_append() { >> install -d ${D}${bindir} >> install -m 0755 ${S}/tools/*-test ${D}${bindir} >> install -m 0755 ${S}/tools/wispr ${D}${bindir} >> +install -m 0755 ${B}/client/connmanctl ${D}${bindir} >> >> # We don't need to package an empty directory >> rmdir ${D}${libdir}/connman/scripts >> -- >> 1.7.10.4 >> >> >> ___ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >> > > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- Jack Mitchell (j...@embed.me.uk) Embedded Systems Engineer http://www.embed.me.uk -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] sysvinit: start .sh scripts correctly
On 26 February 2013 01:39, wrote: > - > - case "$1" in > - *.sh) > - # Source shell script for speed. > - ( > - trap - INT QUIT TSTP > - scriptname=$1 > - shift > - . $scriptname > - ) > - ;; > - *) > - "$@" > - ;; > - esac > + "$@" >startup_progress > } NACK. By "fix" you mean "remove the tested and proven optimisation"? The "if .sh use ." test was designed to speed up booting by not forking a new bash, and it's been demonstrated to have a noticeable difference on slower hardware. You can pass arguments to "." as this little test demonstrates: $ cat service.sh echo My arguments are "$@" $ . service.sh foo bar My arguments are foo bar The "shift" command shows that passing the arguments to the script was the intention, and a few lines of micro-test demonstrate that it *should* work: $ cat rc.sh startup() { scriptname=$1 shift . $scriptname } startup ./service.sh start $ busybox sh ./rc.sh My arguments are start So, something else is going wrong. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] connman: enable connman client
On 26/02/13 10:38, Iorga, Cristian wrote: Hello all, So, what is the general agreement here? I placed connmanctl in the same package as connman because it is a very valuable tool, which should go in by default if connman is present also. It should not belong to connman-test, because it is used to control connman, not test it. If you want it to be in a connman-ctl package, just let me know and I will do the changes, re-test, and re-send the patch. I think it is best to be defined as a separate package connman-client within the current connman recipe. My reasoning for this is that connman is widely used as an embedded network manager and its main interface is dbus rather than the 'helper' program connmanctl. Regards, Cristian -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Jack Mitchell Sent: Tuesday, February 26, 2013 11:25 AM To: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH V2] connman: enable connman client On 25/02/13 23:53, Saul Wold wrote: On 02/25/2013 12:51 AM, Iorga, Cristian wrote: Changes from V1: - connman client is explicitly enabled - ${B} is used instead of ${S} (in this specific case are the same, it will be changed later on) Please add these to a proper commit message. Also, there was some discussion prior about putting the connmanctl in a separate package, that does not seem to have happened here. It could go into the -tools packages that already exists or it's own package connman-ctl? I know Jack M. mentioned looking into this also, so let's be sure to coordinate this. Yes, that was my suggestion. I'm blocked at the moment by a binutils failure I can't shift, so currently unable to contribute. I would suggest putting it in a new connman-client package which is a 2 minute change and test. Thanks Sau! I know Jack M. mentioned looking into this also, so let's be sure to coordinate this. -Original Message- From: Iorga, Cristian Sent: Monday, February 25, 2013 10:49 AM To: openembedded-core@lists.openembedded.org Cc: Iorga, Cristian Subject: [PATCH V2] connman: enable connman client connmanctl is now included when connman is installed Signed-off-by: Cristian Iorga --- meta/recipes-connectivity/connman/connman.inc |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index b61e2af..b0ede60 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -20,7 +20,7 @@ DEPENDS = "dbus glib-2.0 ppp iptables gnutls \ ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \ " -INC_PR = "r17" +INC_PR = "r18" TIST = "--enable-tist" TIST_powerpc = "" @@ -38,7 +38,7 @@ EXTRA_OECONF += "\ --enable-tools \ --enable-test \ --disable-polkit \ ---disable-client \ +--enable-client \ --enable-fake \ ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '', d)} \ " @@ -73,6 +73,7 @@ do_install_append() { install -d ${D}${bindir} install -m 0755 ${S}/tools/*-test ${D}${bindir} install -m 0755 ${S}/tools/wispr ${D}${bindir} +install -m 0755 ${B}/client/connmanctl ${D}${bindir} # We don't need to package an empty directory rmdir ${D}${libdir}/connman/scripts -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- Jack Mitchell (j...@embed.me.uk) Embedded Systems Engineer http://www.embed.me.uk -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] connman: enable connman client
On 26 February 2013 11:10, Jack Mitchell wrote: > I think it is best to be defined as a separate package connman-client within > the current connman recipe. My reasoning for this is that connman is widely > used as an embedded network manager and its main interface is dbus rather > than the 'helper' program connmanctl. Cristian - in another commit can you also add connman-client to the tools-testapps image feature? Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] site: add x86-32/64 alignment values for at-spi2-core
On 25 February 2013 19:10, Martin Jansa wrote: > On Mon, Jan 21, 2013 at 03:39:54PM +, Ross Burton wrote: >> This package isn't yet in oe-core, but GTK+ 3.6 depends on it so will be >> here at >> some point. > > Anyone working on updating at least arm site? This still blocks > at-spi2-core merge to meta-oe. FWIW, I'm planning on proposing GTK+ 3.6 to oe-core shortly so we can enable Wayland, so these will end up in oe-core. We'll *really* need values for arm then ;) Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] dbus-glib : upgrade to 1.100.2
Signed-off-by: Andrei Dinu --- .../no-examples.patch |0 .../obsolete_automake_macros.patch |0 .../test-install-makefile.patch|0 .../{dbus-glib_0.100.bb => dbus-glib_0.100.2.bb} |6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-core/dbus/{dbus-glib-0.100 => dbus-glib-0.100.2}/no-examples.patch (100%) rename meta/recipes-core/dbus/{dbus-glib-0.100 => dbus-glib-0.100.2}/obsolete_automake_macros.patch (100%) rename meta/recipes-core/dbus/{dbus-glib-0.100 => dbus-glib-0.100.2}/test-install-makefile.patch (100%) rename meta/recipes-core/dbus/{dbus-glib_0.100.bb => dbus-glib_0.100.2.bb} (13%) diff --git a/meta/recipes-core/dbus/dbus-glib-0.100/no-examples.patch b/meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch similarity index 100% rename from meta/recipes-core/dbus/dbus-glib-0.100/no-examples.patch rename to meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch diff --git a/meta/recipes-core/dbus/dbus-glib-0.100/obsolete_automake_macros.patch b/meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch similarity index 100% rename from meta/recipes-core/dbus/dbus-glib-0.100/obsolete_automake_macros.patch rename to meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch diff --git a/meta/recipes-core/dbus/dbus-glib-0.100/test-install-makefile.patch b/meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch similarity index 100% rename from meta/recipes-core/dbus/dbus-glib-0.100/test-install-makefile.patch rename to meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch diff --git a/meta/recipes-core/dbus/dbus-glib_0.100.bb b/meta/recipes-core/dbus/dbus-glib_0.100.2.bb similarity index 13% rename from meta/recipes-core/dbus/dbus-glib_0.100.bb rename to meta/recipes-core/dbus/dbus-glib_0.100.2.bb index ad5aa97..e08e356 100644 --- a/meta/recipes-core/dbus/dbus-glib_0.100.bb +++ b/meta/recipes-core/dbus/dbus-glib_0.100.2.bb @@ -1,6 +1,6 @@ require dbus-glib.inc -PR = "r2" +PR = "r0" -SRC_URI[md5sum] = "d33959a9c0c6a158f5ac6d640316e89e" -SRC_URI[sha256sum] = "80ddf7584a659590103817798dd95d7e451d666f385e5e95a83abf85c46d4605" +SRC_URI[md5sum] = "ad0920c7e3aad669163bb59171cf138e" +SRC_URI[sha256sum] = "a5bb42da921f51c28161e0e54a5a8241d94a1c0499a14007150e9ce743da6ac5" -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] xkeyboard-config: this is architecture-indepedent, so set PACKAGE_ARCH
Signed-off-by: Ross Burton --- meta/recipes-graphics/xorg-lib/xkeyboard-config_2.8.bb |2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.8.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.8.bb index 8ca2f6a..ee3e20c 100644 --- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.8.bb +++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.8.bb @@ -19,6 +19,8 @@ SRC_URI[sha256sum] = "4e1cf5468d488aaf320ddfd439e03cbda0b213550fd734026d23138e4b SECTION = "x11/libs" DEPENDS = "intltool-native xkbcomp-native glib-2.0 virtual/gettext" +PACKAGE_ARCH = "all" + PR = "r0" EXTRA_OECONF = "--with-xkb-rules-symlink=xorg --disable-runtime-deps" -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] dbus: set correct address when using --address=systemd:
Patch taken from upstream 1.7 branch. Signed-off-by: Ross Burton --- .../dbus/dbus-1.6.8/systemd-address.patch | 187 meta/recipes-core/dbus/dbus.inc|1 + 2 files changed, 188 insertions(+) create mode 100644 meta/recipes-core/dbus/dbus-1.6.8/systemd-address.patch diff --git a/meta/recipes-core/dbus/dbus-1.6.8/systemd-address.patch b/meta/recipes-core/dbus/dbus-1.6.8/systemd-address.patch new file mode 100644 index 000..ae1291c --- /dev/null +++ b/meta/recipes-core/dbus/dbus-1.6.8/systemd-address.patch @@ -0,0 +1,187 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From d728fdc655f17031da3bb129ab2fd17dadf0fe3a Mon Sep 17 00:00:00 2001 +From: Simon Peeters +Date: Sun, 07 Oct 2012 14:59:30 + +Subject: Set correct address when using --address=systemd: + +When dbus gets launched through systemd, we need to create an address +string based on the sockets passed. + +The _dbus_append_addres_from_socket() function is responsible for +extracting the address information from the file-descriptor and +formatting it in a dbus friendly way. + +This fixes bus activation when running dbus under a systemd session. + +https://bugs.freedesktop.org/show_bug.cgi?id=50962 + +Signed-off-by: Simon Peeters +--- +diff --git a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c +index 130f66e..d995240 100644 +--- a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c +@@ -149,7 +149,7 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry, + } + else if (strcmp (method, "systemd") == 0) + { +- int n, *fds; ++ int i, n, *fds; + DBusString address; + + n = _dbus_listen_systemd_sockets (&fds, error); +@@ -159,27 +159,39 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry, + return DBUS_SERVER_LISTEN_DID_NOT_CONNECT; + } + +- _dbus_string_init_const (&address, "systemd:"); ++ if (!_dbus_string_init (&address)) ++ goto systemd_oom; + +- *server_p = _dbus_server_new_for_socket (fds, n, &address, NULL); +- if (*server_p == NULL) ++ for (i = 0; i < n; i++) + { +- int i; +- +- for (i = 0; i < n; i++) ++ if (i > 0) + { +- _dbus_close_socket (fds[i], NULL); ++ if (!_dbus_string_append (&address, ";")) ++goto systemd_oom; + } +- dbus_free (fds); +- +- dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); +- return DBUS_SERVER_LISTEN_DID_NOT_CONNECT; ++ if (!_dbus_append_address_from_socket (fds[i], &address, error)) ++goto systemd_err; + } + ++ *server_p = _dbus_server_new_for_socket (fds, n, &address, NULL); ++ if (*server_p == NULL) ++goto systemd_oom; ++ + dbus_free (fds); + + return DBUS_SERVER_LISTEN_OK; +- } ++ systemd_oom: ++ _DBUS_SET_OOM (error); ++ systemd_err: ++ for (i = 0; i < n; i++) ++{ ++ _dbus_close_socket (fds[i], NULL); ++} ++ dbus_free (fds); ++ _dbus_string_free (&address); ++ ++ return DBUS_SERVER_LISTEN_DID_NOT_CONNECT; ++} + #ifdef DBUS_ENABLE_LAUNCHD + else if (strcmp (method, "launchd") == 0) + { +diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c +index b4ecc96..55743b1 100644 +--- a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c +@@ -55,6 +55,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_ERRNO_H + #include +@@ -4160,4 +4161,71 @@ _dbus_check_setuid (void) + #endif + } + ++/** ++ * Read the address from the socket and append it to the string ++ * ++ * @param fd the socket ++ * @param address ++ * @param error return location for error code ++ */ ++dbus_bool_t ++_dbus_append_address_from_socket (int fd, ++ DBusString *address, ++ DBusError *error) ++{ ++ union { ++ struct sockaddr sa; ++ struct sockaddr_storage storage; ++ struct sockaddr_un un; ++ struct sockaddr_in ipv4; ++ struct sockaddr_in6 ipv6; ++ } socket; ++ char hostip[INET6_ADDRSTRLEN]; ++ int size = sizeof (socket); ++ ++ if (getsockname (fd, &socket.sa, &size)) ++goto err; ++ ++ switch (socket.sa.sa_family) ++{ ++case AF_UNIX: ++ if (socket.un.sun_path[0]=='\0') ++{ ++ if (_dbus_string_append_printf (address, "unix:abstract=%s", &(socket.un.sun_path[1]))) ++return TRUE; ++} ++ else ++{ ++ if (_dbus_string_append_printf (address, "unix:path=%s", socket.un.sun_path)) ++return TRUE; ++} ++ break; ++case AF_INET: ++ if (inet_ntop (AF_INET, &socket.ipv4.sin_addr, hostip, sizeof (hostip))) ++if (_dbus_string_append_printf (address, "tcp:family=ipv4,host=%s,port=%u", ++ hostip, ntohs (socket.ipv4.sin_port))) ++ return TRUE
[OE-core] [PATCH 1/2] weston: add dependency on xkeyboard-config
Signed-off-by: Ross Burton --- meta/recipes-graphics/wayland/weston_1.0.3.bb |2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-graphics/wayland/weston_1.0.3.bb b/meta/recipes-graphics/wayland/weston_1.0.3.bb index 0635aa2..c7b02d4 100644 --- a/meta/recipes-graphics/wayland/weston_1.0.3.bb +++ b/meta/recipes-graphics/wayland/weston_1.0.3.bb @@ -51,6 +51,8 @@ do_install_append() { FILES_${PN} += "${datadir}/applications ${datadir}/icons" +RDEPENDS_${PN} += "xkeyboard-config" + # Add a group for weston-launch, a setuid helper USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "weston-launch" -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] weston: recommend some reasonable fonts so the terminal works
Signed-off-by: Ross Burton --- meta/recipes-graphics/wayland/weston_1.0.3.bb |1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-graphics/wayland/weston_1.0.3.bb b/meta/recipes-graphics/wayland/weston_1.0.3.bb index c7b02d4..ca8675c 100644 --- a/meta/recipes-graphics/wayland/weston_1.0.3.bb +++ b/meta/recipes-graphics/wayland/weston_1.0.3.bb @@ -52,6 +52,7 @@ do_install_append() { FILES_${PN} += "${datadir}/applications ${datadir}/icons" RDEPENDS_${PN} += "xkeyboard-config" +RRECOMMENDS_${PN} = "liberation-fonts" # Add a group for weston-launch, a setuid helper USERADD_PACKAGES = "${PN}" -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] distrodata: added some corner cases for svn and git repos
distrodata.bbclass: git tags can include only one digit, therefore the regex that matches the latest version should also include this case. For some svn repos, using the http protocol than using the svn protocol to get infomation about revisions works better. Signed-off-by: Emilia Ciobanu --- meta/classes/distrodata.bbclass |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass index 276ca03..bd3a6a9 100644 --- a/meta/classes/distrodata.bbclass +++ b/meta/classes/distrodata.bbclass @@ -674,7 +674,7 @@ python do_checkpkg() { if len(line)==0: break; puptag = line.split("/")[-1] -puptag = re.search("[0-9][0-9|\.|_]+[0-9]", puptag) +puptag = re.search("([0-9][\.|_]?)+", puptag) if puptag == None: continue; puptag = puptag.group() @@ -714,6 +714,10 @@ python do_checkpkg() { svncmd = "svn info %s %s://%s%s/%s/ 2>&1" % (" ".join(options), svnproto, host, path, parm["module"]) print svncmd svninfo = os.popen(svncmd).read() +if "Can't connect to host " in svninfo or "Connection timed out" in svninfo: +svncmd = "svn info %s %s://%s%s/%s/ 2>&1" % (" ".join(options), "http", + host, path, parm["module"]) +svninfo = os.popen(svncmd).read() for line in svninfo.split("\n"): if re.search("^Last Changed Rev:", line): pupver = line.split(" ")[-1] -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] sudo : upgrade to 1.8.6p6
Signed-off-by: Andrei Dinu --- .../sudo/{sudo_1.8.6p4.bb => sudo_1.8.6p6.bb} |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/sudo/{sudo_1.8.6p4.bb => sudo_1.8.6p6.bb} (84%) diff --git a/meta/recipes-extended/sudo/sudo_1.8.6p4.bb b/meta/recipes-extended/sudo/sudo_1.8.6p6.bb similarity index 84% rename from meta/recipes-extended/sudo/sudo_1.8.6p4.bb rename to meta/recipes-extended/sudo/sudo_1.8.6p6.bb index 115439b..33cbcba 100644 --- a/meta/recipes-extended/sudo/sudo_1.8.6p4.bb +++ b/meta/recipes-extended/sudo/sudo_1.8.6p6.bb @@ -8,8 +8,8 @@ SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ PAM_SRC_URI = "file://sudo.pam" -SRC_URI[md5sum] = "cd19154e341b28573801397f0736126b" -SRC_URI[sha256sum] = "364ad88ca3afcadcff6bd6820b0af19c56ce4876704dae210e21845d923e59e8" +SRC_URI[md5sum] = "394efcbfedb200ba188958f047ce76d2" +SRC_URI[sha256sum] = "d600fee5cb2e843450263a2b8f133b9921ffa00cb6b841b0da82613447cefb7c" DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" RDEPENDS_${PN} += " ${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] xkeyboard-config: this is architecture-indepedent, so set PACKAGE_ARCH
On Tue, Feb 26, 2013 at 9:36 AM, Ross Burton wrote: > Signed-off-by: Ross Burton > --- > meta/recipes-graphics/xorg-lib/xkeyboard-config_2.8.bb |2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.8.bb > b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.8.bb > index 8ca2f6a..ee3e20c 100644 > --- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.8.bb > +++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.8.bb > @@ -19,6 +19,8 @@ SRC_URI[sha256sum] = > "4e1cf5468d488aaf320ddfd439e03cbda0b213550fd734026d23138e4b > SECTION = "x11/libs" > DEPENDS = "intltool-native xkbcomp-native glib-2.0 virtual/gettext" > > +PACKAGE_ARCH = "all" > + > PR = "r0" > > EXTRA_OECONF = "--with-xkb-rules-symlink=xorg --disable-runtime-deps" Please inherit allarch -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] log_srcrev.bbclass: add a bbclass for logging SRCREVs
- add a task which creates a file for each package with the following format: ${BB_FILENAME},${SRC_URI},${SRCREV},${FROM_AUTOREV} [YOCTO #3041] Signed-off-by: Constantin Musca --- meta/classes/log_srcrev.bbclass | 15 +++ 1 file changed, 15 insertions(+) create mode 100644 meta/classes/log_srcrev.bbclass diff --git a/meta/classes/log_srcrev.bbclass b/meta/classes/log_srcrev.bbclass new file mode 100644 index 000..d5d0284 --- /dev/null +++ b/meta/classes/log_srcrev.bbclass @@ -0,0 +1,15 @@ +python do_log_srcrev () { +srcrev = d.getVar('SRCREV', True) +if srcrev: +bbfile = d.getVar('BB_FILENAME', True) +src_uri = d.getVar('SRC_URI', True) +from_autorev = 'yes' if d.getVar('SRCREV', False) == 'AUTOINC' else 'no' + +srcrevfile = d.expand('${TMPDIR}/srcrevs/${MULTIMACH_TARGET_SYS}/${BP}-${PV}') +bb.utils.mkdirhier(os.path.dirname(srcrevfile)) + +with open(srcrevfile, 'w') as f: +f.write(','.join([bbfile, src_uri, srcrev, from_autorev])) +} + +addtask do_log_srcrev after do_fetch -- 1.7.11.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] log_srcrev.bbclass: add a bbclass for logging SRCREVs
- add a task which creates a file for each package with the following format: ${BB_FILENAME},${SRC_URI},${SRCREV},${FROM_AUTOREV} [YOCTO #3041] Signed-off-by: Constantin Musca --- meta/classes/log_srcrev.bbclass | 15 +++ 1 file changed, 15 insertions(+) create mode 100644 meta/classes/log_srcrev.bbclass diff --git a/meta/classes/log_srcrev.bbclass b/meta/classes/log_srcrev.bbclass new file mode 100644 index 000..a04702c --- /dev/null +++ b/meta/classes/log_srcrev.bbclass @@ -0,0 +1,15 @@ +python do_log_srcrev () { +srcrev = d.getVar('SRCREV', True) +if srcrev: +bbfile = d.getVar('BB_FILENAME', True) +src_uri = d.getVar('SRC_URI', True) +from_autorev = 'yes' if d.getVar('SRCREV', False) == 'AUTOINC' else 'no' + +srcrevfile = d.expand('${TMPDIR}/srcrevs/${MULTIMACH_TARGET_SYS}/${BP}') +bb.utils.mkdirhier(os.path.dirname(srcrevfile)) + +with open(srcrevfile, 'w') as f: +f.write(','.join([bbfile, src_uri, srcrev, from_autorev])) +} + +addtask do_log_srcrev after do_fetch -- 1.7.11.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] connman: enable connman client
On 02/26/2013 03:16 AM, Burton, Ross wrote: On 26 February 2013 11:10, Jack Mitchell wrote: I think it is best to be defined as a separate package connman-client within the current connman recipe. My reasoning for this is that connman is widely used as an embedded network manager and its main interface is dbus rather than the 'helper' program connmanctl. +1 to connman-client Cristian - in another commit can you also add connman-client to the tools-testapps image feature? +1 here also! Sau! Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] iproute2: upgraded to 3.8.0
- cross-compiling patch adapted to new source code Signed-off-by: Cristian Iorga --- .../recipes-connectivity/iproute2/iproute2/configure-cross.patch |6 +++--- .../iproute2/{iproute2_3.7.0.bb => iproute2_3.8.0.bb}|4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename meta/recipes-connectivity/iproute2/{iproute2_3.7.0.bb => iproute2_3.8.0.bb} (64%) diff --git a/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch index 10606f3..866609c 100644 --- a/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch +++ b/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch @@ -18,9 +18,9 @@ Index: iproute2-3.7.0/configure # INCLUDE=${1:-"$PWD/include"} +SYSROOT=$1 - : ${PKG_CONFIG:=pkg-config} - : ${CC=gcc} - echo "PKG_CONFIG:=${PKG_CONFIG}" >>Config + + # Make a temp directory in build tree. + TMPDIR=$(mktemp -d config.XX) @@ -158,7 +159,7 @@ check_ipt_lib_dir() return fi diff --git a/meta/recipes-connectivity/iproute2/iproute2_3.7.0.bb b/meta/recipes-connectivity/iproute2/iproute2_3.8.0.bb similarity index 64% rename from meta/recipes-connectivity/iproute2/iproute2_3.7.0.bb rename to meta/recipes-connectivity/iproute2/iproute2_3.8.0.bb index 1863acb..70dcd2d 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_3.7.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_3.8.0.bb @@ -5,8 +5,8 @@ PR = "r0" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BPN}-${PV}.tar.xz \ file://configure-cross.patch" -SRC_URI[md5sum] = "b07241b267036de9a79ca5b69acf8593" -SRC_URI[sha256sum] = "6b0e76d7adb8b9b65f70571f75d72db7c2548eff7813cace9e267065c3c0cb34" +SRC_URI[md5sum] = "951622fd770428116dc165acba375414" +SRC_URI[sha256sum] = "579145749f1aaf60e7c7a5de24b7f00fa2200a961094733c792b4ff139181e4f" # CFLAGS are computed in Makefile and reference CCOPTS # -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] Re:kernel.bbclass, module-base.bbclass: Use CC to form KERNEL_CC
Hi! After the patch (commit c49f967384ccbfe131bbb33ee518014f3fc4b38f) to meta/classes/kernel-arch.bbclass kernel build fails for arm machine with hard floating point instruction set in CC (-mfloat-abi=hard). As I understand kernel should not be build with fpu specific floating point instructions(should not be any floating point operation at all), but CFLAGS from machine-tune are propagated to CC and it also include -mfloat-abi flag. Should not -mfloat-abi flag be filtered out in kernel-arch.bbclass ? //Anton ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] lttng-ust: cannot find -llttng-ust-tracepoint
Pulling in Tom as I don't have any experience with lttng. On 02/26/2013 01:24 AM, Robert Yang wrote: > liblttng_ust.la should depend on liblttng-ust-tracepoint.la, otherwise > there maybe a parallel build issue when building liblttng_ust.la: > > ld: cannot find -llttng-ust-tracepoint > > [YOCTO #3934] > > Signed-off-by: Robert Yang > --- > .../lttng-ust/depends-liblttng-ust-tracepoin.patch | 30 > ++ > meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb | 4 ++- > 2 files changed, 33 insertions(+), 1 deletion(-) > create mode 100644 > meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch > > diff --git > a/meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch > b/meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch > new file mode 100644 > index 000..458a8d4 > --- /dev/null > +++ b/meta/recipes-kernel/lttng/lttng-ust/depends-liblttng-ust-tracepoin.patch > @@ -0,0 +1,30 @@ > +liblttng_ust.la should depend on liblttng-ust-tracepoint.la > + > +liblttng_ust.la should depend on liblttng-ust-tracepoint.la, otherwise > +there maybe a parallel build issue: > + > +ld: cannot find -llttng-ust-tracepoint > + > +Upstream-Status: Pending > + > +Signed-off-by: Robert Yang > +--- > + liblttng-ust/Makefile.am | 3 ++- > + 1 file changed, 2 insertions(+), 1 deletion(-) > + > +diff --git a/liblttng-ust/Makefile.am b/liblttng-ust/Makefile.am > +--- a/liblttng-ust/Makefile.am > b/liblttng-ust/Makefile.am > +@@ -67,7 +67,8 @@ liblttng_ust_la_LIBADD = \ > + -llttng-ust-tracepoint \ > + $(top_builddir)/snprintf/libustsnprintf.la \ > + $(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \ > +-liblttng-ust-runtime.la liblttng-ust-support.la > ++liblttng-ust-runtime.la liblttng-ust-support.la \ > ++liblttng-ust-tracepoint.la > + > + if LTTNG_UST_BUILD_WITH_LIBUUID > + liblttng_ust_la_LIBADD += -luuid > +-- > +1.7.11.2 > + > diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb > b/meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb > index 20c8b3d..6c2ca04 100644 > --- a/meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb > +++ b/meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb > @@ -22,7 +22,9 @@ PV = "2.1.0" > PR = "r0" > PE = "2" > > -SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git" > +SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git \ > +file://depends-liblttng-ust-tracepoin.patch \ > +" > > S = "${WORKDIR}/git" > > -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/5] automake-1.13 and upstream version updates
FYI On Tue, Feb 26, 2013 at 2:52 AM, Saul Wold wrote: >>> Just curious, what's your build host arch? and what does gcc >>> -print-multi-os-directory return on your host? on openSUSE 12.2 $ uname -a Linux codei7 3.4.28-2.20-desktop #1 SMP PREEMPT Tue Jan 29 16:51:37 UTC 2013 (143156b) x86_64 x86_64 x86_64 GNU/Linux $ gcc -print-multi-os-directory ../lib64 $ gcc -v Using built-in specs. COLLECT_GCC=gcc COLLECT_LTO_WRAPPER=/usr/lib64/gcc/x86_64-suse-linux/4.7/lto-wrapper Target: x86_64-suse-linux Configured with: ../configure --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man --libdir=/usr/lib64 --libexecdir=/usr/lib64 --enable-languages=c,c++,objc,fortran,obj-c++,java,ada --enable-checking=release --with-gxx-include-dir=/usr/include/c++/4.7 --enable-ssp --disable-libssp --disable-libitm --disable-plugin --with-bugurl=http://bugs.opensuse.org/ --with-pkgversion='SUSE Linux' --disable-libgcj --disable-libmudflap --with-slibdir=/lib64 --with-system-zlib --enable-__cxa_atexit --enable-libstdcxx-allocator=new --disable-libstdcxx-pch --enable-version-specific-runtime-libs --enable-linker-build-id --program-suffix=-4.7 --enable-linux-futex --without-system-libunwind --with-arch-32=i586 --with-tune=generic --build=x86_64-suse-linux Thread model: posix gcc version 4.7.1 20120723 [gcc-4_7-branch revision 189773] (SUSE Linux) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] log_srcrev.bbclass: add a bbclass for logging SRCREVs
On Tue, Feb 26, 2013 at 12:04 PM, Constantin Musca wrote: > - add a task which creates a file for each package with the following > format: > > ${BB_FILENAME},${SRC_URI},${SRCREV},${FROM_AUTOREV} > > [YOCTO #3041] > > Signed-off-by: Constantin Musca What is the use-case for this? -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3] connman: enable connman client
connmanctl is available in a new package: connman-client Signed-off-by: Cristian Iorga --- meta/recipes-connectivity/connman/connman.inc |9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index b61e2af..db4d26c 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -20,7 +20,7 @@ DEPENDS = "dbus glib-2.0 ppp iptables gnutls \ ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \ " -INC_PR = "r17" +INC_PR = "r18" TIST = "--enable-tist" TIST_powerpc = "" @@ -38,7 +38,7 @@ EXTRA_OECONF += "\ --enable-tools \ --enable-test \ --disable-polkit \ ---disable-client \ +--enable-client \ --enable-fake \ ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '', d)} \ " @@ -73,6 +73,7 @@ do_install_append() { install -d ${D}${bindir} install -m 0755 ${S}/tools/*-test ${D}${bindir} install -m 0755 ${S}/tools/wispr ${D}${bindir} + install -m 0755 ${B}/client/connmanctl ${D}${bindir} # We don't need to package an empty directory rmdir ${D}${libdir}/connman/scripts @@ -116,13 +117,15 @@ python populate_packages_prepend() { d.setVar("RDEPENDS_%s" % package, " ".join(rdepends)) } -PACKAGES =+ "${PN}-tools ${PN}-tests" +PACKAGES =+ "${PN}-tools ${PN}-tests ${PN}-client" FILES_${PN}-tools = "${bindir}/wispr" FILES_${PN}-tests = "${bindir}/*-test ${libdir}/${BPN}/test/*" RDEPENDS_${PN}-tests = "python-dbus python-pygobject python-textutils python-subprocess python-fcntl python-netclient" +FILES_${PN}-client = "${bindir}/connmanctl" + FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${libdir}/connman/plugins \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] base-files: fix 'dash' expanding '\n'
Hi all, I just saw this patch i sent last week was pushed to openembedded-core/poky *master* branches. Thanks for that. But in my development i am using stable 'danny' branches. Any chance that this patch gets cherry-picked to 'danny' on openembedded-core and poky repos? - Javier Viguera Software Engineer Digi International® Spain S.A.U. On 02/20/2013 04:09 PM, Javier Viguera wrote: Dash's 'echo' command expands '\n' by default, so the '\n' is not included in the '/etc/issue' file. Use 'printf' for portability between different shells. Signed-off-by: Javier Viguera --- Probably also worth to be cherry-picked to 'danny' branch. meta/recipes-core/base-files/base-files_3.0.14.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index 6a3db50..e7a9d82 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb @@ -129,7 +129,7 @@ do_install_basefilesissue () { printf "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue printf "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue.net fi - echo "\n \l" >> ${D}${sysconfdir}/issue + printf "\\\n \\\l\n" >> ${D}${sysconfdir}/issue echo >> ${D}${sysconfdir}/issue echo "%h">> ${D}${sysconfdir}/issue.net echo >> ${D}${sysconfdir}/issue.net ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] log_srcrev.bbclass: add a bbclass for logging SRCREVs
On 02/26/2013 08:56 AM, Otavio Salvador wrote: On Tue, Feb 26, 2013 at 12:04 PM, Constantin Musca wrote: - add a task which creates a file for each package with the following format: ${BB_FILENAME},${SRC_URI},${SRCREV},${FROM_AUTOREV} [YOCTO #3041] Signed-off-by: Constantin Musca What is the use-case for this? I could reply with see bug #3041! There is a need to have the actual SRCREVs from AUTOREV'ed package version, so a build can be reproduced at a later date or so you know what SRCREV went into a given release. Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] base-files: fix 'dash' expanding '\n'
On 02/26/2013 09:24 AM, Javier Viguera wrote: Hi all, I just saw this patch i sent last week was pushed to openembedded-core/poky *master* branches. Thanks for that. But in my development i am using stable 'danny' branches. Any chance that this patch gets cherry-picked to 'danny' on openembedded-core and poky repos? In the future, patches for Stable releases should mention that in the patch request. We are spinning the rc1 of Danny Update (1.3.1) now, so it will not make this release, but could be considered for the next one. Thanks for your contribution Sau! - Javier Viguera Software Engineer Digi International® Spain S.A.U. On 02/20/2013 04:09 PM, Javier Viguera wrote: Dash's 'echo' command expands '\n' by default, so the '\n' is not included in the '/etc/issue' file. Use 'printf' for portability between different shells. Signed-off-by: Javier Viguera --- Probably also worth to be cherry-picked to 'danny' branch. meta/recipes-core/base-files/base-files_3.0.14.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index 6a3db50..e7a9d82 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb @@ -129,7 +129,7 @@ do_install_basefilesissue () { printf "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue printf "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue.net fi -echo "\n \l" >> ${D}${sysconfdir}/issue +printf "\\\n \\\l\n" >> ${D}${sysconfdir}/issue echo >> ${D}${sysconfdir}/issue echo "%h">> ${D}${sysconfdir}/issue.net echo >> ${D}${sysconfdir}/issue.net ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] log_srcrev.bbclass: add a bbclass for logging SRCREVs
On Tue, Feb 26, 2013 at 2:25 PM, Saul Wold wrote: > On 02/26/2013 08:56 AM, Otavio Salvador wrote: >> >> On Tue, Feb 26, 2013 at 12:04 PM, Constantin Musca >> wrote: >>> >>> - add a task which creates a file for each package with the following >>> format: >>> >>> ${BB_FILENAME},${SRC_URI},${SRCREV},${FROM_AUTOREV} >>> >>> [YOCTO #3041] >>> >>> Signed-off-by: Constantin Musca >> >> >> What is the use-case for this? >> > I could reply with see bug #3041! > > There is a need to have the actual SRCREVs from AUTOREV'ed package version, > so a build can be reproduced at a later date or so you know what SRCREV went > into a given release. I know I could read the bug but this ought to be in commit log. It seems like a buildhistory thing from my POV, not another class thingy. -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] systemd: set the location of the kill binary
Otherwise systemd uses AC_PROG_PATH and finds it in the sysroot, which won't work on the target. Signed-off-by: Ross Burton --- meta/recipes-core/systemd/systemd_197.bb |2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/systemd/systemd_197.bb b/meta/recipes-core/systemd/systemd_197.bb index c765c18..44cd919 100644 --- a/meta/recipes-core/systemd/systemd_197.bb +++ b/meta/recipes-core/systemd/systemd_197.bb @@ -48,6 +48,8 @@ PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" # Compress the journal PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz" +export ac_cv_path_KILL="/bin/kill" + # The gtk+ tools should get built as a separate recipe e.g. systemd-tools EXTRA_OECONF = " --with-rootprefix=${base_prefix} \ --with-rootlibdir=${base_libdir} \ -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] systemd: set the location of the kill binary
On Tue, Feb 26, 2013 at 2:35 PM, Ross Burton wrote: > Otherwise systemd uses AC_PROG_PATH and finds it in the sysroot, which won't > work on the target. > > Signed-off-by: Ross Burton > --- > meta/recipes-core/systemd/systemd_197.bb |2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/meta/recipes-core/systemd/systemd_197.bb > b/meta/recipes-core/systemd/systemd_197.bb > index c765c18..44cd919 100644 > --- a/meta/recipes-core/systemd/systemd_197.bb > +++ b/meta/recipes-core/systemd/systemd_197.bb > @@ -48,6 +48,8 @@ PACKAGECONFIG[gcrypt] = > "--enable-gcrypt,--disable-gcrypt,libgcrypt" > # Compress the journal > PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz" > > +export ac_cv_path_KILL="/bin/kill" This can be given in EXTRA_OECONF IIRC. Did you try it? > # The gtk+ tools should get built as a separate recipe e.g. systemd-tools > EXTRA_OECONF = " --with-rootprefix=${base_prefix} \ > --with-rootlibdir=${base_libdir} \ > -- > 1.7.10.4 > > > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] xkeyboard-config: this is architecture-indepedent, so set PACKAGE_ARCH
On 26 February 2013 14:32, Otavio Salvador wrote: > Please inherit allarch That doesn't play nicely with autotools: | checking build system type... x86_64-pc-linux-gnu | checking host system type... Invalid configuration `allarch-poky-linux': machine `allarch-poky' not recognized | configure: error: /bin/bash ./config.sub allarch-poky-linux failed Considering a lot of allarch is designed to remove dependencies that this package uses and thus will need to be restored, directly setting PACKAGE_ARCH is the cleaner solution. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] systemd: set the location of the kill binary
On 26 February 2013 17:41, Otavio Salvador wrote: >> +export ac_cv_path_KILL="/bin/kill" > > This can be given in EXTRA_OECONF IIRC. Did you try it? That would also work, yes. Is that the preferred style? Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 5/7] mkdebugfs.sh: several fixes
On Tue, Feb 26, 2013 at 4:24 AM, Robert Yang wrote: > Fix mkdebugfs.sh: > > *) > echo "Unknown file $FILE" 1>&2 > ;; > esac I know this doesn't come from your work, but since you're making changes, I think it would make for a better error message if the above said something along the lines of: echo "Unknown/unhandled file type '$(stat -c "%F" $FILE)' file:$FILE" ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] xkeyboard-config: this is architecture-indepedent, so set PACKAGE_ARCH
On Tue, Feb 26, 2013 at 2:42 PM, Burton, Ross wrote: > On 26 February 2013 14:32, Otavio Salvador wrote: >> Please inherit allarch > > That doesn't play nicely with autotools: > > | checking build system type... x86_64-pc-linux-gnu > | checking host system type... Invalid configuration > `allarch-poky-linux': machine `allarch-poky' not recognized > | configure: error: /bin/bash ./config.sub allarch-poky-linux failed > > Considering a lot of allarch is designed to remove dependencies that > this package uses and thus will need to be restored, directly setting > PACKAGE_ARCH is the cleaner solution. If it changes the build depending in target and host, in the end it is not architecture independant code. -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] systemd: set the location of the kill binary
On Tue, Feb 26, 2013 at 2:42 PM, Burton, Ross wrote: > On 26 February 2013 17:41, Otavio Salvador wrote: >>> +export ac_cv_path_KILL="/bin/kill" >> >> This can be given in EXTRA_OECONF IIRC. Did you try it? > > That would also work, yes. Is that the preferred style? At least for me it makes more sense as it is being passed to change configure behavior so makes sense to be there. -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/7] Create ext* filesystems using debugfs
On Tue, Feb 26, 2013 at 4:24 AM, Robert Yang wrote: > * Summary: > [...]now we use the mkfs.ext3/ext4 to create the image, and use mkdebugfs.sh > to copy the files to the image. For a while this had me confused because I somehow thought you were proposing using the Linux kernel's debugfs to create filesystems (i.e. mount -t debugfs none /sys/kernel/debug). Maybe I'm still confused, but if not I think, perhaps, it would be nice to come up with a better name for this script since the name clash will probably trip others up too. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/7] Create ext* filesystems using debugfs
On 02/26/2013 01:24 AM, Robert Yang wrote: ===Contents=== * Summary * Brief design * Test info * The rootfs generation time changes * The rootfs size changes * Summary: The ext3 and ext4 rootfs generation relied on genext2fs and flipping some bits to "convert" the ext2 filesystem to ext3 and ext4 in the past, now we use the mkfs.ext3/ext4 to create the image, and use mkdebugfs.sh to copy the files to the image. * Brief design: - Upgrade the e2fsprogs to the update to date version (the git repo) which contains the "symlink" command in debugfs shell that we need. This should really be an RFC This work was intended to be a step toward incorporating it into genext2fs directly. At this point we do not want to switch to the GIT version of e2fsprogs, there is an update to e2fsprogs pending on the patch queue that addes the symlink support (crossed with your request) - Replace the current genext2fs command with mkdebugfs.sh in image_types.bbclass. The goal is to change genext2fs to support a rootfs option an not replace it with mkdebugfs. - The new steps to generate the root filesystem are: -> use "dd" command to make rootfs.ext* file Why the dd? -> run "mkfs.ext* rootfs.ext*" to create the filesystem -> run the mkdebugfs.sh to generate the root filesystem * Test info: (MACHINE = qemuarm, IMAGE_FSTYPES = "ext2 ext3 ext4 tar.bz2") $ bitbake core-image-minimal core-image-sato meta-toolchain-sdk core-image-sato-sdk $ runqemu runqemu qemuarm core-image-sato ext3 $ runqemu runqemu qemuarm core-image-minimal ext3 All of them are OK What about booting an ext4 image, part of the goal of this was to enable ext4. * The rootfs generation time changes - For a core-image-minimal generation (IMAGE_FSTYPES="tar.bz2 ext3"): Before: $ time bitbake core-image-minimal real1m10.823s user0m37.108s sys 0m15.894s After: $ time bitbake core-image-minimal real1m17.501s user0m29.304s sys 0m20.731s # 7 seconds lost. - For a core-image-sato generation (IMAGE_FSTYPES="tar.bz2 ext3"): Before: $ time bitbake core-image-sato real11m10.645s user2m43.503s sys 1m1.589s After: $ time bitbake core-image-sato real11m53.131s user3m18.988s sys 2m8.350s # 43 seconds lost. * The rootfs size changes - The image size are the same by "ls -h", but different by "du -sh": (core-image-sato) $ ls -lh BEFORE.rootfs.ext3 AFTER.rootfs.ext3 | awk '{print $5"\t"$NF}' 357M BEFORE.rootfs.ext3 357M AFTER.rootfs.ext3 $ du -sh BEFORE.rootfs.ext3 AFTER.rootfs.ext3 238MBEFORE.rootfs.ext3 357MAFTER.rootfs.ext3 It seems that the genext2fs has optimized the rootfs generation. // Robert The following changes since commit 2cc4fe4a0874c42421b1bf3fa100160a9e60a9da: upstream_tracking.inc: Coonectivity and multimedia packages updates (2013-02-25 05:58:20 -0800) are available in the git repository at: git://git.pokylinux.org/poky-contrib robert/e2fsprogs http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/e2fsprogs Robert Yang (7): e2fsprogs: upgrade to the git version (rename only) e2fsprogs: upgrade to the git version e2fsprogs: add the original mkdebugfs.sh mkdebugfs.sh: convert the tab to 4 spaces mkdebugfs.sh: several fixes e2fsprogs: ship mkfsdebug.sh image_types.bbclass: replace genext2fs with mkdebugfs.sh meta/classes/image_types.bbclass | 45 +--- meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 4 +- .../{e2fsprogs-1.42.6 => e2fsprogs}/acinclude.m4 | 0 .../fallocate.patch| 0 .../e2fsprogs/e2fsprogs/mkdebugfs.sh | 82 ++ .../{e2fsprogs-1.42.6 => e2fsprogs}/mkdir.patch| 0 .../remove.ldconfig.call.patch | 0 .../{e2fsprogs_1.42.6.bb => e2fsprogs_git.bb} | 6 +- 8 files changed, 106 insertions(+), 31 deletions(-) rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42.6 => e2fsprogs}/acinclude.m4 (100%) rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42.6 => e2fsprogs}/fallocate.patch (100%) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdebugfs.sh rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42.6 => e2fsprogs}/mkdir.patch (100%) rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42.6 => e2fsprogs}/remove.ldconfig.call.patch (100%) rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.42.6.bb => e2fsprogs_git.bb} (92%) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] xkeyboard-config: this is architecture-indepedent, so set PACKAGE_ARCH
On 26 February 2013 17:47, Otavio Salvador wrote: > If it changes the build depending in target and host, in the end it is > not architecture independant code. I think this is just autotools being nosy and failing when it doesn't know what "alllinux" is. The files don't change as they are literally just installed. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] systemd: set the location of the kill binary
Otherwise systemd uses AC_PROG_PATH and finds it in the sysroot, which won't work on the target. Signed-off-by: Ross Burton --- meta/recipes-core/systemd/systemd_197.bb |1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/systemd/systemd_197.bb b/meta/recipes-core/systemd/systemd_197.bb index c765c18..001d111 100644 --- a/meta/recipes-core/systemd/systemd_197.bb +++ b/meta/recipes-core/systemd/systemd_197.bb @@ -63,6 +63,7 @@ EXTRA_OECONF = " --with-rootprefix=${base_prefix} \ --disable-microhttpd \ --without-python \ --with-sysvrcnd-path=${sysconfdir} \ + ac_cv_path_KILL=/bin/kill \ " # uclibc does not have NSS EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname " -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] kernel.bbclass, module-base.bbclass: Use CC to form KERNEL_CC
On (26/02/13 17:08), Anton Sergienko wrote: > Hi! > After the patch (commit c49f967384ccbfe131bbb33ee518014f3fc4b38f) to > meta/classes/kernel-arch.bbclass kernel build fails for arm machine with > hard floating point instruction set in CC (-mfloat-abi=hard). > As I understand kernel should not be build with fpu specific floating point > instructions(should not be any floating point operation at all), but CFLAGS > from machine-tune are propagated to CC and it also include -mfloat-abi > flag. Should not -mfloat-abi flag be filtered out in kernel-arch.bbclass ? yes. I think this patch is creating more issues than its solving. I will think about decoupling KERNEL_CC from CC once again. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] lttng-ust: cannot find -llttng-ust-tracepoint
On (26/02/13 08:18), Darren Hart wrote: > Pulling in Tom as I don't have any experience with lttng. > > On 02/26/2013 01:24 AM, Robert Yang wrote: > > liblttng_ust.la should depend on liblttng-ust-tracepoint.la, otherwise > > there maybe a parallel build issue when building liblttng_ust.la: > > > > ld: cannot find -llttng-ust-tracepoint Are you using gold linker when you get this issue ? patch is OK if you are sure that some other .la is not pulling it in as well otherwise you dont want overlinking. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] systemd: set the location of the kill binary
On (26/02/13 17:35), Ross Burton wrote: > Otherwise systemd uses AC_PROG_PATH and finds it in the sysroot, which won't > work on the target. > > Signed-off-by: Ross Burton > --- > meta/recipes-core/systemd/systemd_197.bb |2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/meta/recipes-core/systemd/systemd_197.bb > b/meta/recipes-core/systemd/systemd_197.bb > index c765c18..44cd919 100644 > --- a/meta/recipes-core/systemd/systemd_197.bb > +++ b/meta/recipes-core/systemd/systemd_197.bb > @@ -48,6 +48,8 @@ PACKAGECONFIG[gcrypt] = > "--enable-gcrypt,--disable-gcrypt,libgcrypt" > # Compress the journal > PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz" > > +export ac_cv_path_KILL="/bin/kill" may be ac_cv_path_KILL="/usr/bin/env kill" ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] xkeyboard-config: this is architecture-indepedent, so set PACKAGE_ARCH
On Tue, Feb 26, 2013 at 2:55 PM, Burton, Ross wrote: > On 26 February 2013 17:47, Otavio Salvador wrote: >> If it changes the build depending in target and host, in the end it is >> not architecture independant code. > > I think this is just autotools being nosy and failing when it doesn't > know what "alllinux" is. The files don't change as they are literally > just installed. allarch does more than PACKAGE_ARCH so I think it'd be good to use it. Maybe it'd not be hard to disable this call in configure.ac? I don't have a strong opinion about it but using PACKAGE_ARCH only seems like a workaround for me. -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/7] Create ext* filesystems using debugfs
On Tue, 2013-02-26 at 17:24 +0800, Robert Yang wrote: > Before: > $ time bitbake core-image-minimal > > real1m10.823s > user0m37.108s > sys 0m15.894s > > After: > $ time bitbake core-image-minimal > > real1m17.501s > user0m29.304s > sys 0m20.731s > > # 7 seconds lost. > > - For a core-image-sato generation (IMAGE_FSTYPES="tar.bz2 ext3"): > > Before: > $ time bitbake core-image-sato > > real11m10.645s > user2m43.503s > sys 1m1.589s > > After: > $ time bitbake core-image-sato > > real11m53.131s > user3m18.988s > sys 2m8.350s > > # 43 seconds lost. > > * The rootfs size changes > - The image size are the same by "ls -h", but different by "du -sh": > (core-image-sato) > > $ ls -lh BEFORE.rootfs.ext3 AFTER.rootfs.ext3 | awk '{print $5"\t"$NF}' > 357M BEFORE.rootfs.ext3 > 357M AFTER.rootfs.ext3 > > $ du -sh BEFORE.rootfs.ext3 AFTER.rootfs.ext3 > 238MBEFORE.rootfs.ext3 > 357MAFTER.rootfs.ext3 So, am I understanding correctly that your patch causes the rootfs generation to take longer, and the resulting files to be bigger? It doesn't seem totally obvious to me that this is a good thing, and your cover letter doesn't provide any other explanation for why the changes are desirable. Can you expand on the rationale for doing this? Also, when sending patches for review, there is no point in sending a series which adds a new file and then makes changes to it as separate patches (in particular when the changes are just whitespace). Please squash those into a single patch before posting them on the list. thanks p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] packagegroup-core-tools-testapps: connman-client added
connman-client is now part of tools-testapps Signed-off-by: Cristian Iorga --- meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb index 9400805..343ae1c 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb @@ -5,7 +5,7 @@ SUMMARY = "Testing tools/applications" LICENSE = "MIT" -PR = "r1" +PR = "r2" inherit packagegroup @@ -43,4 +43,5 @@ RDEPENDS_${PN} = "\ xprop \ xvideo-tests \ ltp \ +connman-client \ " -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] xkeyboard-config: this is architecture-indepedent, so set PACKAGE_ARCH
On Tue, 2013-02-26 at 17:55 +, Burton, Ross wrote: > On 26 February 2013 17:47, Otavio Salvador wrote: > > If it changes the build depending in target and host, in the end it is > > not architecture independant code. > > I think this is just autotools being nosy and failing when it doesn't > know what "alllinux" is. The files don't change as they are literally > just installed. Check exactly what is in configure.ac. You should be able to use allarch and if you can't, it means the configure script is referencing the compiler, even if it shouldn't be using it. Its designed such that these accesses fail verbosely. It should be a simple fix if the recipe really is just configuration. Using the allarch class is infinitely preferable as it gets the sstate bits right. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] systemd: set the location of the kill binary
On Tue, Feb 26, 2013 at 2:53 PM, Ross Burton wrote: > Otherwise systemd uses AC_PROG_PATH and finds it in the sysroot, which won't > work on the target. > > Signed-off-by: Ross Burton Acked-by: Otavio Salvador -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] systemd: set the location of the kill binary
On Tue, Feb 26, 2013 at 4:52 PM, Otavio Salvador wrote: > On Tue, Feb 26, 2013 at 2:53 PM, Ross Burton wrote: >> Otherwise systemd uses AC_PROG_PATH and finds it in the sysroot, which won't >> work on the target. >> >> Signed-off-by: Ross Burton > > Acked-by: Otavio Salvador Now I saw the Khem suggestion to use /usr/bin/env kill; seems good. -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] systemd: set the location of the kill binary
On Tue, 2013-02-26 at 17:53 +, Ross Burton wrote: > Otherwise systemd uses AC_PROG_PATH and finds it in the sysroot, which won't > work on the target. > > Signed-off-by: Ross Burton > --- > meta/recipes-core/systemd/systemd_197.bb |1 + > 1 file changed, 1 insertion(+) > > diff --git a/meta/recipes-core/systemd/systemd_197.bb > b/meta/recipes-core/systemd/systemd_197.bb > index c765c18..001d111 100644 > --- a/meta/recipes-core/systemd/systemd_197.bb > +++ b/meta/recipes-core/systemd/systemd_197.bb > @@ -63,6 +63,7 @@ EXTRA_OECONF = " --with-rootprefix=${base_prefix} \ > --disable-microhttpd \ > --without-python \ > --with-sysvrcnd-path=${sysconfdir} \ > + ac_cv_path_KILL=/bin/kill \ ${base_bindir} ? ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] systemd: set the location of the kill binary
On Tue, 2013-02-26 at 17:53 +, Ross Burton wrote: > Otherwise systemd uses AC_PROG_PATH and finds it in the sysroot, which won't > work on the target. > > Signed-off-by: Ross Burton > --- > meta/recipes-core/systemd/systemd_197.bb |1 + > 1 file changed, 1 insertion(+) > > diff --git a/meta/recipes-core/systemd/systemd_197.bb > b/meta/recipes-core/systemd/systemd_197.bb > index c765c18..001d111 100644 > --- a/meta/recipes-core/systemd/systemd_197.bb > +++ b/meta/recipes-core/systemd/systemd_197.bb > @@ -63,6 +63,7 @@ EXTRA_OECONF = " --with-rootprefix=${base_prefix} \ > --disable-microhttpd \ > --without-python \ > --with-sysvrcnd-path=${sysconfdir} \ > + ac_cv_path_KILL=/bin/kill \ Like V1 this hardcodes ${base_bindir} to /bin, this breaks when your DISTRO sets $base_prefix to /usr. So please change that to: ac_cv_path+KILL=${base_bindir}/kill ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] nfs-utils: Add scratch directory for NFS upcall state storage
I can make this change, but if ${localstatedir} ends up being different than /var it would not be consistent with current kernel code which hardcodes the path "/var/lib/nfs/v4recovery" by default in fs/nfsd/nfs4recover.c http://lxr.linux.no/#linux+v3.8/fs/nfsd/nfs4recover.c -Rich From: Saul Wold [s...@linux.intel.com] Sent: Monday, February 25, 2013 3:45 PM To: Dubielzig, Rich Cc: Openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH] nfs-utils: Add scratch directory for NFS upcall state storage On 02/25/2013 10:44 AM, Rich Dubielzig wrote: > When the /var/lib/nfs/v4recovery directory is not present, NFSD cannot > record the upcall state and cannot end the 90-second grace period on > startup. This is true even when NFS4 is not being served according to > nfsstat. > > More details and discussion here: > https://lkml.org/lkml/2012/6/11/206 > > Signed-off-by: Rich Dubielzig > --- > .../nfs-utils/nfs-utils_1.2.3.bb |5 - > 1 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb > b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb > index 84c4464..a0b2399 100644 > --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb > +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb > @@ -12,7 +12,7 @@ DEPENDS = "libcap libnfsidmap libevent util-linux > tcp-wrappers" > RDEPENDS_${PN} = "rpcbind" > RRECOMMENDS_${PN} = "kernel-module-nfsd" > > -PR = "r4" > +PR = "r5" > > SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \ > file://nfs-utils-1.0.6-uclibc.patch \ > @@ -58,4 +58,7 @@ do_install_append () { > rm -f ${D}${sbindir}/rpcdebug > rm -f ${D}${sbindir}/rpcgen > rm -f ${D}${sbindir}/locktest > + > + # needed to allow NFSD to end its grace period > + install -d ${D}/var/lib/nfs/v4recovery This should really use ${localstatedir} instead of var, it would also be better to co-locate this with the other directory creations earlier in the do_install_append(). Sau! > } > ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] systemd: set the location of the kill binary
On Tue, 2013-02-26 at 16:53 -0300, Otavio Salvador wrote: > On Tue, Feb 26, 2013 at 4:52 PM, Otavio Salvador > wrote: > > On Tue, Feb 26, 2013 at 2:53 PM, Ross Burton wrote: > >> Otherwise systemd uses AC_PROG_PATH and finds it in the sysroot, which > >> won't > >> work on the target. > >> > >> Signed-off-by: Ross Burton > > > > Acked-by: Otavio Salvador > > Now I saw the Khem suggestion to use /usr/bin/env kill; seems good. If it wants a target path then "/usr/bin/env kill" would fail for targets that either don't have /usr or don't have "env" installed. That might not be so good. /usr/bin/env would be fine if we were talking about a build host path but that doesn't appear to be the case here. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] xkeyboard-config: this is architecture-indepedent, so set PACKAGE_ARCH
On 26 February 2013 19:43, Richard Purdie wrote: > Check exactly what is in configure.ac. You should be able to use allarch > and if you can't, it means the configure script is referencing the > compiler, even if it shouldn't be using it. Its designed such that these > accesses fail verbosely. It should be a simple fix if the recipe really > is just configuration. | configure:2707: checking host system type | configure:2716: error: /bin/bash ./config.sub allarch-poky-linux failed The configure.ac ends up running AC_CANONICAL_HOST because it uses different manpage sections for Solaris and everything else. I think they should be using AC_CANONICAL_SYSTEM, but that calls AC_CANONICAL_HOST anyway so that wouldn't achieve anything. So, extend my patch, or intrusively patch out the documentation build code in xkeyboard-config. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] xkeyboard-config: this is architecture-indepedent, so set PACKAGE_ARCH
On Tue, Feb 26, 2013 at 5:44 PM, Burton, Ross wrote: > On 26 February 2013 19:43, Richard Purdie > wrote: >> Check exactly what is in configure.ac. You should be able to use allarch >> and if you can't, it means the configure script is referencing the >> compiler, even if it shouldn't be using it. Its designed such that these >> accesses fail verbosely. It should be a simple fix if the recipe really >> is just configuration. > > | configure:2707: checking host system type > | configure:2716: error: /bin/bash ./config.sub allarch-poky-linux failed > > The configure.ac ends up running AC_CANONICAL_HOST because it uses > different manpage sections for Solaris and everything else. > > I think they should be using AC_CANONICAL_SYSTEM, but that calls > AC_CANONICAL_HOST anyway so that wouldn't achieve anything. > > So, extend my patch, or intrusively patch out the documentation build > code in xkeyboard-config. I'd say to drop the AC_CANONICAL_HOST call and make it fake Linux as a fixed value. -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [OE-Core][PATCH 1/2] binutils: Fix build with newer texinfo 5.0+
[Yocto 3943] Signed-off-by: Khem Raj --- meta/recipes-devtools/binutils/binutils-2.23.1.inc |4 + ...ls.texi-elfedit-Fix-use-of-itemx-in-table.patch | 68 +++ ...-Replace-with-when-it-is-part-of-the-text.patch | 196 .../binutils/binutils-crosssdk_2.23.1.bb |3 - meta/recipes-devtools/qemu/qemu_1.4.0.bb |8 + 5 files changed, 276 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch create mode 100644 meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-ld.texinfo-Replace-with-when-it-is-part-of-the-text.patch create mode 100644 meta/recipes-devtools/qemu/qemu_1.4.0.bb diff --git a/meta/recipes-devtools/binutils/binutils-2.23.1.inc b/meta/recipes-devtools/binutils/binutils-2.23.1.inc index 3396981..15811d7 100644 --- a/meta/recipes-devtools/binutils/binutils-2.23.1.inc +++ b/meta/recipes-devtools/binutils/binutils-2.23.1.inc @@ -1,3 +1,5 @@ +PR = "r2" + LIC_FILES_CHKSUM="\ file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\ file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\ @@ -40,6 +42,8 @@ BACKPORT = "\ file://backport/0018-bfd.patch \ file://backport/0024-bfd.patch \ file://backport/0026-ld-testsuite.patch \ + file://backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch \ + file://backport/0001-ld.texinfo-Replace-with-when-it-is-part-of-the-text.patch \ " SRC_URI[md5sum] = "33adb18c3048d057ac58d07a3f1adb38" SRC_URI[sha256sum] = "2ab2e5b03e086d12c6295f831adad46b3e1410a3a234933a2e8fac66cb2e7a19" diff --git a/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch b/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch new file mode 100644 index 000..97a40a2 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch @@ -0,0 +1,68 @@ +From e02bf9359f6ef7fe4d341aa5ac4f397f541b9ac3 Mon Sep 17 00:00:00 2001 +From: Andreas Schwab +Date: Fri, 4 Jan 2013 22:27:57 + +Subject: [PATCH] * doc/binutils.texi (elfedit): Fix use of @itemx in @table. + +--- + binutils/ChangeLog |4 + binutils/doc/binutils.texi | 14 +++--- + 2 files changed, 11 insertions(+), 7 deletions(-) + +Upstream-Status: Backport +Index: binutils-2.23.1/binutils/doc/binutils.texi +=== +--- binutils-2.23.1.orig/binutils/doc/binutils.texi2012-05-11 11:18:34.0 -0700 binutils-2.23.1/binutils/doc/binutils.texi 2013-02-26 12:41:51.785114224 -0800 +@@ -12,7 +12,7 @@ + @c man begin COPYRIGHT + Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +-2010, 2011, 2012 ++2010, 2011, 2012, 2013 + Free Software Foundation, Inc. + + Permission is granted to copy, distribute and/or modify this document +@@ -4375,7 +4375,7 @@ + + @table @env + +-@itemx --input-mach=@var{machine} ++@item --input-mach=@var{machine} + Set the matching input ELF machine type to @var{machine}. If + @option{--input-mach} isn't specified, it will match any ELF + machine types. +@@ -4383,21 +4383,21 @@ + The supported ELF machine types are, @var{L1OM}, @var{K1OM} and + @var{x86-64}. + +-@itemx --output-mach=@var{machine} ++@item --output-mach=@var{machine} + Change the ELF machine type in the ELF header to @var{machine}. The + supported ELF machine types are the same as @option{--input-mach}. + +-@itemx --input-type=@var{type} ++@item --input-type=@var{type} + Set the matching input ELF file type to @var{type}. If + @option{--input-type} isn't specified, it will match any ELF file types. + + The supported ELF file types are, @var{rel}, @var{exec} and @var{dyn}. + +-@itemx --output-type=@var{type} ++@item --output-type=@var{type} + Change the ELF file type in the ELF header to @var{type}. The + supported ELF types are the same as @option{--input-type}. + +-@itemx --input-osabi=@var{osabi} ++@item --input-osabi=@var{osabi} + Set the matching input ELF file OSABI to @var{osabi}. If + @option{--input-osabi} isn't specified, it will match any ELF OSABIs. + +@@ -4407,7 +4407,7 @@ + @var{FreeBSD}, @var{TRU64}, @var{Modesto}, @var{OpenBSD}, @var{OpenVMS}, + @var{NSK}, @var{AROS} and @var{FenixOS}. + +-@itemx --output-osabi=@var{osabi} ++@item --output-osabi=@var{osabi} + Change the ELF OSABI in the ELF header to @var{osabi}. The + supported ELF OSABI are the same as @option{--input-osabi}. + diff --git a/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-ld.texinfo-Replace-with-when-it-is-part-of-the-text.patch b/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-ld.texinfo-Replace-with-
Re: [OE-core] [OE-Core][PATCH 1/2] binutils: Fix build with newer texinfo 5.0+
On 02/26/2013 12:55 PM, Khem Raj wrote: [Yocto 3943] Proper format: [YOCTO #3943] Signed-off-by: Khem Raj --- meta/recipes-devtools/binutils/binutils-2.23.1.inc |4 + ...ls.texi-elfedit-Fix-use-of-itemx-in-table.patch | 68 +++ ...-Replace-with-when-it-is-part-of-the-text.patch | 196 .../binutils/binutils-crosssdk_2.23.1.bb |3 - meta/recipes-devtools/qemu/qemu_1.4.0.bb |8 + I am assuming you did not mean to slip in the qemu package here! Sau! 5 files changed, 276 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch create mode 100644 meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-ld.texinfo-Replace-with-when-it-is-part-of-the-text.patch create mode 100644 meta/recipes-devtools/qemu/qemu_1.4.0.bb diff --git a/meta/recipes-devtools/binutils/binutils-2.23.1.inc b/meta/recipes-devtools/binutils/binutils-2.23.1.inc index 3396981..15811d7 100644 --- a/meta/recipes-devtools/binutils/binutils-2.23.1.inc +++ b/meta/recipes-devtools/binutils/binutils-2.23.1.inc @@ -1,3 +1,5 @@ +PR = "r2" + LIC_FILES_CHKSUM="\ file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\ file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\ @@ -40,6 +42,8 @@ BACKPORT = "\ file://backport/0018-bfd.patch \ file://backport/0024-bfd.patch \ file://backport/0026-ld-testsuite.patch \ + file://backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch \ + file://backport/0001-ld.texinfo-Replace-with-when-it-is-part-of-the-text.patch \ " SRC_URI[md5sum] = "33adb18c3048d057ac58d07a3f1adb38" SRC_URI[sha256sum] = "2ab2e5b03e086d12c6295f831adad46b3e1410a3a234933a2e8fac66cb2e7a19" diff --git a/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch b/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch new file mode 100644 index 000..97a40a2 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch @@ -0,0 +1,68 @@ +From e02bf9359f6ef7fe4d341aa5ac4f397f541b9ac3 Mon Sep 17 00:00:00 2001 +From: Andreas Schwab +Date: Fri, 4 Jan 2013 22:27:57 + +Subject: [PATCH] * doc/binutils.texi (elfedit): Fix use of @itemx in @table. + +--- + binutils/ChangeLog |4 + binutils/doc/binutils.texi | 14 +++--- + 2 files changed, 11 insertions(+), 7 deletions(-) + +Upstream-Status: Backport +Index: binutils-2.23.1/binutils/doc/binutils.texi +=== +--- binutils-2.23.1.orig/binutils/doc/binutils.texi2012-05-11 11:18:34.0 -0700 binutils-2.23.1/binutils/doc/binutils.texi 2013-02-26 12:41:51.785114224 -0800 +@@ -12,7 +12,7 @@ + @c man begin COPYRIGHT + Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +-2010, 2011, 2012 ++2010, 2011, 2012, 2013 + Free Software Foundation, Inc. + + Permission is granted to copy, distribute and/or modify this document +@@ -4375,7 +4375,7 @@ + + @table @env + +-@itemx --input-mach=@var{machine} ++@item --input-mach=@var{machine} + Set the matching input ELF machine type to @var{machine}. If + @option{--input-mach} isn't specified, it will match any ELF + machine types. +@@ -4383,21 +4383,21 @@ + The supported ELF machine types are, @var{L1OM}, @var{K1OM} and + @var{x86-64}. + +-@itemx --output-mach=@var{machine} ++@item --output-mach=@var{machine} + Change the ELF machine type in the ELF header to @var{machine}. The + supported ELF machine types are the same as @option{--input-mach}. + +-@itemx --input-type=@var{type} ++@item --input-type=@var{type} + Set the matching input ELF file type to @var{type}. If + @option{--input-type} isn't specified, it will match any ELF file types. + + The supported ELF file types are, @var{rel}, @var{exec} and @var{dyn}. + +-@itemx --output-type=@var{type} ++@item --output-type=@var{type} + Change the ELF file type in the ELF header to @var{type}. The + supported ELF types are the same as @option{--input-type}. + +-@itemx --input-osabi=@var{osabi} ++@item --input-osabi=@var{osabi} + Set the matching input ELF file OSABI to @var{osabi}. If + @option{--input-osabi} isn't specified, it will match any ELF OSABIs. + +@@ -4407,7 +4407,7 @@ + @var{FreeBSD}, @var{TRU64}, @var{Modesto}, @var{OpenBSD}, @var{OpenVMS}, + @var{NSK}, @var{AROS} and @var{FenixOS}. + +-@itemx --output-osabi=@var{osabi} ++@item --output-osabi=@var{osabi} + Change the ELF OSABI in the ELF header to @var{osabi}. The + supported ELF OSABI are the same as @option{--input-osabi}. + diff --git a/meta/recipes-devtools/binutils/binutils-2.23.1/back
[OE-core] [PATCH] qt4-embedded: Enable Linux Input support
This allow use of Linux Input directly so being able to use 'evdev' driver for keyboard use. Signed-off-by: Otavio Salvador --- meta/recipes-qt/qt4/qt4-embedded.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index fbd8c28..f231e98 100644 --- a/meta/recipes-qt/qt4/qt4-embedded.inc +++ b/meta/recipes-qt/qt4/qt4-embedded.inc @@ -17,7 +17,7 @@ QT_EMBEDDED_FLAGS ?= " \ QT_EMBEDDED_EXTRA_FLAGS ?= " \ -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \ -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \ --qt-kbd-tty \ +-qt-kbd-tty -qt-kbd-linuxinput \ " QT_EMBEDDED_KEYPAD_FLAGS ?= " \ -DQT_KEYPAD_NAVIGATION \ -- 1.8.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [OE-Core][PATCH 1/2] binutils: Fix build with newer texinfo 5.0+
On Tue, Feb 26, 2013 at 1:08 PM, Saul Wold wrote: > On 02/26/2013 12:55 PM, Khem Raj wrote: >> >> [Yocto 3943] >> > Proper format: > [YOCTO #3943] OK I saw all kind in logs so chose randomly > > > >> Signed-off-by: Khem Raj >> --- >> meta/recipes-devtools/binutils/binutils-2.23.1.inc |4 + >> ...ls.texi-elfedit-Fix-use-of-itemx-in-table.patch | 68 +++ >> ...-Replace-with-when-it-is-part-of-the-text.patch | 196 >> >> .../binutils/binutils-crosssdk_2.23.1.bb |3 - >> meta/recipes-devtools/qemu/qemu_1.4.0.bb |8 + > > > I am assuming you did not mean to slip in the qemu package here! > no definitely its an oversight. I wanted to share it for testing quickly since I do not see the failure myself. I will split it out. qemu update is to be sent separately later. > Sau! > > >> 5 files changed, 276 insertions(+), 3 deletions(-) >> create mode 100644 >> meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch >> create mode 100644 >> meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-ld.texinfo-Replace-with-when-it-is-part-of-the-text.patch >> create mode 100644 meta/recipes-devtools/qemu/qemu_1.4.0.bb >> >> diff --git a/meta/recipes-devtools/binutils/binutils-2.23.1.inc >> b/meta/recipes-devtools/binutils/binutils-2.23.1.inc >> index 3396981..15811d7 100644 >> --- a/meta/recipes-devtools/binutils/binutils-2.23.1.inc >> +++ b/meta/recipes-devtools/binutils/binutils-2.23.1.inc >> @@ -1,3 +1,5 @@ >> +PR = "r2" >> + >> LIC_FILES_CHKSUM="\ >> file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\ >> file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\ >> @@ -40,6 +42,8 @@ BACKPORT = "\ >>file://backport/0018-bfd.patch \ >>file://backport/0024-bfd.patch \ >>file://backport/0026-ld-testsuite.patch \ >> + >> file://backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch >> \ >> + >> file://backport/0001-ld.texinfo-Replace-with-when-it-is-part-of-the-text.patch >> \ >> " >> SRC_URI[md5sum] = "33adb18c3048d057ac58d07a3f1adb38" >> SRC_URI[sha256sum] = >> "2ab2e5b03e086d12c6295f831adad46b3e1410a3a234933a2e8fac66cb2e7a19" >> diff --git >> a/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch >> b/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch >> new file mode 100644 >> index 000..97a40a2 >> --- /dev/null >> +++ >> b/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch >> @@ -0,0 +1,68 @@ >> +From e02bf9359f6ef7fe4d341aa5ac4f397f541b9ac3 Mon Sep 17 00:00:00 2001 >> +From: Andreas Schwab >> +Date: Fri, 4 Jan 2013 22:27:57 + >> +Subject: [PATCH] * doc/binutils.texi (elfedit): Fix use of @itemx in >> @table. >> + >> +--- >> + binutils/ChangeLog |4 >> + binutils/doc/binutils.texi | 14 +++--- >> + 2 files changed, 11 insertions(+), 7 deletions(-) >> + >> +Upstream-Status: Backport >> +Index: binutils-2.23.1/binutils/doc/binutils.texi >> +=== >> +--- binutils-2.23.1.orig/binutils/doc/binutils.texi2012-05-11 >> 11:18:34.0 -0700 >> binutils-2.23.1/binutils/doc/binutils.texi 2013-02-26 >> 12:41:51.785114224 -0800 >> +@@ -12,7 +12,7 @@ >> + @c man begin COPYRIGHT >> + Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, >> + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, >> +-2010, 2011, 2012 >> ++2010, 2011, 2012, 2013 >> + Free Software Foundation, Inc. >> + >> + Permission is granted to copy, distribute and/or modify this document >> +@@ -4375,7 +4375,7 @@ >> + >> + @table @env >> + >> +-@itemx --input-mach=@var{machine} >> ++@item --input-mach=@var{machine} >> + Set the matching input ELF machine type to @var{machine}. If >> + @option{--input-mach} isn't specified, it will match any ELF >> + machine types. >> +@@ -4383,21 +4383,21 @@ >> + The supported ELF machine types are, @var{L1OM}, @var{K1OM} and >> + @var{x86-64}. >> + >> +-@itemx --output-mach=@var{machine} >> ++@item --output-mach=@var{machine} >> + Change the ELF machine type in the ELF header to @var{machine}. The >> + supported ELF machine types are the same as @option{--input-mach}. >> + >> +-@itemx --input-type=@var{type} >> ++@item --input-type=@var{type} >> + Set the matching input ELF file type to @var{type}. If >> + @option{--input-type} isn't specified, it will match any ELF file types. >> + >> + The supported ELF file types are, @var{rel}, @var{exec} and @var{dyn}. >> + >> +-@itemx --output-type=@var{type} >> ++@item --output-type=@var{type} >> + Change the ELF file type in the ELF header to @var{type}. The >> + supported ELF types are the same as @option{--input-type}. >> + >> +-@itemx --
[OE-core] [OE-Core][PATCH V2] binutils: Fix build with newer texinfo 5.0+
[Yocto #3943] Signed-off-by: Khem Raj --- meta/recipes-devtools/binutils/binutils-2.23.1.inc |4 + ...ls.texi-elfedit-Fix-use-of-itemx-in-table.patch | 68 +++ ...-Replace-with-when-it-is-part-of-the-text.patch | 196 .../binutils/binutils-crosssdk_2.23.1.bb |3 - 4 files changed, 268 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch create mode 100644 meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-ld.texinfo-Replace-with-when-it-is-part-of-the-text.patch diff --git a/meta/recipes-devtools/binutils/binutils-2.23.1.inc b/meta/recipes-devtools/binutils/binutils-2.23.1.inc index 3396981..15811d7 100644 --- a/meta/recipes-devtools/binutils/binutils-2.23.1.inc +++ b/meta/recipes-devtools/binutils/binutils-2.23.1.inc @@ -1,3 +1,5 @@ +PR = "r2" + LIC_FILES_CHKSUM="\ file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\ file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552\ @@ -40,6 +42,8 @@ BACKPORT = "\ file://backport/0018-bfd.patch \ file://backport/0024-bfd.patch \ file://backport/0026-ld-testsuite.patch \ + file://backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch \ + file://backport/0001-ld.texinfo-Replace-with-when-it-is-part-of-the-text.patch \ " SRC_URI[md5sum] = "33adb18c3048d057ac58d07a3f1adb38" SRC_URI[sha256sum] = "2ab2e5b03e086d12c6295f831adad46b3e1410a3a234933a2e8fac66cb2e7a19" diff --git a/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch b/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch new file mode 100644 index 000..97a40a2 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-doc-binutils.texi-elfedit-Fix-use-of-itemx-in-table.patch @@ -0,0 +1,68 @@ +From e02bf9359f6ef7fe4d341aa5ac4f397f541b9ac3 Mon Sep 17 00:00:00 2001 +From: Andreas Schwab +Date: Fri, 4 Jan 2013 22:27:57 + +Subject: [PATCH] * doc/binutils.texi (elfedit): Fix use of @itemx in @table. + +--- + binutils/ChangeLog |4 + binutils/doc/binutils.texi | 14 +++--- + 2 files changed, 11 insertions(+), 7 deletions(-) + +Upstream-Status: Backport +Index: binutils-2.23.1/binutils/doc/binutils.texi +=== +--- binutils-2.23.1.orig/binutils/doc/binutils.texi2012-05-11 11:18:34.0 -0700 binutils-2.23.1/binutils/doc/binutils.texi 2013-02-26 12:41:51.785114224 -0800 +@@ -12,7 +12,7 @@ + @c man begin COPYRIGHT + Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +-2010, 2011, 2012 ++2010, 2011, 2012, 2013 + Free Software Foundation, Inc. + + Permission is granted to copy, distribute and/or modify this document +@@ -4375,7 +4375,7 @@ + + @table @env + +-@itemx --input-mach=@var{machine} ++@item --input-mach=@var{machine} + Set the matching input ELF machine type to @var{machine}. If + @option{--input-mach} isn't specified, it will match any ELF + machine types. +@@ -4383,21 +4383,21 @@ + The supported ELF machine types are, @var{L1OM}, @var{K1OM} and + @var{x86-64}. + +-@itemx --output-mach=@var{machine} ++@item --output-mach=@var{machine} + Change the ELF machine type in the ELF header to @var{machine}. The + supported ELF machine types are the same as @option{--input-mach}. + +-@itemx --input-type=@var{type} ++@item --input-type=@var{type} + Set the matching input ELF file type to @var{type}. If + @option{--input-type} isn't specified, it will match any ELF file types. + + The supported ELF file types are, @var{rel}, @var{exec} and @var{dyn}. + +-@itemx --output-type=@var{type} ++@item --output-type=@var{type} + Change the ELF file type in the ELF header to @var{type}. The + supported ELF types are the same as @option{--input-type}. + +-@itemx --input-osabi=@var{osabi} ++@item --input-osabi=@var{osabi} + Set the matching input ELF file OSABI to @var{osabi}. If + @option{--input-osabi} isn't specified, it will match any ELF OSABIs. + +@@ -4407,7 +4407,7 @@ + @var{FreeBSD}, @var{TRU64}, @var{Modesto}, @var{OpenBSD}, @var{OpenVMS}, + @var{NSK}, @var{AROS} and @var{FenixOS}. + +-@itemx --output-osabi=@var{osabi} ++@item --output-osabi=@var{osabi} + Change the ELF OSABI in the ELF header to @var{osabi}. The + supported ELF OSABI are the same as @option{--input-osabi}. + diff --git a/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-ld.texinfo-Replace-with-when-it-is-part-of-the-text.patch b/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0001-ld.texinfo-Replace-with-when-it-is-part-of-the-text.patch new file mode 100644 index 000..83d27d3 --- /dev/null +++ b/meta/recipes-devtools/
Re: [OE-core] [PATCH 6/7] e2fsprogs: ship mkfsdebug.sh
This can be merged with 3/7 right? On 02/26/2013 01:24 AM, Robert Yang wrote: > Ship mkfsdebug.sh, it will be installed to /usr/bin/mkfsdebug.sh and > used for replacing the genext2fs in image_types.bbclass. > > [YOCTO #3848] > > Signed-off-by: Robert Yang > --- > meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb > b/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb > index 70255ce..1609d42 100644 > --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb > +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_git.bb > @@ -4,6 +4,7 @@ PR = "r0" > > SRC_URI += "file://acinclude.m4 \ > file://remove.ldconfig.call.patch \ > +file://mkdebugfs.sh \ > " > > SRCREV = "fca8b1b2416c384b91b4fe00d6d37cfccb8fb3d5" > @@ -41,6 +42,7 @@ do_install_append () { > mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir} > mv ${D}${base_libdir}/pkgconfig ${D}${libdir} > fi > + install -m 0755 ${WORKDIR}/mkdebugfs.sh ${D}${bindir} > } > > RDEPENDS_e2fsprogs = "e2fsprogs-badblocks" > -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 5/7] mkdebugfs.sh: several fixes
On 02/26/2013 09:43 AM, Trevor Woerner wrote: > On Tue, Feb 26, 2013 at 4:24 AM, Robert Yang > wrote: >> Fix mkdebugfs.sh: >> >> *) >> echo "Unknown file $FILE" 1>&2 >> ;; >> esac > > I know this doesn't come from your work, but since you're making > changes, I think it would make for a better error message if the above > said something along the lines of: > > echo "Unknown/unhandled file type '$(stat -c "%F" $FILE)' file:$FILE" > That's fine. Also, there is no need to send my script first and then patch it. It was a 5 minute hack, so just modify and include as a single patch. -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/7] Create ext* filesystems using debugfs
On 02/26/2013 09:53 AM, Trevor Woerner wrote: > On Tue, Feb 26, 2013 at 4:24 AM, Robert Yang > wrote: >> * Summary: >> [...]now we use the mkfs.ext3/ext4 to create the image, and use >> mkdebugfs.sh >> to copy the files to the image. > > For a while this had me confused because I somehow thought you were > proposing using the Linux kernel's debugfs to create filesystems (i.e. > mount -t debugfs none /sys/kernel/debug). Maybe I'm still confused, > but if not I think, perhaps, it would be nice to come up with a better > name for this script since the name clash will probably trip others up > too. It is confusing, unfortunately, debugfs is provided by e2fsprogs, not something of our making. If you would prefer another name for mkdebugfs.sh, that's fine. What would you propose? -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/7] Create ext* filesystems using debugfs
On 02/26/2013 09:55 AM, Saul Wold wrote: > On 02/26/2013 01:24 AM, Robert Yang wrote: >> ===Contents=== >>* Summary >>* Brief design >>* Test info >>* The rootfs generation time changes >>* The rootfs size changes >> >> * Summary: >>The ext3 and ext4 rootfs generation relied on genext2fs and flipping >>some bits to "convert" the ext2 filesystem to ext3 and ext4 in the past, >>now we use the mkfs.ext3/ext4 to create the image, and use mkdebugfs.sh >>to copy the files to the image. >> >> * Brief design: >>- Upgrade the e2fsprogs to the update to date version (the git >> repo) which contains the "symlink" command in debugfs shell that we >> need. > This should really be an RFC > > This work was intended to be a step toward incorporating it into > genext2fs directly. I think that was a thinko, but I'll correct for everyone else's benefit. This will eventually be incorporated into libext2fs and mke2fs directly and genext2fs will be retired as obsolete. > At this point we do not want to switch to the GIT > version of e2fsprogs, there is an update to e2fsprogs pending on the > patch queue that addes the symlink support (crossed with your request) > >>- Replace the current genext2fs command with mkdebugfs.sh in >> image_types.bbclass. > > The goal is to change genext2fs to support a rootfs option an not > replace it with mkdebugfs. Again, mke2fs. We can go about this in two ways. One is to just prototype this in a branch and use it to validate the functionality and not make any changes to oe-core image generation until mke2fs has initial directory support. The other is to merge this and get broader testing of the concept and later move to the full mke2fs implementation once it becomes available. I understand the resistance to the latter, but long term I think it will result in a more robust solution as we will have caught more of the corner cases and have been able to do a better job integrating into mke2fs the first time. > >>- The new steps to generate the root filesystem are: >> -> use "dd" command to make rootfs.ext* file > Why the dd? mke2fs requires an image file to format. We could create it in other ways, but this seems reasonable. We could probably reduce the time to create it by using a larger block size. Say 1M? > >> -> run "mkfs.ext* rootfs.ext*" to create the filesystem >> -> run the mkdebugfs.sh to generate the root filesystem >> > > > >> * Test info: (MACHINE = qemuarm, IMAGE_FSTYPES = "ext2 ext3 ext4 tar.bz2") >>$ bitbake core-image-minimal core-image-sato meta-toolchain-sdk >> core-image-sato-sdk >>$ runqemu runqemu qemuarm core-image-sato ext3 >>$ runqemu runqemu qemuarm core-image-minimal ext3 >> >>All of them are OK > > What about booting an ext4 image, part of the goal of this was to enable > ext4. Seconded. -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/7] Create ext* filesystems using debugfs
On 02/26/2013 10:15 AM, Phil Blundell wrote: > On Tue, 2013-02-26 at 17:24 +0800, Robert Yang wrote: >> Before: >> $ time bitbake core-image-minimal >> >> real1m10.823s >> user0m37.108s >> sys 0m15.894s >> >> After: >> $ time bitbake core-image-minimal >> >> real1m17.501s >> user0m29.304s >> sys 0m20.731s >> >> # 7 seconds lost. >> >> - For a core-image-sato generation (IMAGE_FSTYPES="tar.bz2 ext3"): >> >> Before: >> $ time bitbake core-image-sato >> >> real11m10.645s >> user2m43.503s >> sys 1m1.589s >> >> After: >> $ time bitbake core-image-sato >> >> real11m53.131s >> user3m18.988s >> sys 2m8.350s >> >> # 43 seconds lost. >> >> * The rootfs size changes >> - The image size are the same by "ls -h", but different by "du -sh": >> (core-image-sato) >> >> $ ls -lh BEFORE.rootfs.ext3 AFTER.rootfs.ext3 | awk '{print $5"\t"$NF}' >> 357M BEFORE.rootfs.ext3 >> 357M AFTER.rootfs.ext3 >> >> $ du -sh BEFORE.rootfs.ext3 AFTER.rootfs.ext3 >> 238MBEFORE.rootfs.ext3 >> 357MAFTER.rootfs.ext3 > > So, am I understanding correctly that your patch causes the rootfs > generation to take longer, and the resulting files to be bigger? It > doesn't seem totally obvious to me that this is a good thing, and your > cover letter doesn't provide any other explanation for why the changes > are desirable. Can you expand on the rationale for doing this? A better motivation description is indeed required. Basically, genext2fs doesn't support creating ext4 filesystems. It creates, as I understand it, an ext2 filesystem, then adds a journal, and sets some bits. It can't support the newer features like extents. So what we end up with is a bit of a hack for a filesystem. The ext tools (e2fsprogs) unfortunately don't provide an integrated solution for generating prepopulated filesystem images as many other mkfs* tools do. One thing missing was symlink support in libext2fs. I added that support and demonstrated a script which uses the e2fsprogs debugfs tool that can populate the newly formatted filesystem from a directory and without root privileges. Robert's patches integrate this stage of development into OE-Core. As I replied to Saul's 0/7 response: "We can go about this in two ways. One is to just prototype this in a branch and use it to validate the functionality and not make any changes to oe-core image generation until mke2fs has initial directory support. The other is to merge this and get broader testing of the concept and later move to the full mke2fs implementation once it becomes available. I understand the resistance to the latter, but long term I think it will result in a more robust solution as we will have caught more of the corner cases and have been able to do a better job integrating into mke2fs the first time." > Also, when sending patches for review, there is no point in sending a > series which adds a new file and then makes changes to it as separate > patches (in particular when the changes are just whitespace). Please > squash those into a single patch before posting them on the list. I think Robert was trying to maintain some history by keeping my original script intact. I agree, it isn't necessary and those three patches can be merged into one. Thank you for reviewing! -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] kernel.bbclass, module-base.bbclass: Use CC to form KERNEL_CC
On Tue, Feb 26, 2013 at 11:56 AM, Khem Raj wrote: > On (26/02/13 17:08), Anton Sergienko wrote: >> Hi! >> After the patch (commit c49f967384ccbfe131bbb33ee518014f3fc4b38f) to >> meta/classes/kernel-arch.bbclass kernel build fails for arm machine with >> hard floating point instruction set in CC (-mfloat-abi=hard). >> As I understand kernel should not be build with fpu specific floating point >> instructions(should not be any floating point operation at all), but CFLAGS >> from machine-tune are propagated to CC and it also include -mfloat-abi >> flag. Should not -mfloat-abi flag be filtered out in kernel-arch.bbclass ? > > yes. I think this patch is creating more issues than its solving. I will > think about decoupling KERNEL_CC from CC once again. I just resubmitted my patch for this... It decouples all the extra args while still keeping the ones specifically added. -M ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] kernel-arch.bbclass: don't pass extra args to KERNEL_{CC, LD, AR}
Commit a3ca06c3b45c791dd38dbf154ad0fc62b4063475 added extra args to KERNEL_CC, these revert that bit while maintaining machine additions in TARGET_??_KERNEL_ARCH Producing incorrect instructions and generating the following errors: CC arch/powerpc/kernel/init_task.o | {standard input}: Assembler messages: | {standard input}:384: Error: junk at end of line: `1' | {standard input}:949: Error: junk at end of line: `1' | {standard input}:1428: Error: junk at end of line: `1' | {standard input}:1526: Error: junk at end of line: `1' | {standard input}:1626: Error: junk at end of line: `1' | {standard input}:1685: Error: junk at end of line: `1' | {standard input}:1973: Error: junk at end of line: `1' | {standard input}:2001: Error: junk at end of line: `1' | {standard input}:2100: Error: junk at end of line: `1' | {standard input}:2168: Error: junk at end of line: `1' | {standard input}:2520: Error: junk at end of line: `1' | CC arch/powerpc/lib/locks.o Signed-off-by: Matthew McClintock --- meta/classes/kernel-arch.bbclass |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/kernel-arch.bbclass b/meta/classes/kernel-arch.bbclass index a51e82b..b3b71ba 100644 --- a/meta/classes/kernel-arch.bbclass +++ b/meta/classes/kernel-arch.bbclass @@ -52,7 +52,7 @@ HOST_LD_KERNEL_ARCH ?= "${TARGET_LD_KERNEL_ARCH}" TARGET_AR_KERNEL_ARCH ?= "" HOST_AR_KERNEL_ARCH ?= "${TARGET_AR_KERNEL_ARCH}" -KERNEL_CC = "${CC} ${HOST_CC_KERNEL_ARCH}" -KERNEL_LD = "${LD} ${HOST_LD_KERNEL_ARCH}" -KERNEL_AR = "${AR} ${HOST_AR_KERNEL_ARCH}" +KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_KERNEL_ARCH}" +KERNEL_LD = "${CCACHE}${HOST_PREFIX}ld ${HOST_LD_KERNEL_ARCH}" +KERNEL_AR = "${CCACHE}${HOST_PREFIX}ar ${HOST_AR_KERNEL_ARCH}" -- 1.7.9.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] libpfm4_4.3.0.bb: use compatible host to limit arches
This is only test with powerpc64 currently, even though it should work on other arches such as x86 and sparc. When thos are testing and working this COMPATIBLE_HOST should be updated Signed-off-by: Matthew McClintock --- meta/recipes-kernel/libpfm/libpfm4_4.3.0.bb |3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-kernel/libpfm/libpfm4_4.3.0.bb b/meta/recipes-kernel/libpfm/libpfm4_4.3.0.bb index 460029f..98852f6 100644 --- a/meta/recipes-kernel/libpfm/libpfm4_4.3.0.bb +++ b/meta/recipes-kernel/libpfm/libpfm4_4.3.0.bb @@ -10,6 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0de488f3bd4424e308e2e399cb99c788" SECTION = "devel" +PR = "r1" +COMPATIBLE_HOST = "powerpc64" + SRC_URI = "http://downloads.sourceforge.net/project/perfmon2/libpfm4/libpfm-4.3.0.tar.gz"; SRC_URI[md5sum] = "0ab272dbdbb759b852ba8bd06db030ef" -- 1.7.9.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/7] Create ext* filesystems using debugfs
On Tue, Feb 26, 2013 at 4:52 PM, Darren Hart wrote: > On 02/26/2013 09:53 AM, Trevor Woerner wrote: >> On Tue, Feb 26, 2013 at 4:24 AM, Robert Yang >> wrote: >>> * Summary: >>> [...]now we use the mkfs.ext3/ext4 to create the image, and use >>> mkdebugfs.sh >>> to copy the files to the image. >> >> For a while this had me confused because I somehow thought you were >> proposing using the Linux kernel's debugfs to create filesystems (i.e. >> mount -t debugfs none /sys/kernel/debug). > > It is confusing, unfortunately, debugfs is provided by e2fsprogs, not > something of our making. If you would prefer another name for > mkdebugfs.sh, that's fine. What would you propose? mkextXfs.sh ? ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] xkeyboard-config: this is architecture-indepedent, so set PACKAGE_ARCH
On Tue, Feb 26, 2013 at 12:36:56PM +, Ross Burton wrote: > Signed-off-by: Ross Burton > --- > meta/recipes-graphics/xorg-lib/xkeyboard-config_2.8.bb |2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.8.bb > b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.8.bb > index 8ca2f6a..ee3e20c 100644 > --- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.8.bb > +++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.8.bb > @@ -19,6 +19,8 @@ SRC_URI[sha256sum] = > "4e1cf5468d488aaf320ddfd439e03cbda0b213550fd734026d23138e4b > SECTION = "x11/libs" > DEPENDS = "intltool-native xkbcomp-native glib-2.0 virtual/gettext" > > +PACKAGE_ARCH = "all" Why not inherit allarch? > + > PR = "r0" > > EXTRA_OECONF = "--with-xkb-rules-symlink=xorg --disable-runtime-deps" > -- > 1.7.10.4 > > > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] oprofile: update patch for powerpc64
This is a more appropriate follow up patch from upstream. Also, only powerpc64 requires libpfm4 currently for this specific version of oprofile (x86, sparc can make use of libpfm but don't make use of it here) Additionally, this patch from upstream requires some more patches to be pulled into oprofile Signed-off-by: Matthew McClintock --- ...-events-to-be-specified-with-or-without-_.patch | 206 ...pecific-libpfm-usage-so-it-doesn-t-break-.patch | 130 .../0001-fix-powerpc-cross-compiling.patch | 35 ...p-lists-events-Fix-doc-URL-for-ppc64-arch.patch | 34 meta/recipes-kernel/oprofile/oprofile_0.9.8.bb |7 +- 5 files changed, 374 insertions(+), 38 deletions(-) create mode 100644 meta/recipes-kernel/oprofile/oprofile/0001-Allow-ppc64-events-to-be-specified-with-or-without-_.patch create mode 100644 meta/recipes-kernel/oprofile/oprofile/0001-Fix-PPC64-specific-libpfm-usage-so-it-doesn-t-break-.patch delete mode 100644 meta/recipes-kernel/oprofile/oprofile/0001-fix-powerpc-cross-compiling.patch create mode 100644 meta/recipes-kernel/oprofile/oprofile/0001-ophelp-lists-events-Fix-doc-URL-for-ppc64-arch.patch diff --git a/meta/recipes-kernel/oprofile/oprofile/0001-Allow-ppc64-events-to-be-specified-with-or-without-_.patch b/meta/recipes-kernel/oprofile/oprofile/0001-Allow-ppc64-events-to-be-specified-with-or-without-_.patch new file mode 100644 index 000..5eb8b8f --- /dev/null +++ b/meta/recipes-kernel/oprofile/oprofile/0001-Allow-ppc64-events-to-be-specified-with-or-without-_.patch @@ -0,0 +1,206 @@ +From 3602803297695f52e856f21920012fd64f79 Mon Sep 17 00:00:00 2001 +From: Maynard Johnson +Date: Fri, 11 Jan 2013 13:29:57 -0600 +Subject: [PATCH] Allow ppc64 events to be specified with or without _GRP + suffix + +All events for IBM PowerPC server processors (except CYCLES) have +a _GRP suffix. This is because the legacy opcontrol profiler +can only profile events in the same group (i.e., having the same +_GRP suffix). But operf has no such restriction because it +can multiplex events; thus, so we should allow the user to pass +event names without the _GRP suffix. + +Signed-off-by: Maynard Johnson +--- + doc/operf.1.in |6 +++ + doc/oprofile.xml | 12 +- + pe_profiling/operf.cpp | 107 + utils/ophelp.c |4 ++ + 4 files changed, 127 insertions(+), 2 deletions(-) + +diff --git a/doc/operf.1.in b/doc/operf.1.in +index b109324..03027ca 100644 +--- a/doc/operf.1.in b/doc/operf.1.in +@@ -110,6 +110,12 @@ be specified using the symbolic name. If no unit mask is specified, 0x0 will be + used as the default. + .P + .RS ++On IBM PowerPC systems, events may be specified with or without the ++.I _GRP ++suffix. If no group number suffix is given, one will be automatically ++assigned; thus, OProfile post-processing tools will always show real event ++names that include the group number suffix. ++.P + When no event specification is given, the default event for the running + processor type will be used for profiling. + Use +diff --git a/doc/oprofile.xml b/doc/oprofile.xml +index 0ae2b0b..0f74726 100644 +--- a/doc/oprofile.xml b/doc/oprofile.xml +@@ -1106,10 +1106,18 @@ shown by the output of ophelp. Unit masks with "extra:" para + specified using the symbolic name. + + +-When using legacy mode opcontrol on PowerPC platforms, all events specified must be in the same group; ++When using legacy mode opcontrol on IBM PowerPC platforms, all events specified must be in the same group; + i.e., the group number appended to the event name (e.g._GRP9 + ) must be the same. +- ++ ++ ++When profiling with operf on IBM PowerPC platforms, the above restriction ++regarding the same group number does not apply, and events may be ++specified with or without the group number suffix. If no group number suffix is given, one will be automatically ++assigned; thus, OProfile post-processing tools will always show real event ++names that include the group number suffix. ++ ++ + + If OProfile is using timer-interrupt mode, there is no event configuration possible. + +diff --git a/pe_profiling/operf.cpp b/pe_profiling/operf.cpp +index 4416b29..a776e71 100644 +--- a/pe_profiling/operf.cpp b/pe_profiling/operf.cpp +@@ -1146,6 +1146,108 @@ static void _get_event_code(operf_event_t * event) + event->evt_code = config; + } + ++#if (defined(__powerpc__) || defined(__powerpc64__)) ++/* All ppc64 events (except CYCLES) have a _GRP suffix. This is ++ * because the legacy opcontrol profiler can only profile events in ++ * the same group (i.e., having the same _GRP suffix). But operf ++ * can multiplex events, so we should allow the user to pass event ++ * names without the _GRP suffix. ++ * ++ * If event name is not CYCLES or does not have a _GRP suffix, ++ * we'll call ophelp and scan the list of events, searching for one ++ * that
Re: [OE-core] kernel.bbclass, module-base.bbclass: Use CC to form KERNEL_CC
On Tue, Feb 26, 2013 at 2:22 PM, McClintock Matthew-B29882 wrote: > On Tue, Feb 26, 2013 at 11:56 AM, Khem Raj wrote: >> On (26/02/13 17:08), Anton Sergienko wrote: >>> Hi! >>> After the patch (commit c49f967384ccbfe131bbb33ee518014f3fc4b38f) to >>> meta/classes/kernel-arch.bbclass kernel build fails for arm machine with >>> hard floating point instruction set in CC (-mfloat-abi=hard). >>> As I understand kernel should not be build with fpu specific floating point >>> instructions(should not be any floating point operation at all), but CFLAGS >>> from machine-tune are propagated to CC and it also include -mfloat-abi >>> flag. Should not -mfloat-abi flag be filtered out in kernel-arch.bbclass ? >> >> yes. I think this patch is creating more issues than its solving. I will >> think about decoupling KERNEL_CC from CC once again. > > I just resubmitted my patch for this... It decouples all the extra > args while still keeping the ones specifically added. thanks for doing it ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] gcc-common.inc: handle case where tune is not defined
Signed-off-by: Matthew McClintock --- meta/recipes-devtools/gcc/gcc-common.inc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index ad96989..6b61800 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc @@ -38,7 +38,7 @@ def get_gcc_multiarch_setting(bb, d): def get_tune_parameters(tune, d): availtunes = d.getVar('AVAILTUNES', True) if tune not in availtunes.split(): -bb.error('The tune: %s is not one of the available tunes: %s', tune, availtunes) +bb.error('The tune: %s is not one of the available tunes: %s', tune or None, availtunes) localdata = bb.data.createCopy(d) override = ':tune-' + tune -- 1.7.9.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/7] mkdebugfs.sh: convert the tab to 4 spaces
And NACK on this one :-) Shell scripts should use tabs. -- Darren On 02/26/2013 01:24 AM, Robert Yang wrote: > [YOCTO #3848] > > Signed-off-by: Robert Yang > --- > .../e2fsprogs/e2fsprogs/mkdebugfs.sh | 74 > +++--- > 1 file changed, 37 insertions(+), 37 deletions(-) > > diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdebugfs.sh > b/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdebugfs.sh > index 5dfa380..41a13cb 100644 > --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdebugfs.sh > +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdebugfs.sh > @@ -6,44 +6,44 @@ DEBUGFS="debugfs/debugfs" > yes | mkfs.ext4 test.img > > { > - CWD="/" > - find $SRCDIR | while read FILE; do > - #TGT=${FILE#$SRCDIR} > - TGT=$(basename "${FILE#$SRCDIR}") > - DIR=$(dirname "${FILE#$SRCDIR}") > +CWD="/" > +find $SRCDIR | while read FILE; do > +#TGT=${FILE#$SRCDIR} > +TGT=$(basename "${FILE#$SRCDIR}") > +DIR=$(dirname "${FILE#$SRCDIR}") > > - # Skip the root dir > - if [ -z "$TGT" ]; then > - continue > - fi > +# Skip the root dir > +if [ -z "$TGT" ]; then > +continue > +fi > > - if [ "$DIR" != "$CWD" ]; then > - echo "cd $DIR" > - CWD="$DIR" > - fi > +if [ "$DIR" != "$CWD" ]; then > +echo "cd $DIR" > +CWD="$DIR" > +fi > > - case $(stat -c "%F" $FILE) in > - "directory") > - echo "mkdir $TGT" > - ;; > - "regular file") > - echo "write $FILE $TGT" > - ;; > - "symbolic link") > - LINK_TGT=$(ls -l $FILE | sed -e 's/.*-> //') > - echo "symlink $TGT $LINK_TGT" > - ;; > - "block special file") > - DEVNO=$(stat -c "%t %T" $FILE) > - echo "mknod $TGT b $DEVNO" > - ;; > - "character special file") > - DEVNO=$(stat -c "%t %T" $FILE) > - echo "mknod $TGT c $DEVNO" > - ;; > - *) > - echo "Unknown file $FILE" 1>&2 > - ;; > - esac > - done > +case $(stat -c "%F" $FILE) in > +"directory") > +echo "mkdir $TGT" > +;; > +"regular file") > +echo "write $FILE $TGT" > +;; > +"symbolic link") > +LINK_TGT=$(ls -l $FILE | sed -e 's/.*-> //') > +echo "symlink $TGT $LINK_TGT" > +;; > +"block special file") > +DEVNO=$(stat -c "%t %T" $FILE) > +echo "mknod $TGT b $DEVNO" > +;; > +"character special file") > +DEVNO=$(stat -c "%t %T" $FILE) > +echo "mknod $TGT c $DEVNO" > +;; > +*) > +echo "Unknown file $FILE" 1>&2 > +;; > +esac > +done > } | $DEBUGFS -w -f /dev/stdin $DEVICE > -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/7] Create ext* filesystems using debugfs
On 02/26/2013 02:37 PM, Trevor Woerner wrote: > On Tue, Feb 26, 2013 at 4:52 PM, Darren Hart wrote: >> On 02/26/2013 09:53 AM, Trevor Woerner wrote: >>> On Tue, Feb 26, 2013 at 4:24 AM, Robert Yang >>> wrote: * Summary: [...]now we use the mkfs.ext3/ext4 to create the image, and use mkdebugfs.sh to copy the files to the image. >>> >>> For a while this had me confused because I somehow thought you were >>> proposing using the Linux kernel's debugfs to create filesystems (i.e. >>> mount -t debugfs none /sys/kernel/debug). >> >> It is confusing, unfortunately, debugfs is provided by e2fsprogs, not >> something of our making. If you would prefer another name for >> mkdebugfs.sh, that's fine. What would you propose? > > mkextXfs.sh ? Likely to be confused with mke2fs itself. Perhaps: populate-extfs.sh ? -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/7] Create ext* filesystems using debugfs
On Tue, Feb 26, 2013 at 6:00 PM, Darren Hart wrote: >> mkextXfs.sh ? > > Likely to be confused with mke2fs itself. Perhaps: > > populate-extfs.sh ? Sounds great. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] nfs-utils: Add scratch directory for NFS upcall state storage
When the /var/lib/nfs/v4recovery directory is not present, NFSD cannot record the upcall state and cannot end the 90-second grace period on startup. This is true even when NFS4 is not being served according to nfsstat. More details and discussion here: https://lkml.org/lkml/2012/6/11/206 Signed-off-by: Rich Dubielzig --- .../nfs-utils/nfs-utils_1.2.3.bb |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb index 84c4464..f9dedfb 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb @@ -12,7 +12,7 @@ DEPENDS = "libcap libnfsidmap libevent util-linux tcp-wrappers" RDEPENDS_${PN} = "rpcbind" RRECOMMENDS_${PN} = "kernel-module-nfsd" -PR = "r4" +PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \ file://nfs-utils-1.0.6-uclibc.patch \ @@ -53,6 +53,7 @@ RDEPENDS_${PN}-stats = "python" do_install_append () { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver + install -d ${D}${localstatedir}/lib/nfs/v4recovery # the following are built by CC_FOR_BUILD rm -f ${D}${sbindir}/rpcdebug -- 1.7.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] nfs-utils: Add scratch directory for NFS upcall state storage
On Tue, Feb 26, 2013 at 12:02 PM, Dubielzig, Rich wrote: > I can make this change, but if ${localstatedir} ends up being different than > /var it would not be consistent with current kernel code which hardcodes the > path "/var/lib/nfs/v4recovery" by default in fs/nfsd/nfs4recover.c > > http://lxr.linux.no/#linux+v3.8/fs/nfsd/nfs4recover.c too bad. I think if you add this to commend and keep it hardcoded that will be better for future reference IMO so we know why we used /var and not conf var. > > -Rich > > From: Saul Wold [s...@linux.intel.com] > Sent: Monday, February 25, 2013 3:45 PM > To: Dubielzig, Rich > Cc: Openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH] nfs-utils: Add scratch directory for NFS > upcall state storage > > On 02/25/2013 10:44 AM, Rich Dubielzig wrote: >> When the /var/lib/nfs/v4recovery directory is not present, NFSD cannot >> record the upcall state and cannot end the 90-second grace period on >> startup. This is true even when NFS4 is not being served according to >> nfsstat. >> >> More details and discussion here: >> https://lkml.org/lkml/2012/6/11/206 >> >> Signed-off-by: Rich Dubielzig >> --- >> .../nfs-utils/nfs-utils_1.2.3.bb |5 - >> 1 files changed, 4 insertions(+), 1 deletions(-) >> >> diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb >> b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb >> index 84c4464..a0b2399 100644 >> --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb >> +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb >> @@ -12,7 +12,7 @@ DEPENDS = "libcap libnfsidmap libevent util-linux >> tcp-wrappers" >> RDEPENDS_${PN} = "rpcbind" >> RRECOMMENDS_${PN} = "kernel-module-nfsd" >> >> -PR = "r4" >> +PR = "r5" >> >> SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \ >> file://nfs-utils-1.0.6-uclibc.patch \ >> @@ -58,4 +58,7 @@ do_install_append () { >> rm -f ${D}${sbindir}/rpcdebug >> rm -f ${D}${sbindir}/rpcgen >> rm -f ${D}${sbindir}/locktest >> + >> + # needed to allow NFSD to end its grace period >> + install -d ${D}/var/lib/nfs/v4recovery > > This should really use ${localstatedir} instead of var, it would also be > better to co-locate this with the other directory creations earlier in > the do_install_append(). > > Sau! > >> } >> > > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] log_srcrev.bbclass: add a bbclass for logging SRCREVs
On 02/26/2013 07:08 AM, Constantin Musca wrote: - add a task which creates a file for each package with the following format: ${BB_FILENAME},${SRC_URI},${SRCREV},${FROM_AUTOREV} [YOCTO #3041] Signed-off-by: Constantin Musca --- meta/classes/log_srcrev.bbclass | 15 +++ 1 file changed, 15 insertions(+) create mode 100644 meta/classes/log_srcrev.bbclass diff --git a/meta/classes/log_srcrev.bbclass b/meta/classes/log_srcrev.bbclass new file mode 100644 index 000..a04702c --- /dev/null +++ b/meta/classes/log_srcrev.bbclass @@ -0,0 +1,15 @@ +python do_log_srcrev () { +srcrev = d.getVar('SRCREV', True) +if srcrev: +bbfile = d.getVar('BB_FILENAME', True) +src_uri = d.getVar('SRC_URI', True) +from_autorev = 'yes' if d.getVar('SRCREV', False) == 'AUTOINC' else 'no' + +srcrevfile = d.expand('${TMPDIR}/srcrevs/${MULTIMACH_TARGET_SYS}/${BP}') +bb.utils.mkdirhier(os.path.dirname(srcrevfile)) + +with open(srcrevfile, 'w') as f: +f.write(','.join([bbfile, src_uri, srcrev, from_autorev])) +} + +addtask do_log_srcrev after do_fetch Otavio makes a good point, this might be something to consider putting it in to the RecipeInfo in buildhistory.bbclass and extend the write_pkghistory(), but maybe write the file with a different name latest_srcrev Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] lttng-ust: cannot find -llttng-ust-tracepoint
Hi Khem, Here is the full error log, we can see that liblttng-ust.la needs lttng-ust-tracepoint.la: arm-poky-linux-gnueabi-libtool: link: arm-poky-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork --sysroot=/buildarea2/lyang1/ppp/tmp/sysroots/qemuarm -shared -fPIC -DPIC -Wl,--whole-archive ../snprintf/.libs/libustsnprintf.a ../liblttng-ust-comm/.libs/liblttng-ust-comm.a ./.libs/liblttng-ust-runtime.a ./.libs/liblttng-ust-support.a -Wl,--no-whole-archive -llttng-ust-tracepoint -lrt /buildarea2/lyang1/ppp/tmp/sysroots/qemuarm/usr/lib/libuuid.so /buildarea2/lyang1/ppp/tmp/sysroots/qemuarm/usr/lib/liburcu-bp.so -L/buildarea2/lyang1/ppp/tmp/sysroots/qemuarm/usr/lib /buildarea2/lyang1/ppp/tmp/sysroots/qemuarm/usr/lib/liburcu-cds.so /buildarea2/lyang1/ppp/tmp/sysroots/qemuarm/usr/lib/liburcu-common.so -lpthread -march=armv5te -marm -mthumb-interwork --sysroot=/buildarea2/lyang1/ppp/tmp/sysroots/qemuarm -O2 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-soname -Wl,liblttng-ust.so.0 -o .libs/liblttng-ust.so.0.0.0 arm-poky-linux-gnueabi-libtool: link: ( cd ".libs" && rm -f "liblttng-ust-tracepoint.la" && ln -s "../liblttng-ust-tracepoint.la" "liblttng-ust-tracepoint.la" ) /buildarea2/lyang1/ppp/tmp/sysroots/x86_64-linux/usr/libexec/armv5te-poky-linux-gnueabi/gcc/arm-poky-linux-gnueabi/4.7.2/ld: cannot find -llttng-ust-tracepoint collect2: error: ld returned 1 exit status make[2]: *** [liblttng-ust.la] Error 1 // Robert On 02/27/2013 01:58 AM, Khem Raj wrote: On (26/02/13 08:18), Darren Hart wrote: Pulling in Tom as I don't have any experience with lttng. On 02/26/2013 01:24 AM, Robert Yang wrote: liblttng_ust.la should depend on liblttng-ust-tracepoint.la, otherwise there maybe a parallel build issue when building liblttng_ust.la: ld: cannot find -llttng-ust-tracepoint Are you using gold linker when you get this issue ? patch is OK if you are sure that some other .la is not pulling it in as well otherwise you dont want overlinking. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] syslinux.bbclass: Add a default serial console option and real boot menu support
The previous syslinux menu code did not support using both a serial and vga console, but this has worked for years in syslinux so there is no reason not to take advantage of it. The previous menu looked like: --- Linux Boot Menu The following targets are available on this image: boot: None install: None --- This commit makes it look something more like a traditional grub menu on both the serial console and vga console as well as providing the option to continue on using either the serial or vga console with the correct kernel arguments. You can see the screen shots attached to the bugzilla. https://bugzilla.yoctoproject.org/show_bug.cgi?id=3944 [ YOCTO #3944 ] Signed-off-by: Jason Wessel --- meta/classes/syslinux.bbclass | 128 - 1 files changed, 49 insertions(+), 79 deletions(-) diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass index c4596bf..c6a5a15 100644 --- a/meta/classes/syslinux.bbclass +++ b/meta/classes/syslinux.bbclass @@ -11,15 +11,17 @@ # ${LABELS} - a list of targets for the automatic config # ${APPEND} - an override list of append strings for each label # ${SYSLINUX_OPTS} - additional options to add to the syslinux file ';' delimited +# ${SYSLINUX_SPLASH} - A background for the vga boot menu if using the boot menu +# ${SYSLINUX_SERIAL} - Set an alternate serial port or turn off serial with empty string do_bootimg[depends] += "syslinux:do_populate_sysroot \ syslinux-native:do_populate_sysroot" SYSLINUXCFG = "${S}/syslinux.cfg" -SYSLINUXMENU = "${S}/menu" ISOLINUXDIR = "/isolinux" SYSLINUXDIR = "/" +SYSLINUX_SERIAL ?= "0 115200" ISO_BOOTIMG = "isolinux/isolinux.bin" ISO_BOOTCAT = "isolinux/boot.cat" MKISOFS_OPTIONS = "-no-emul-boot -boot-load-size 4 -boot-info-table" @@ -34,82 +36,34 @@ syslinux_populate() { # Install the config files install -m 0644 ${SYSLINUXCFG} ${DEST}${BOOTDIR}/${CFGNAME} - if [ -f ${SYSLINUXMENU} ]; then - install -m 0644 ${SYSLINUXMENU} ${DEST}${BOOTDIR} - fi } syslinux_iso_populate() { syslinux_populate ${ISODIR} ${ISOLINUXDIR} isolinux.cfg install -m 0644 ${STAGING_LIBDIR}/syslinux/isolinux.bin ${ISODIR}${ISOLINUXDIR} + if [ x${AUTO_SYSLINUXMENU} = x1 ] ; then + install -m 0644 ${STAGING_DIR}/${MACHINE}/usr/share/syslinux/vesamenu.c32 ${ISODIR}${ISOLINUXDIR}/vesamenu.c32 + if [ x${SYSLINUX_SPLASH} != x ] ; then + install -m 0644 ${SYSLINUX_SPLASH} ${ISODIR}${ISOLINUXDIR}/splash.lss + fi + fi } syslinux_hddimg_populate() { syslinux_populate ${HDDDIR} ${SYSLINUXDIR} syslinux.cfg install -m 0444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${HDDDIR}${SYSLINUXDIR}/ldlinux.sys + if [ x${AUTO_SYSLINUXMENU} = x1 ] ; then + install -m 0644 ${STAGING_DIR}/${MACHINE}/usr/share/syslinux/vesamenu.c32 ${HDDDIR}${SYSLINUXDIR}/vesamenu.c32 + if [ x${SYSLINUX_SPLASH} != x ] ; then + install -m 0644 ${SYSLINUX_SPLASH} ${HDDDIR}${SYSLINUXDIR}/splash.lss + fi + fi } syslinux_hddimg_install() { syslinux ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg } -python build_syslinux_menu () { -import copy -import sys - -workdir = d.getVar('WORKDIR', True) -if not workdir: -bb.error("WORKDIR is not defined") -return - -labels = d.getVar('LABELS', True) -if not labels: -bb.debug(1, "LABELS not defined, nothing to do") -return - -if labels == []: -bb.debug(1, "No labels, nothing to do") -return - -cfile = d.getVar('SYSLINUXMENU', True) -if not cfile: -raise bb.build.FuncFailed('Unable to read SYSLINUXMENU') - -try: -cfgfile = file(cfile, 'w') -except OSError: -raise bb.build.funcFailed('Unable to open %s' % (cfile)) - -# Beep the speaker and Clear the screen -cfgfile.write('\x07\x0C') - -# The title should be configurable -cfgfile.write('Linux Boot Menu\n') -cfgfile.write('The following targets are available on this image:\n') -cfgfile.write('\n') - -for label in labels.split(): -from copy import deepcopy -localdata = deepcopy(d) - -overrides = localdata.getVar('OVERRIDES') -if not overrides: -raise bb.build.FuncFailed('OVERRIDES not defined') -overrides = localdata.expand(overrides) - -localdata.setVar('OVERRIDES', label + ':' + overrides) -bb.data.update_data(localdata) - -usage = localdata.getVar('USAGE', True) -cfgfile.write(' \x0F\x30\x3E%16s\x0F\x30\x37: ' % (label)) -cfgfile.write('%s\n' % (usage)) - -del localdata - -cfgfile.write('\n') -c
Re: [OE-core] [PATCH 0/7] Create ext* filesystems using debugfs
Hi all, Thank you very much for all your reviewing, I will pull your comments in and send a RFC sooner. // Robert On 02/26/2013 05:24 PM, Robert Yang wrote: ===Contents=== * Summary * Brief design * Test info * The rootfs generation time changes * The rootfs size changes * Summary: The ext3 and ext4 rootfs generation relied on genext2fs and flipping some bits to "convert" the ext2 filesystem to ext3 and ext4 in the past, now we use the mkfs.ext3/ext4 to create the image, and use mkdebugfs.sh to copy the files to the image. * Brief design: - Upgrade the e2fsprogs to the update to date version (the git repo) which contains the "symlink" command in debugfs shell that we need. - Replace the current genext2fs command with mkdebugfs.sh in image_types.bbclass. - The new steps to generate the root filesystem are: -> use "dd" command to make rootfs.ext* file -> run "mkfs.ext* rootfs.ext*" to create the filesystem -> run the mkdebugfs.sh to generate the root filesystem * Test info: (MACHINE = qemuarm, IMAGE_FSTYPES = "ext2 ext3 ext4 tar.bz2") $ bitbake core-image-minimal core-image-sato meta-toolchain-sdk core-image-sato-sdk $ runqemu runqemu qemuarm core-image-sato ext3 $ runqemu runqemu qemuarm core-image-minimal ext3 All of them are OK * The rootfs generation time changes - For a core-image-minimal generation (IMAGE_FSTYPES="tar.bz2 ext3"): Before: $ time bitbake core-image-minimal real1m10.823s user0m37.108s sys 0m15.894s After: $ time bitbake core-image-minimal real1m17.501s user0m29.304s sys 0m20.731s # 7 seconds lost. - For a core-image-sato generation (IMAGE_FSTYPES="tar.bz2 ext3"): Before: $ time bitbake core-image-sato real11m10.645s user2m43.503s sys 1m1.589s After: $ time bitbake core-image-sato real11m53.131s user3m18.988s sys 2m8.350s # 43 seconds lost. * The rootfs size changes - The image size are the same by "ls -h", but different by "du -sh": (core-image-sato) $ ls -lh BEFORE.rootfs.ext3 AFTER.rootfs.ext3 | awk '{print $5"\t"$NF}' 357M BEFORE.rootfs.ext3 357M AFTER.rootfs.ext3 $ du -sh BEFORE.rootfs.ext3 AFTER.rootfs.ext3 238MBEFORE.rootfs.ext3 357MAFTER.rootfs.ext3 It seems that the genext2fs has optimized the rootfs generation. // Robert The following changes since commit 2cc4fe4a0874c42421b1bf3fa100160a9e60a9da: upstream_tracking.inc: Coonectivity and multimedia packages updates (2013-02-25 05:58:20 -0800) are available in the git repository at: git://git.pokylinux.org/poky-contrib robert/e2fsprogs http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/e2fsprogs Robert Yang (7): e2fsprogs: upgrade to the git version (rename only) e2fsprogs: upgrade to the git version e2fsprogs: add the original mkdebugfs.sh mkdebugfs.sh: convert the tab to 4 spaces mkdebugfs.sh: several fixes e2fsprogs: ship mkfsdebug.sh image_types.bbclass: replace genext2fs with mkdebugfs.sh meta/classes/image_types.bbclass | 45 +--- meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 4 +- .../{e2fsprogs-1.42.6 => e2fsprogs}/acinclude.m4 | 0 .../fallocate.patch| 0 .../e2fsprogs/e2fsprogs/mkdebugfs.sh | 82 ++ .../{e2fsprogs-1.42.6 => e2fsprogs}/mkdir.patch| 0 .../remove.ldconfig.call.patch | 0 .../{e2fsprogs_1.42.6.bb => e2fsprogs_git.bb} | 6 +- 8 files changed, 106 insertions(+), 31 deletions(-) rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42.6 => e2fsprogs}/acinclude.m4 (100%) rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42.6 => e2fsprogs}/fallocate.patch (100%) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdebugfs.sh rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42.6 => e2fsprogs}/mkdir.patch (100%) rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.42.6 => e2fsprogs}/remove.ldconfig.call.patch (100%) rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.42.6.bb => e2fsprogs_git.bb} (92%) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core