Re: [OE-core] [PATCH] openssh: allow root login when debug-tweaks is enabled
On Friday 07 September 2012 17:03:44 Saul Wold wrote: > On 09/07/2012 04:56 PM, Paul Eggleton wrote: > > I'm a bit confused by this because I thought this issue had already been > > solved. Unfortunately when I looked back I see the patch was never merged: > > > > http://patches.openembedded.org/patch/29693/ > > It was merged, I just augmented that allow_empty_passwd() with another 1 > line sed to PermitRootLogin also. Ah yes, now that I search for the correct string I see it was merged. > > I agree with Phil, we really don't want to replicate dropbear's usage of > > IMAGE_FEATURES outside of image handling code - in fact there is a bug in > > the Yocto Project bugzilla (#2578) against me to remove this for > > dropbear. > > Paul, I can have a crack at it if you want. You are welcome to, but FYI it does involve modifications to dropbear itself as it does not have a runtime configuration option for this. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [CONSOLIDATED REQUEST 00/32] LSB Perl, QEMU Update & Fixes (Cover Only)
Richard, This has the set of perl/LSB related changes, I found that LSB 5.0 is expected early next year, so we can pull these after it is released before 1.4! This also adds a few (3) more simple sanity tests for sato. I also included Robert's binary_package.bbclass, which matches up with the bitbake change you have already taken. I have done some light testing with the updated qemu, I will do more early next week, once we get past RC1 Testing next we we can have QA test this more throughly. Thanks Sau! The following changes since commit 0de1827a9601143b090f751ea702fdb65a936b77: classes/mirrors: remove bogus gnutls mirror (2012-09-07 14:51:10 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib sgw/stage http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage Andreas Müller (1): pixman: merge meta-oe append into oe-core Constantin Musca (1): autoconf: use --warning=cross only if supported Franklin S. Cooper Jr (1): u-boot: Use fw_env.config if available. Kang Kai (9): ltp: update lsb: update version libclass-isa-perl: add it perl: package modules Pod-Html and Tie-Hash-NamedCapture libpod-plainer-perl: add it libdumpvalue-perl: add it libenv-perl: add it libfile-checktree-perl: add it libi18n-collate-perl: add it Khem Raj (8): arch-armv4.inc: On armv4 add --fix-v4bx to linker flags for kernel eglibc-2.16: Add kconfig infrastructure eglibc: Enable kconfig for option management kconfig-frontends: Create symlinks for conf and mconf qemu-git: Move to tip of git past 1.2 release qemu: Update from 0.15 to 1.2 machines/x86: Drop redundant glibc configure knobs runqemu-internal: New qemu calls it qemu-system-i386 for x86 Martin Jansa (1): pixman: ignore NEON, IWMMXT, LOONGSON_MMI variables for class-native Robert Yang (2): bin_package.bbclass: binary package recipe class package_rpm.bbclass: fix incremental rpm image generation Ross Burton (2): xserver-xorg-lite: remove xserver-xorg: make DRI/GLX options respect opengl distro feature Saul Wold (3): Add package wget and perl modules. quota: add inherit gettext core-image: allow root login when debug-tweaks is enabled Veerabrahmam vr (4): qemuimagetest: basic function to check bash exists qemuimagetest: add basic function to check enough disk space qemuimagetest: add basic function to check syslogd qemuimagetest: modifying the scenario file as per new test cases meta/classes/bin_package.bbclass | 36 + meta/classes/image.bbclass |1 + meta/classes/package_rpm.bbclass |4 +- meta/conf/machine/include/arm/arch-armv4.inc |1 + meta/conf/machine/include/ia32-base.inc|5 - meta/conf/machine/qemux86-64.conf |3 - meta/conf/machine/qemux86.conf |4 - meta/recipes-bsp/u-boot/u-boot.inc | 16 +- meta/recipes-bsp/u-boot/u-boot_2011.03.bb |2 +- meta/recipes-bsp/u-boot/u-boot_2011.06.bb |2 +- meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb |2 +- .../0001-eglibc-menuconfig-support.patch | 1007 ...0002-eglibc-menuconfig-hex-string-options.patch | 169 ...0003-eglibc-menuconfig-build-instructions.patch | 176 meta/recipes-core/eglibc/eglibc-initial.inc|1 + meta/recipes-core/eglibc/eglibc-options.inc|4 +- meta/recipes-core/eglibc/eglibc.inc|4 + meta/recipes-core/eglibc/eglibc_2.16.bb|8 +- .../autoconf/check-automake-cross-warning.patch| 34 + meta/recipes-devtools/autoconf/autoconf_2.69.bb|3 +- .../kconfig-frontends/kconfig-frontends_3.5.bb |8 +- meta/recipes-devtools/perl/perl-5.14.2/config.sh |2 +- .../qemu-0.15.1/0001-ppc64-Fix-linker-script.patch | 46 - .../a4d1f142542935b90d2eb30f3aead4edcf455fe6.patch | 66 -- ...-Actually-raise-interrupt-on-timer-expiry.patch | 41 - .../qemu-0.15.1/ppc-s500-set-invalid-mask.patch| 610 .../qemu/{qemu-0.15.1 => qemu-1.2.0}/arm-bgr.patch | 12 +- .../enable-i386-linux-user.patch |0 .../fallback-to-safe-mmap_min_addr.patch |0 .../fix-configure-checks.patch | 18 +- .../{qemu-0.15.1 => qemu-1.2.0}/init-info.patch|0 .../larger_default_ram_size.patch |0 .../{qemu-0.15.1 => qemu-1.2.0}/linker-flags.patch | 14 +- .../{qemu-0.15.1 => qemu-1.2.0}/no-strip.patch |0 .../{qemu-0.15.1 => qemu-1.2.0}/powerpc_rom.bin| Bin 4096 -> 4096 bytes .../qemu-vmware-vga-depth.patch| 70 +- .../recipes-devtools/qemu/qemu-git/powerpc_rom.bin | Bin 0 -> 4096 bytes .../qemu/{qemu_0.15.1.bb => qemu_1.2.0.bb} | 18 +- meta/recipes-devtools/qemu/qemu_git.bb | 15 +- .../lsb/{lsb_1.4.bb => lsb_4.1
Re: [OE-core] [PATCH] openssh: allow root login when debug-tweaks is enabled
On 09/07/2012 04:56 PM, Paul Eggleton wrote: On Friday 07 September 2012 11:17:29 Saul Wold wrote: This allows root to login over ssh with an empty password just like dropbear when the debug-tweaks are enabled, it's important to disable debug-tweaks for a production system as this will leave open a security hole! Thanks to Marc for the settings. Cc: Marc Ferland [Yocto #3078] Signed-off-by: Saul Wold --- meta/recipes-connectivity/openssh/openssh_6.0p1.bb |9 - 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/meta/recipes-connectivity/openssh/openssh_6.0p1.bb b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb index 31202d4..fcd082c 100644 --- a/meta/recipes-connectivity/openssh/openssh_6.0p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb @@ -7,7 +7,7 @@ SECTION = "console/network" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507" -PR = "r3" +PR = "r4" DEPENDS = "zlib openssl" DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" @@ -75,6 +75,13 @@ do_install_append () { install -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd fi done + for i in ${IMAGE_FEATURES}; + do + if [ ${i} = "debug-tweaks" ]; then + sed -i -e "s/^#PermitRootLogin/PermitRootLogin/" ${D}${sysconfdir}/ssh/sshd_config + sed -i -e "s/^#PermitEmptyPasswords no/PermitEmptyPasswords yes/" ${D}${sysconfdir}/ssh/sshd_config + fi + done install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin I'm a bit confused by this because I thought this issue had already been solved. Unfortunately when I looked back I see the patch was never merged: http://patches.openembedded.org/patch/29693/ It was merged, I just augmented that allow_empty_passwd() with another 1 line sed to PermitRootLogin also. I agree with Phil, we really don't want to replicate dropbear's usage of IMAGE_FEATURES outside of image handling code - in fact there is a bug in the Yocto Project bugzilla (#2578) against me to remove this for dropbear. Paul, I can have a crack at it if you want. Sau! Cheers, Paul ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] openssh: allow root login when debug-tweaks is enabled
On Friday 07 September 2012 11:17:29 Saul Wold wrote: > This allows root to login over ssh with an empty password just like > dropbear when the debug-tweaks are enabled, it's important to disable > debug-tweaks for a production system as this will leave open a security > hole! > > Thanks to Marc for the settings. > Cc: Marc Ferland > > [Yocto #3078] > > Signed-off-by: Saul Wold > --- > meta/recipes-connectivity/openssh/openssh_6.0p1.bb |9 - > 1 files changed, 8 insertions(+), 1 deletions(-) > > diff --git a/meta/recipes-connectivity/openssh/openssh_6.0p1.bb > b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb index 31202d4..fcd082c > 100644 > --- a/meta/recipes-connectivity/openssh/openssh_6.0p1.bb > +++ b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb > @@ -7,7 +7,7 @@ SECTION = "console/network" > LICENSE = "BSD" > LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507" > > -PR = "r3" > +PR = "r4" > > DEPENDS = "zlib openssl" > DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" > @@ -75,6 +75,13 @@ do_install_append () { > install -m 0755 ${WORKDIR}/sshd > ${D}${sysconfdir}/pam.d/sshd > fi > done > + for i in ${IMAGE_FEATURES}; > + do > + if [ ${i} = "debug-tweaks" ]; then > + sed -i -e "s/^#PermitRootLogin/PermitRootLogin/" > ${D}${sysconfdir}/ssh/sshd_config + sed -i -e > "s/^#PermitEmptyPasswords > no/PermitEmptyPasswords yes/" ${D}${sysconfdir}/ssh/sshd_config + > fi > + done > install -d ${D}${sysconfdir}/init.d > install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd > rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin I'm a bit confused by this because I thought this issue had already been solved. Unfortunately when I looked back I see the patch was never merged: http://patches.openembedded.org/patch/29693/ I agree with Phil, we really don't want to replicate dropbear's usage of IMAGE_FEATURES outside of image handling code - in fact there is a bug in the Yocto Project bugzilla (#2578) against me to remove this for dropbear. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][meta][PATCH v3] u-boot: Use fw_env.config if available.
* Add support for board specific fw_env.config file if available. Signed-off-by: Franklin S. Cooper Jr --- meta/recipes-bsp/u-boot/u-boot.inc | 16 +++- meta/recipes-bsp/u-boot/u-boot_2011.03.bb|2 +- meta/recipes-bsp/u-boot/u-boot_2011.06.bb|2 +- meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb |2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index a8642f0..ae53b90 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -49,6 +49,11 @@ do_install () { install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} +if [ -e ${WORKDIR}/fw_env.config ] ; then +install -d ${D}${sysconfdir} +install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config +fi + if [ "x${SPL_BINARY}" != "x" ] then install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} @@ -56,16 +61,17 @@ do_install () { fi } -FILES_${PN} = "/boot" +FILES_${PN} = "/boot ${sysconfdir}" FILESPATH =. "${FILE_DIRNAME}/u-boot-git/${MACHINE}:" do_deploy () { install -d ${DEPLOYDIR} - install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} +install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - cd ${DEPLOYDIR} - rm -f ${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK} +cd ${DEPLOYDIR} +rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK} +ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK} +ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY} if [ "x${SPL_BINARY}" != "x" ] then diff --git a/meta/recipes-bsp/u-boot/u-boot_2011.03.bb b/meta/recipes-bsp/u-boot/u-boot_2011.03.bb index 8465395..a9cbeca 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2011.03.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2011.03.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \ SRCREV = "19b54a701811220221fc4d5089a2bb18892018ca" PV = "v2011.03+git${SRCPV}" -PR = "r7" +PR = "r8" SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" diff --git a/meta/recipes-bsp/u-boot/u-boot_2011.06.bb b/meta/recipes-bsp/u-boot/u-boot_2011.06.bb index 9654795..a115ed2 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2011.06.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2011.06.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \ SRCREV = "b1af6f532e0d348b153d5c148369229d24af361a" PV = "v2011.06+git${SRCPV}" -PR = "r2" +PR = "r3" SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" diff --git a/meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb b/meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb index c4ec50d..6c099b1 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb @@ -20,7 +20,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" SRCREV = "415d386877df49eb051b85ef74fa59a16dc17c7d" PV = "v2012.04.01+git${SRCPV}" -PR = "r1" +PR = "r2" SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git" -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V3] base-files: provide a mechanism to skip creation of the hostname file
On 9/7/12 5:51 PM, Richard Purdie wrote: On Fri, 2012-09-07 at 16:51 -0500, Mark Hatle wrote: From: Mark Asselstine The existence of a /etc/hostname file causes any hostname provided on the kernel command line or via dhcp to be overwritten by the initscripts 'init.d/hostname.sh'. This change allows you to set a value of "" for 'hostname' which will skip the creation of the /etc/hostname file by the base-files package. Signed-off-by: Mark Asselstine Signed-off-by: Jason Wessel Signed-off-by: Mark Hatle --- meta/recipes-core/base-files/base-files_3.0.14.bb | 12 +++- 1 files changed, 7 insertions(+), 5 deletions(-) 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 6bab040..cda13f4 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 @@ -107,10 +107,12 @@ do_install () { } do_install_basefilesissue () { - if [ -n "${MACHINE}" -a "${hostname}" = "openembedded" ]; then - echo ${MACHINE} > ${D}${sysconfdir}/hostname - else - echo ${hostname} > ${D}${sysconfdir}/hostname + if [ "${hostname}" != "" ]; then + if [ -n "${MACHINE}" -a "${hostname}" = "openembedded" ]; then + echo ${MACHINE} > ${D}${sysconfdir}/hostname + else + echo ${hostname} > ${D}${sysconfdir}/hostname + fi fi Is this missing a hostname ??= "openembedded" perhaps? There is already a hostname = "openembedded" in the package. Nothing in that part was changed by this patch. The normal override process is to define hostname_override = "newhostname". I verified this is working properly. --Mark Cheers, Richard install -m 644 ${WORKDIR}/issue* ${D}${sysconfdir} @@ -144,5 +146,5 @@ FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses" PACKAGE_ARCH = "${MACHINE_ARCH}" -CONFFILES_${PN} = "${sysconfdir}/fstab ${sysconfdir}/hostname" +CONFFILES_${PN} = "${sysconfdir}/fstab ${@['', '${sysconfdir}/hostname'][(d.getVar('hostname', True) != '')]}" ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V3] base-files: provide a mechanism to skip creation of the hostname file
On Fri, 2012-09-07 at 16:51 -0500, Mark Hatle wrote: > From: Mark Asselstine > > The existence of a /etc/hostname file causes any hostname provided on > the kernel command line or via dhcp to be overwritten by the > initscripts 'init.d/hostname.sh'. This change allows you to set a > value of "" for 'hostname' which will skip the creation of the > /etc/hostname file by the base-files package. > > Signed-off-by: Mark Asselstine > Signed-off-by: Jason Wessel > Signed-off-by: Mark Hatle > --- > meta/recipes-core/base-files/base-files_3.0.14.bb | 12 +++- > 1 files changed, 7 insertions(+), 5 deletions(-) > > 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 6bab040..cda13f4 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 > @@ -107,10 +107,12 @@ do_install () { > } > > do_install_basefilesissue () { > - if [ -n "${MACHINE}" -a "${hostname}" = "openembedded" ]; then > - echo ${MACHINE} > ${D}${sysconfdir}/hostname > - else > - echo ${hostname} > ${D}${sysconfdir}/hostname > + if [ "${hostname}" != "" ]; then > + if [ -n "${MACHINE}" -a "${hostname}" = "openembedded" ]; then > + echo ${MACHINE} > ${D}${sysconfdir}/hostname > + else > + echo ${hostname} > ${D}${sysconfdir}/hostname > + fi > fi Is this missing a hostname ??= "openembedded" perhaps? Cheers, Richard > install -m 644 ${WORKDIR}/issue* ${D}${sysconfdir} > @@ -144,5 +146,5 @@ FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses" > > PACKAGE_ARCH = "${MACHINE_ARCH}" > > -CONFFILES_${PN} = "${sysconfdir}/fstab ${sysconfdir}/hostname" > +CONFFILES_${PN} = "${sysconfdir}/fstab ${@['', > '${sysconfdir}/hostname'][(d.getVar('hostname', True) != '')]}" > ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] openssh: allow root login when debug-tweaks is enabled
On Fri, Sep 7, 2012 at 2:09 PM, Phil Blundell wrote: > > I know dropbear does this sort of thing already but we should really try > not to add more of that stuff. If it's an IMAGE_FEATURE then it should > really be getting handled at the rootfs level, not burned into the > packages in the feed. infact yes thats a good approach. I have something similar locally implemented as ROOTFS_POSTPROCESS_COMMAND ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] openssh: allow root login when debug-tweaks is enabled
This allows root to login over ssh with an empty password just like dropbear when the debug-tweaks are enabled, it's important to disable debug-tweaks for a production system as this will leave open a security hole! Thanks to Marc for the settings. Cc: Marc Ferland [Yocto #3078] Signed-off-by: Saul Wold --- meta/recipes-connectivity/openssh/openssh_6.0p1.bb |9 - 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/meta/recipes-connectivity/openssh/openssh_6.0p1.bb b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb index 31202d4..fcd082c 100644 --- a/meta/recipes-connectivity/openssh/openssh_6.0p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb @@ -7,7 +7,7 @@ SECTION = "console/network" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507" -PR = "r3" +PR = "r4" DEPENDS = "zlib openssl" DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" @@ -75,6 +75,13 @@ do_install_append () { install -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd fi done + for i in ${IMAGE_FEATURES}; + do + if [ ${i} = "debug-tweaks" ]; then + sed -i -e "s/^#PermitRootLogin/PermitRootLogin/" ${D}${sysconfdir}/ssh/sshd_config + sed -i -e "s/^#PermitEmptyPasswords no/PermitEmptyPasswords yes/" ${D}${sysconfdir}/ssh/sshd_config + fi + done install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin -- 1.7.7.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] qt4: Update qt4.inc to remove staticdev deps in -dbg packages
It appears that the qt4.inc had a copy/paste error relating to creating a list of staticdev packages, that caused them to show up as dependencies in the -dbg package. Signed-off-by: Mark Hatle --- meta/recipes-qt/qt4/qt4-embedded.inc |2 +- meta/recipes-qt/qt4/qt4-x11-free.inc |2 +- meta/recipes-qt/qt4/qt4.inc |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index de1b88e..53eb652 100644 --- a/meta/recipes-qt/qt4/qt4-embedded.inc +++ b/meta/recipes-qt/qt4/qt4-embedded.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is SECTION = "libs" HOMEPAGE = "http://qt.nokia.com"; DEPENDS += "directfb tslib" -INC_PR = "r47" +INC_PR = "r48" QT_BASE_LIB ?= "libqt-embedded" diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index e229b85..0ae74f7 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc @@ -6,7 +6,7 @@ SECTION = "x11/libs" DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" PROVIDES += "qt4-x11" -INC_PR = "r45" +INC_PR = "r46" QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " QT_GLFLAGS_qemux86 = "-opengl" diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index b8c6baf..ba231ba 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -61,7 +61,7 @@ python __anonymous () { staticdev_packages.append("%s-staticdev" % pkg) for name in d.getVar("OTHER_PACKAGES", True).split(): dbg_packages.append("%s-dbg" % name) -dbg_packages.append("%s-staticdev" % name) +staticdev_packages.append("%s-staticdev" % name) for name in d.getVar("QT_EXTRA_LIBS", True).split(): pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4" -- 1.7.3.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] Minor fix to qt4 -dbg packages
The following changes since commit 0de1827a9601143b090f751ea702fdb65a936b77: classes/mirrors: remove bogus gnutls mirror (2012-09-07 14:51:10 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib mhatle/qt4 http://git.yoctoproject.org/cgit.cgi//log/?h=mhatle/qt4 Mark Hatle (1): qt4: Update qt4.inc to remove staticdev deps in -dbg packages meta/recipes-qt/qt4/qt4-embedded.inc |2 +- meta/recipes-qt/qt4/qt4-x11-free.inc |2 +- meta/recipes-qt/qt4/qt4.inc |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- 1.7.3.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] package_rpm.bbclass: Avoid unnecessary installs in complementary pass
When called with the complementary install option, the first step is to backup the install manifest so that we can avoid installing items previously installed. However, this backup process skipped the initial_install portion of the manifest, causing early install items like libc6, bash, and base-files to be installed a second time. Fix this by cating the files to original_solution. This is done as an append to allow multiple calls to package_install_internal_rpm to work. Signed-off-by: Mark Hatle --- meta/classes/package_rpm.bbclass |9 - 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 742f292..7e3dfbe 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -313,7 +313,14 @@ package_install_internal_rpm () { done fi else - mv ${target_rootfs}/install/total_solution.manifest ${target_rootfs}/install/original_solution.manifest + # We may run through the complementary installs multiple times. For each time + # we should add the previous solution manifest to the full "original" set to + # avoid duplicate install steps. + echo "Update original solution..." + cat ${target_rootfs}/install/initial_solution.manifest >> ${target_rootfs}/install/original_solution.manifest + cat ${target_rootfs}/install/total_solution.manifest >> ${target_rootfs}/install/original_solution.manifest + rm ${target_rootfs}/install/initial_solution.manifest + rm ${target_rootfs}/install/total_solution.manifest fi # Setup manifest of packages to install... -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] Enhancement / bug fixes to the complementary install
This is one bug fix and one enhancement to the complementary install. We have a use where we would like to call the complementary install directly with a set of parameters, the enhancement allows us to do this. The bug fix is specific to the implementation within the RPM rootfs generation. Without the fix, a suboptimal installation is generated and performed. The following changes since commit 0de1827a9601143b090f751ea702fdb65a936b77: classes/mirrors: remove bogus gnutls mirror (2012-09-07 14:51:10 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib mhatle/comp_install http://git.yoctoproject.org/cgit.cgi//log/?h=mhatle/comp_install Mark Hatle (2): image.bbclass: Enable the complementary install to be called w/ globbing params package_rpm.bbclass: Avoid unnecessary installs in complementary pass meta/classes/image.bbclass |4 +++- meta/classes/package_rpm.bbclass |9 - 2 files changed, 11 insertions(+), 2 deletions(-) -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] image.bbclass: Enable the complementary install to be called w/ globbing params
If the image.bbclass is called with arguments, and these arguments are not "populate_sdk", they will be passed in as the expected GLOBS. This enables external components and scripting to use the rootfs_install_complementary code. Signed-off-by: Mark Hatle --- meta/classes/image.bbclass |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 2e95556..9433d48 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -329,8 +329,10 @@ rootfs_install_complementary() { list_installed_packages arch > ${WORKDIR}/installed_pkgs.txt # Apply the globs to all the packages currently installed -if [ "$1" = "populate_sdk" ] ; then +if [ -n "$1" -a "$1" = "populate_sdk" ] ; then GLOBS="${SDKIMAGE_INSTALL_COMPLEMENTARY}" +elif [ -n "$1" ]; then +GLOBS="$@" else GLOBS="${IMAGE_INSTALL_COMPLEMENTARY}" # Add locales -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3] base-files: provide a mechanism to skip creation of the hostname file
From: Mark Asselstine The existence of a /etc/hostname file causes any hostname provided on the kernel command line or via dhcp to be overwritten by the initscripts 'init.d/hostname.sh'. This change allows you to set a value of "" for 'hostname' which will skip the creation of the /etc/hostname file by the base-files package. Signed-off-by: Mark Asselstine Signed-off-by: Jason Wessel Signed-off-by: Mark Hatle --- meta/recipes-core/base-files/base-files_3.0.14.bb | 12 +++- 1 files changed, 7 insertions(+), 5 deletions(-) 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 6bab040..cda13f4 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 @@ -107,10 +107,12 @@ do_install () { } do_install_basefilesissue () { - if [ -n "${MACHINE}" -a "${hostname}" = "openembedded" ]; then - echo ${MACHINE} > ${D}${sysconfdir}/hostname - else - echo ${hostname} > ${D}${sysconfdir}/hostname + if [ "${hostname}" != "" ]; then + if [ -n "${MACHINE}" -a "${hostname}" = "openembedded" ]; then + echo ${MACHINE} > ${D}${sysconfdir}/hostname + else + echo ${hostname} > ${D}${sysconfdir}/hostname + fi fi install -m 644 ${WORKDIR}/issue* ${D}${sysconfdir} @@ -144,5 +146,5 @@ FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses" PACKAGE_ARCH = "${MACHINE_ARCH}" -CONFFILES_${PN} = "${sysconfdir}/fstab ${sysconfdir}/hostname" +CONFFILES_${PN} = "${sysconfdir}/fstab ${@['', '${sysconfdir}/hostname'][(d.getVar('hostname', True) != '')]}" -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] openssh: allow root login when debug-tweaks is enabled
On Fri, 2012-09-07 at 11:17 -0700, Saul Wold wrote: > + for i in ${IMAGE_FEATURES}; > + do > + if [ ${i} = "debug-tweaks" ]; then Using ${IMAGE_FEATURES} in a package postinst is pretty unwholesome. If you do: $ IMAGE_FEATURES=debug-tweaks bitbake openssh $ sleep $[21*86400] $ IMAGE_FEATURES=no-debug-tweaks bitbake my-production-image then there is a significant risk that you will accidentally get the insecure openssh in your image without realising it. I know dropbear does this sort of thing already but we should really try not to add more of that stuff. If it's an IMAGE_FEATURE then it should really be getting handled at the rootfs level, not burned into the packages in the feed. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] openssh: allow root login when debug-tweaks is enabled
On 09/07/2012 01:52 PM, Khem Raj wrote: On Fri, Sep 7, 2012 at 11:17 AM, Saul Wold wrote: + for i in ${IMAGE_FEATURES}; + do + if [ ${i} = "debug-tweaks" ]; then + sed -i -e "s/^#PermitRootLogin/PermitRootLogin/" ${D}${sysconfdir}/ssh/sshd_config + sed -i -e "s/^#PermitEmptyPasswords no/PermitEmptyPasswords yes/" ${D}${sysconfdir}/ssh/sshd_config + fi + done instead of looping could you apply same logic as in dropbear to do this thing ? dropbear seems to do it as a patch, not in the do_install_append, also looking at dropbear it may be possible to simplify that it seems like it's a 2 step process that could be done in one step. I think DISTRO_TYPE is only used in dropbear. I guess its possible to export a variable that can be read by the install_append(), I will give it a test. Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] openssh: allow root login when debug-tweaks is enabled
On Fri, Sep 7, 2012 at 11:17 AM, Saul Wold wrote: > + for i in ${IMAGE_FEATURES}; > + do > + if [ ${i} = "debug-tweaks" ]; then > + sed -i -e "s/^#PermitRootLogin/PermitRootLogin/" > ${D}${sysconfdir}/ssh/sshd_config > + sed -i -e "s/^#PermitEmptyPasswords > no/PermitEmptyPasswords yes/" ${D}${sysconfdir}/ssh/sshd_config > + fi > + done instead of looping could you apply same logic as in dropbear to do this thing ? ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] openssh: allow root login when debug-tweaks is enabled
This allows root to login over ssh with an empty password just like dropbear when the debug-tweaks are enabled, it's important to disable debug-tweaks for a production system as this will leave open a security hole! Thanks to Marc for the settings. Cc: Marc Ferland [Yocto #3078] Signed-off-by: Saul Wold --- meta/recipes-connectivity/openssh/openssh_6.0p1.bb |9 - 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/meta/recipes-connectivity/openssh/openssh_6.0p1.bb b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb index 31202d4..fcd082c 100644 --- a/meta/recipes-connectivity/openssh/openssh_6.0p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_6.0p1.bb @@ -7,7 +7,7 @@ SECTION = "console/network" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507" -PR = "r3" +PR = "r4" DEPENDS = "zlib openssl" DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" @@ -75,6 +75,13 @@ do_install_append () { install -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd fi done + for i in ${IMAGE_FEATURES}; + do + if [ ${i} = "debug-tweaks" ]; then + sed -i -e "s/^#PermitRootLogin/PermitRootLogin/" ${D}${sysconfdir}/ssh/sshd_config + sed -i -e "s/^#PermitEmptyPasswords no/PermitEmptyPasswords yes/" ${D}${sysconfdir}/ssh/sshd_config + fi + done install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin -- 1.7.7.6 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] base-files: provide a mechanism to skip creation of the hostname file
On 8/30/12 12:20 PM, Mark Asselstine wrote: On August 28, 2012 21:11:47 Burton, Ross wrote: On 28 August 2012 21:01, Mark Asselstine wrote: But surely this should be running very early in the boot, and a DHCP-assigned name should be running afterwards? That hasn't been what I have observed, and doesn't cover the command line case. If you have an NFS root this would also not be the case as init will be run after the network is setup and root mounted. There was an implied "and if this isn't the case, a bug should be filed". I hadn't thought about NFS-root though. Ross Thanks for your thoughts on this. Is there anything else I can contribute here? I found a bug with this patch. If you are building with the deb packaging then the conffiles is set to /etc/hostname, but the file may not always be created... this causes a failure condition when generating .deb packages. i.e.: -CONFFILES_${PN} = "${sysconfdir}/fstab ${sysconfdir}/hostname" +CONFFILES_${PN} = "${sysconfdir}/fstab ${@['', '${sysconfdir}/hostname'][(d.getVar('hostname', True) != '')]}" Mark ___ 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] autotools.bbclass: Add functionality to force a distclean when reconfiguring
On Fri, 2012-09-07 at 18:09 +0100, Richard Purdie wrote: > The key places people get bitten are eglibc and gcc so those should be > straight forward to test, the question is how widely to deploy this > initially. I think the mechanism is good, its now just a question of the > implementation detail. Eglibc and gcc, at least, support building with ${B} != ${S} so it might be easier/quicker to just blow away the whole ${B} tree rather than trying to distclean it. I imagine that most modern-ish autotools-based packages will also build fine in that configuration, though there are bound to be some that don't. It's hard to say whether there are likely to be more or fewer of those than there are ones where "make distclean" fails. p. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] autotools.bbclass: Add functionality to force a distclean when reconfiguring
On Fri, 2012-09-07 at 17:42 +0100, Burton, Ross wrote: > On 7 September 2012 17:32, Mark Hatle wrote: > > I'm curious, is there any [easy] way we can force a rerun of configure as a > > test pass over the system? > > > > I'd like a way to verify that both this patch works as expected, and future > > recipes work as expected. (It would also be nice to test the things that > > don't use the autotools.bbclass..) > > Yeah, I expect we'll discover some cases when upstream just don't > expect a distclean. By generally taking from git and re-running the > entire autotools we *should* be okay, but... Further testing suggests we either going to need a whitelist or a blacklist for this :/ The key places people get bitten are eglibc and gcc so those should be straight forward to test, the question is how widely to deploy this initially. I think the mechanism is good, its now just a question of the implementation detail. FWIW, libgpg-error fails with checksum issues (checksumming a generated file?!) and libtool has issues about cleaning directories that have makefiles that were never generated... 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] autotools.bbclass: Add functionality to force a distclean when reconfiguring
On 7 September 2012 17:32, Mark Hatle wrote: > I'm curious, is there any [easy] way we can force a rerun of configure as a > test pass over the system? > > I'd like a way to verify that both this patch works as expected, and future > recipes work as expected. (It would also be nice to test the things that > don't use the autotools.bbclass..) Yeah, I expect we'll discover some cases when upstream just don't expect a distclean. By generally taking from git and re-running the entire autotools we *should* be okay, but... Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] autotools.bbclass: Add functionality to force a distclean when reconfiguring
On Fri, 2012-09-07 at 11:32 -0500, Mark Hatle wrote: > I'm curious, is there any [easy] way we can force a rerun of configure as a > test > pass over the system? rm tmp/stamps/*/*do_configure* along with a rename of the sstate cache so it doesn't get used. > I'd like a way to verify that both this patch works as expected, and future > recipes work as expected. (It would also be nice to test the things that > don't > use the autotools.bbclass..) 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] autotools.bbclass: Add functionality to force a distclean when reconfiguring
I'm curious, is there any [easy] way we can force a rerun of configure as a test pass over the system? I'd like a way to verify that both this patch works as expected, and future recipes work as expected. (It would also be nice to test the things that don't use the autotools.bbclass..) --Mark On 9/7/12 11:05 AM, Richard Purdie wrote: Unfortunately whilst reruning configure and make against a project will mostly work there are situations where it does not correctly do the right thing. In particular, eglibc and gcc will fail out with errors where settings do not match a previously built configuration. It could be argued they are broken but the situation is what it is. There is the possibility of more subtle errors too. This patch adds a "make distclean" call to recipes where configure is rerunning and the sstate checksum for do_configure has changed. We could simply use a stamp but saving out the previous configuration checksum adds some data at no real overhead. If we find there are things out there which don't have a "distclean" target, we can disable this behaviour with CONFIGURESTAMPFILE = "" in the recipe, or users could disable it globally. [YOCTO #2774] [YOCTO #2848] Signed-off-by: Richard Purdie --- diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 4c4bf87..1ab2e0c 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -89,7 +89,16 @@ oe_runconf () { AUTOTOOLS_AUXDIR ?= "${S}" +CONFIGURESTAMPFILE = "${WORKDIR}/configure.sstate" + autotools_do_configure() { + if [ -n "${CONFIGURESTAMPFILE}" -a -e "${CONFIGURESTAMPFILE}" ]; then + if [ "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" ]; then + echo "Previously configured build detected, running make distclean" + oe_runmake distclean + fi + fi + case ${PN} in autoconf*) ;; @@ -180,6 +189,9 @@ autotools_do_configure() { else bbnote "nothing to configure" fi + if [ -n "${CONFIGURESTAMPFILE}" ]; then + echo ${BB_TASKHASH} > ${CONFIGURESTAMPFILE} + fi } autotools_do_install() { ___ 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 2/2] tzdata: install /etc/localtime alongside /etc/timezone
On Thu, Sep 6, 2012 at 2:32 AM, Paul Eggleton wrote: > > So I agree this is hard to do properly now and is going to be impossible to > keep up with as time goes on, but where do you get this from? read the links I posted in this thread earlier. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Cannot find -lssp during uclibc package build
On Fri, Sep 7, 2012 at 1:46 AM, Giuseppe Condorelli wrote: > Update: removing ssp from DISTRO_FEATURES solve to build error but > (obviously) remove ssp support > from uclibc package. > Is there a way to avoid this? I think uclibc should not need this option to build itself to be ssp capable. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] autotools.bbclass: Add functionality to force a distclean when reconfiguring
Unfortunately whilst reruning configure and make against a project will mostly work there are situations where it does not correctly do the right thing. In particular, eglibc and gcc will fail out with errors where settings do not match a previously built configuration. It could be argued they are broken but the situation is what it is. There is the possibility of more subtle errors too. This patch adds a "make distclean" call to recipes where configure is rerunning and the sstate checksum for do_configure has changed. We could simply use a stamp but saving out the previous configuration checksum adds some data at no real overhead. If we find there are things out there which don't have a "distclean" target, we can disable this behaviour with CONFIGURESTAMPFILE = "" in the recipe, or users could disable it globally. [YOCTO #2774] [YOCTO #2848] Signed-off-by: Richard Purdie --- diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 4c4bf87..1ab2e0c 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -89,7 +89,16 @@ oe_runconf () { AUTOTOOLS_AUXDIR ?= "${S}" +CONFIGURESTAMPFILE = "${WORKDIR}/configure.sstate" + autotools_do_configure() { + if [ -n "${CONFIGURESTAMPFILE}" -a -e "${CONFIGURESTAMPFILE}" ]; then + if [ "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" ]; then + echo "Previously configured build detected, running make distclean" + oe_runmake distclean + fi + fi + case ${PN} in autoconf*) ;; @@ -180,6 +189,9 @@ autotools_do_configure() { else bbnote "nothing to configure" fi + if [ -n "${CONFIGURESTAMPFILE}" ]; then + echo ${BB_TASKHASH} > ${CONFIGURESTAMPFILE} + fi } autotools_do_install() { ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Manual updates to upstream_tracking.inc up to 04 Sep 2012
Hi Andrei, On Friday 07 September 2012 18:34:08 Andrei Dinu wrote: > --- > .../conf/distro/include/upstream_tracking.inc | 1502 >diff --git a/meta-yocto/conf/distro/include/upstream_tracking.inc >b/meta-yocto/conf/distro/include/upstream_tracking.inc This is a patch against meta-yocto, thus it needs to be sent to p...@yoctoproject.org. Could you re-send it there please? Thanks, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] classes/core-image: improve comments listing IMAGE_FEATURES
On 09/06/2012 06:12 AM, Paul Eggleton wrote: Ensure this listing is complete. (Comment change only.) Signed-off-by: Paul Eggleton --- meta/classes/core-image.bbclass |9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index 2bfadb4..2e67018 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass @@ -15,14 +15,19 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 # - x11 - X server # - x11-base- X server with minimal environment # - x11-sato- OpenedHand Sato environment -# - tools-sdk - SDK # - tools-debug - debugging tools # - tools-profile - profiling tools # - tools-testapps - tools usable to make some device tests +# - tools-sdk - SDK (C/C++ compiler, autotools, etc.) # - nfs-server - NFS server # - ssh-server-dropbear - SSH server (dropbear) # - ssh-server-openssh - SSH server (openssh) -# - debug-tweaks- makes an image suitable for development +# - qt4-pkgs- Qt4/X11 and demo applications +# - package-management - installs package management tools and preserves the package manager database +# - debug-tweaks- makes an image suitable for development, e.g. allowing passwordless root logins +# - dev-pkgs- development packages (headers, etc.) for all installed packages in the rootfs +# - dbg-pkgs- debug symbol packages for all installed packages in the rootfs +# - doc-pkgs- documentation packages for all installed packages in the rootfs # PACKAGE_GROUP_x11 = "packagegroup-core-x11" PACKAGE_GROUP_x11-base = "packagegroup-core-x11-base" Merged into OE-Core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] classes/mirrors: remove bogus gnutls mirror
On Fri, 2012-09-07 at 14:23 +0100, Paul Eggleton wrote: > This mirror entry which maps to itself plus a slash, if matched, put the > fetcher into a circular loop until the stack space is exhausted. A patch > has been sent to fix this issue in BitBake, but we should remove the > bogus entry as well. > > (Note that this entry does not actually trigger the issue with current > master because the gnutls recipe now uses GNU_MIRROR instead of > ftp.gnutls.org, thus the bogus mirror entry is not matched.) > > Signed-off-by: Paul Eggleton > --- > meta/classes/mirrors.bbclass |1 - > 1 file changed, 1 deletion(-) Merged to master, thanks. Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] classes/mirrors: remove bogus gnutls mirror
This mirror entry which maps to itself plus a slash, if matched, put the fetcher into a circular loop until the stack space is exhausted. A patch has been sent to fix this issue in BitBake, but we should remove the bogus entry as well. (Note that this entry does not actually trigger the issue with current master because the gnutls recipe now uses GNU_MIRROR instead of ftp.gnutls.org, thus the bogus mirror entry is not matched.) Signed-off-by: Paul Eggleton --- meta/classes/mirrors.bbclass |1 - 1 file changed, 1 deletion(-) diff --git a/meta/classes/mirrors.bbclass b/meta/classes/mirrors.bbclass index 9009f20..1fd7cd8 100644 --- a/meta/classes/mirrors.bbclass +++ b/meta/classes/mirrors.bbclass @@ -27,7 +27,6 @@ ftp://ftp.gnupg.org/gcrypt/ http://gulus.USherbrooke.ca/pub/appl/GnuPG/ \n \ ftp://dante.ctan.org/tex-archive ftp://ftp.fu-berlin.de/tex/CTAN \n \ ftp://dante.ctan.org/tex-archive http://sunsite.sut.ac.jp/pub/archives/ctan/ \n \ ftp://dante.ctan.org/tex-archive http://ctan.unsw.edu.au/ \n \ -ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnutls.org/pub/gnutls/ \n \ ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.gnupg.org/gcrypt/gnutls/ \n \ ftp://ftp.gnutls.org/pub/gnutls http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \n \ ftp://ftp.gnutls.org/pub/gnutls ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/ \n \ -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC PATCH 2/2] package_ipk.bbclass: use "--force-arch" when install package
On Thu, 2012-09-06 at 13:05 +0200, Koen Kooi wrote: > Op 5 sep. 2012, om 23:19 heeft Richard Purdie > het volgende geschreven: > > > On Wed, 2012-09-05 at 15:24 +0200, Koen Kooi wrote: > >> Op 5 sep. 2012, om 13:44 heeft Richard Purdie > >> het volgende geschreven: > >> > >>> On Wed, 2012-09-05 at 12:05 +0200, Koen Kooi wrote: > Op 5 sep. 2012, om 11:31 heeft Robert Yang > het volgende geschreven: > > > This is for fixing the problem: > > 1) bitbake core-image-sato-sdk with MACHINE=qemux86 > > 2) bitbake core-image-sato with with MACHINE=crownbay > > > > The qemux86's PACKAGE_ARCH is i586, the crownbay's is core2, but several > > i586 packages will be installed into crownbay's rootfs though there are > > core2 packages. For example, there are: > > > > xserver-xorg_1.11.2-r4_i586.ipk > > xserver-xorg_1.9.3-r1_core2.ipk > > > > The crownbay.conf says: > > PREFERRED_VERSION_xserver-xorg ?= "1.9.3" > > > > What the crownbay's image needs is xserver-xorg_1.9.3-r1_core2.ipk, but > > the xserver-xorg_1.11.2-r4_i586.ipk will be installed, this is > > incorrect. > > It is the correct behaviour, though. > >>> > >>> No, it isn't. You told bitbake to build some specific versions, it did > >>> that, then put something else in the rootfs. Without mentioning any of > >>> this to the user. > >> > >> You forget that, you, as the user, instructed bitbake to build the > >> other version when switching machine. Should bitbake refuse to build > >> the packages in this scenario? > > > > That would be better than silently doing something non-deterministic. > > > > The bit I hate about this is the fact that sometimes a build would > > result in one thing, sometimes another. It should always error out with > > an invalid configuration rather than do that. > > > >> That would make more sense than trying to clean up the mess in the > >> package_ipk bbclass. If you have online feeds the problem will > >> reappear anyway. > > > > I care more about builds being deterministic than online feeds. > > Thanks for going on the record for that. We're a build system and package feed creation has always been argued to be a second step based on the output of the build system, often by you iirc. > > > >> So, fix this problem at the root and make bitbake error out if your > >> build breaks PREFERRED_VERSION. > > > > How do we detect this? I want deterministic builds so I need the error > > to appear regardless of whether I build A or B first (just like I expect > > a consistent image). > > > > I also do want to support these situations where we need special > > versions. I appreciate its ugly but we have several significant users > > with this problem and pretending it doesn't exist doesn't work, much as > > I wish we could. > > > > What I really need here is help with coming up with some working > > solution. Putting our heads in the sand and arguing whether its even a > > problem isn't going to go anywhere :(. > > Where have I argued that it's not a problem? I've said time and time > again that PREFERRED_VERSION problems are for the DISTRO to solve. You > are arguing that we should band-aid it somewhere in a class where it > would break package feeds. So my counter proposal for broken DISTROs > was to have bitbake completely prevent the user from building such a > conflicting version. I'd argue its up to the DISTRO to solve at package feed generation time and that is the point it should error. I cannot see any way bitbake can reasonably figure out this problem and accurately error as it simply doesn't have the info. At package feed generation time, you do have that info. On the other hand, the build system *can* generate images consistently. > The low-tech solution would be to document that you can't build this > combination of machines in the same TMPDIR. Wiping TMDIR between > machines changes should be quite cheap with sstate-cache nowadays, no? By your own reasoning, this is unacceptable since the generated images would differ from what online package management would result in with image upgrades. Documenting the builds aren't deterministic is a fail, we can do better. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] xserver-xorg: make DRI/GLX options respect opengl distro feature
If the distro doesn't have the opengl feature there's no point building the DRI or GLX support, making the mesa-dri build dependency optional. Signed-off-by: Ross Burton --- .../xorg-xserver/xserver-xorg-1.11.2.inc |2 +- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc| 16 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc index b4a348c..c71896a 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc @@ -8,4 +8,4 @@ SRC_URI += "file://crosscompile.patch \ SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" -PR = "r6" +PR = "r7" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index a0309aa..210abad 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -123,21 +123,13 @@ EXTRA_OECONF += "--with-fop=no \ ac_cv_file__usr_share_sgml_X11_defs_ent=no \ " -PACKAGECONFIG ??= "udev" +PACKAGECONFIG ??= "udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'glx', '', d)}" PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" +PACKAGECONFIG[glx] = "--enable-dri --enable-dri2 --enable-glx --enable-glx-tls,\ + --disable-dri --disable-glx,\ + xf86driproto dri2proto mesa-dri" do_install_append () { # Its assumed base-files creates this for us rmdir ${D}${localstatedir}/log/ } - - -# Mesa/GLX/DRI -PROTO_DEPS += "xf86driproto dri2proto" -LIB_DEPS += "mesa-dri" - -EXTRA_OECONF += "\ - --enable-dri \ - --enable-dri2 \ - --enable-glx-tls \ -" -- 1.7.10 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] xserver-xorg-lite: remove
Building xserver-xorg and not installing the DRI and GLX modules (and so not Mesa) results in an increase of 16kb compared to this package. This isn't worth the effort of maintaining two packages. Signed-off-by: Ross Burton --- .../xorg-xserver/xserver-xorg-common.inc | 129 -- .../xorg-xserver/xserver-xorg-lite.inc |8 -- .../xorg-xserver/xserver-xorg-lite_1.11.2.bb |4 - .../recipes-graphics/xorg-xserver/xserver-xorg.inc | 138 +++- 4 files changed, 134 insertions(+), 145 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.2.bb diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc deleted file mode 100644 index 6133344..000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc +++ /dev/null @@ -1,129 +0,0 @@ -DESCRIPTION = "The X.Org X server" -HOMEPAGE = "http://www.x.org"; -SECTION = "x11/base" -LICENSE = "MIT-X" -LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00" - -# xf86-*-* packages depend on an X server built with the xfree86 DDX -# so we have a virtual to represent that: -# deprecated, we should use virtual/xserver instead -PROVIDES = "virtual/xserver-xf86" - -# Other packages tend to just care that there is *an* X server: -PROVIDES += "virtual/xserver" - -PE = "2" - -XORG_PN = "xorg-server" -SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" -SRC_URI += "file://macro_tweak.patch" - -S = "${WORKDIR}/${XORG_PN}-${PV}" - -inherit autotools pkgconfig - -PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto" -LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl" -DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" - -# Split out some modules and extensions from the main package -# These aren't needed for basic operations and only take up space: -# 32.0k libdri.so -# 91.0k libexa.so -# 336.0k libglx.so -# 1360k libint10.so -# 180.0k libwfb.so -# 320.0k libxaa.so -# 124.0k libxf1bpp.so -# 84.0k libxf4bpp.so -# librecord.so -# libextmod.so -# libdbe.so - -PACKAGES =+ "${PN}-security-policy \ - ${PN}-sdl \ - ${PN}-fbdev \ - ${PN}-xprint \ - ${PN}-xvfb \ - ${PN}-utils \ - ${PN}-xephyr \ - ${PN}-multimedia-modules \ - ${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-glx \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - ${PN}-module-libint10 \ - ${PN}-module-libafb \ - ${PN}-module-libwfb \ - ${PN}-module-libmfb \ - ${PN}-module-libcfb \ - ${PN}-module-exa \ - ${PN}-module-xaa \ - ${PN}-module-libxf1bpp \ - ${PN}-module-libxf4bpp" - -RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config" -RDEPENDS_${PN}-xvfb += "xkeyboard-config" -RREPLACES_${PN}-module-exa = "${PN}" - -FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d" -FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" -FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled" -FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ -${libdir}/xorg/modules/*/.debug \ -${libdir}/xorg/modules/*/*/.debug \ -" -FILES_${PN}-security-policy += "${libdir}/xserver/SecurityPolicy" -FILES_${PN}-sdl = "${bindir}/Xsdl" -FILES_${PN}-fbdev = "${bindir}/Xfbdev" -FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print" -FILES_${PN}-xvfb = "${bindir}/Xvfb" -FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" -FILES_${PN}-xephyr = "${bindir}/Xephyr" -FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*" -FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so" -FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so" -FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensio
[OE-core] [PATCH 2/2] xserver-xorg: make DRI/GLX options respect opengl distro feature
If the distro doesn't have the opengl feature there's no point building the DRI or GLX support, making the mesa-dri build dependency optional. Signed-off-by: Ross Burton --- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 16 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index a0309aa..210abad 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -123,21 +123,13 @@ EXTRA_OECONF += "--with-fop=no \ ac_cv_file__usr_share_sgml_X11_defs_ent=no \ " -PACKAGECONFIG ??= "udev" +PACKAGECONFIG ??= "udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'glx', '', d)}" PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" +PACKAGECONFIG[glx] = "--enable-dri --enable-dri2 --enable-glx --enable-glx-tls,\ + --disable-dri --disable-glx,\ + xf86driproto dri2proto mesa-dri" do_install_append () { # Its assumed base-files creates this for us rmdir ${D}${localstatedir}/log/ } - - -# Mesa/GLX/DRI -PROTO_DEPS += "xf86driproto dri2proto" -LIB_DEPS += "mesa-dri" - -EXTRA_OECONF += "\ - --enable-dri \ - --enable-dri2 \ - --enable-glx-tls \ -" -- 1.7.10 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] rsync: Add md5sum and sha256sum for the rsync_2.6.9
On Fri, 2012-09-07 at 07:59 +0200, Martin Ertsaas wrote: > rsync_2.6.9 is the only rsync recipe in openembedded without GPLv3 license, > but it lacked the > checksums for the fetcher. > > Signed-off-by: Martin Ertsaas > --- > meta/recipes-devtools/rsync/rsync_2.6.9.bb |3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) Merged to master, thanks. Richard ___ 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] conf/tune: add tune-ppce300c3
On Fri, 2012-09-07 at 06:55 +, McClintock Matthew-B29882 wrote: > On Thu, Sep 6, 2012 at 6:07 PM, Mark Hatle wrote: > > On 9/6/12 5:59 PM, Richard Purdie wrote: > >> > >> On Thu, 2012-09-06 at 17:35 -0500, Mark Hatle wrote: > >>> > >>> On 9/6/12 5:20 PM, Bruce Ashfield wrote: > > On 12-09-06 6:19 PM, Richard Purdie wrote: > > > > On Thu, 2012-09-06 at 14:43 -0400, Bruce Ashfield wrote: > >> > >> It has been pointed out several times that the yocto mpc8315e-rdb > >> reference was using the wrong tuning (603e), since it is actually > >> a e300c3 board. > >> > >> This commit creates a e300c3 tune file based on the e300c2 variant > >> already in oe-core. > >> > >> This commit also inhibits altivec in flac when this new tuning is > >> enabled. It was also noticed that the existing tune based overrides > >> in the flac package would not be triggered since DEFAULTTUNE is not > >> in the overrides list. To avoid doing per-board disabling of altivec > >> DEFAULTTUNE is added to the local package OVERRIDES and then used > >> to disable altivec. > >> > >> [YOCTO #1192] > >> > >> Signed-off-by: Bruce Ashfield > >> > >> asdfkljds > >> Signed-off-by: Bruce Ashfield > >> --- > >> meta/conf/machine/include/tune-ppce300c3.inc | 11 +++ > >> meta/recipes-multimedia/flac/flac_1.2.1.bb |5 + > >> 2 files changed, 16 insertions(+), 0 deletions(-) > >> create mode 100644 meta/conf/machine/include/tune-ppce300c3.inc > >> > >> diff --git a/meta/conf/machine/include/tune-ppce300c3.inc > >> b/meta/conf/machine/include/tune-ppce300c3.inc > >> new file mode 100644 > >> index 000..3f5ac26 > >> --- /dev/null > >> +++ b/meta/conf/machine/include/tune-ppce300c3.inc > >> @@ -0,0 +1,11 @@ > >> +DEFAULTTUNE ?= "ppce300c3" > >> + > >> +require conf/machine/include/powerpc/arch-powerpc.inc > >> + > >> +TUNEVALID[ppce300c3] = "Enable ppce300c3 specific processor > >> optimizations" > >> +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce300c3", > >> "-mcpu=e300c3", "", d)}" > >> + > >> +AVAILTUNES += "ppce300c3" > >> +TUNE_FEATURES_tune-ppce300c3 = "m32 fpu-soft ppce300c3" > >> +TUNE_PKGARCH_tune-ppce300c3 = "ppce300c3" > >> +PACKAGE_EXTRA_ARCHS_tune-ppce300c3 = > >> "${PACKAGE_EXTRA_ARCHS_tune-powerpc-nf} ppce300c3" > >> diff --git a/meta/recipes-multimedia/flac/flac_1.2.1.bb > >> b/meta/recipes-multimedia/flac/flac_1.2.1.bb > >> index 3c5b73c..25db1c4 100644 > >> --- a/meta/recipes-multimedia/flac/flac_1.2.1.bb > >> +++ b/meta/recipes-multimedia/flac/flac_1.2.1.bb > >> @@ -36,9 +36,14 @@ EXTRA_OECONF = "--disable-oggtest > >> --disable-id3libtest \ > >> --without-xmms-exec-prefix \ > >> --without-libiconv-prefix \ > >> --without-id3lib" > >> + > >> +FLACOVERRIDE = ":${DEFAULTTUNE}" > >> +OVERRIDES .= "${FLACOVERRIDE}" > >> + > >> EXTRA_OECONF_prepend_e500mc = "--disable-altivec " > >> EXTRA_OECONF_prepend_e5500 = "--disable-altivec " > >> EXTRA_OECONF_prepend_e5500-64b = "--disable-altivec " > >> +EXTRA_OECONF_prepend_ppce300c3 = "--disable-altivec " > >> > > > > This is getting ugly and is kind of unsafe. Perhaps the architecture > > should be doing something like: > > > > MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "ppce300c3", > > ":noaltivec", "" ,d)} > > > > or even in this recipe just do: > > > > EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "ppce300c3", " > > --disable-altivec", "" ,d)} > > These don't work because you still have the other 3 lines that look > just like this. Or am I missing something? > > > > I definitely considered this route. I can do that for the new arch, and > the > old ones, but can't test the old ones at the moment. > >>> > >>> > >>> The problem is actually in the flac. This recipe sees powerpc as the > >>> machine > >>> type, and immediately enabled altivec. By default altivec support is > >>> disabled > >>> in OE-Core. > >>> > >>> Perhaps one way we could address this is add a tune flag that says if the > >>> tune > >>> has altivec support or not.. then in the flac binary, disable it unless > >>> it's > >>> enabled? > >> > >> > >> I think having altivec in the tune_features would be ideal. I'd love to > >> get this cleaned up too but I lack much knowledge about powerpc... > > > > > > My proposal then would be to accept Bruce's patch, with the understanding > > that we need to add a tune flag of 'altivec' to the PowerPC tunings (where > > appropriate) and then make the flac recipe respect that flag. > > This sounds good to me. If a bug is filed against me I can take a look > at it since I did the initial damage.
Re: [OE-core] [PATCH] automake 1.12.3: fix warnings
On 09/06/2012 09:49 PM, Saul Wold wrote: On 09/06/2012 02:49 AM, Constantin Musca wrote: - don't fail when an autoconf tool tries to pass "--warning=cross" to automake - don't show a warning when the configure.in file exists Signed-off-by: Constantin Musca --- .../automake/automake/add-cross-warning.patch | 91 .../automake/automake/no-configure.in-warn.patch | 19 meta/recipes-devtools/automake/automake_1.12.3.bb |2 + 3 files changed, 112 insertions(+) create mode 100644 meta/recipes-devtools/automake/automake/add-cross-warning.patch create mode 100644 meta/recipes-devtools/automake/automake/no-configure.in-warn.patch diff --git a/meta/recipes-devtools/automake/automake/add-cross-warning.patch b/meta/recipes-devtools/automake/automake/add-cross-warning.patch new file mode 100644 index 000..db0871e --- /dev/null +++ b/meta/recipes-devtools/automake/automake/add-cross-warning.patch @@ -0,0 +1,91 @@ +Add cross compilation warning option + While the below patch is one solution, maybe it would be better to see how it's getting called and fix it at the caller level (autoconf?) I assigned a bug to you that address this. I have sent an autoconf patch which solves the problem. ( [PATCH] autoconf: use --warning=cross only if supported ). +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Constantin Musca + +--- a/aclocal.in b/aclocal.in +@@ -942,6 +942,7 @@ Options: + -W, --warnings=CATEGORY report the warnings falling in CATEGORY + + Warning categories include: ++ cross cross compilation issues + syntaxdubious syntactic constructs (default) + unsupported unknown macros (default) + all all the warnings (default) +--- a/doc/automake.info-1 b/doc/automake.info-1 +@@ -2291,6 +2291,9 @@ misunderstand this paragraph: `automake' + extra portability issues related to obscure tools. One + example of such a tool is the Microsoft `lib' archiver. + ++`cross' ++ cross compilation issues ++ + `syntax' + weird syntax, unused variables, typos + +@@ -2821,6 +2824,9 @@ File: automake.info, Node: aclocal Opti + + `--warnings=CATEGORY' + Output warnings falling in CATEGORY. CATEGORY can be one of: ++`cross' ++ cross compilation issues ++ + `syntax' + dubious syntactic constructs, underquoted macros, unused + macros, etc. +--- a/lib/Automake/ChannelDefs.pm b/lib/Automake/ChannelDefs.pm +@@ -97,6 +97,10 @@ Errors related to GNITS Standards (silen + + Internal errors. Use C<&prog_error> to send messages over this channel. + ++=item C ++ ++cross compilation issues ++ + =item C + + Warnings related to GNU Coding Standards. +@@ -155,6 +159,7 @@ register_channel 'automake', type => 'fa + uniq_part => UP_NONE, ordered => 0; + + register_channel 'extra-portability', type => 'warning', silent => 1; ++register_channel 'cross', type => 'warning'; + register_channel 'gnu', type => 'warning'; + register_channel 'obsolete', type => 'warning', silent => 1; + register_channel 'override', type => 'warning', silent => 1; +@@ -185,6 +190,7 @@ sub usage () + { + print <+ gnuGNU coding standards (default in gnu and gnits modes) + obsolete obsolete features or constructions + override user redefinitions of Automake rules or variables +@@ -273,7 +279,11 @@ sub switch_warning ($) + $has_no = 1; + } + +- if ($cat eq 'all') ++ if ($cat eq 'cross') ++{ ++ setup_channel_type 'warning', silent => $has_no; ++} ++ elsif ($cat eq 'all') + { + setup_channel_type 'warning', silent => $has_no; + } +--- a/doc/automake.texi b/doc/automake.texi +@@ -2681,6 +2681,8 @@ Print the version number of Automake and + Output warnings falling in @var{category}. @var{category} can be + one of: + @table @code ++@item cross ++warnings related to cross compilation issues + @item gnu + warnings related to the GNU Coding Standards + (@pxref{Top, , , standards, The GNU Coding Standards}). diff --git a/meta/recipes-devtools/automake/automake/no-configure.in-warn.patch b/meta/recipes-devtools/automake/automake/no-configure.in-warn.patch new file mode 100644 index 000..46329a5 --- /dev/null +++ b/meta/recipes-devtools/automake/automake/no-configure.in-warn.patch @@ -0,0 +1,19 @@ +Don't show a warning if configure.in exists + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Constantin Musca + +--- a/lib/Automake/Configure_ac.pm b/lib/Automake/Configure_ac.pm +@@ -77,8 +77,8 @@ sub find_configure_ac (;@) + + if (-f $configure_in) + { +- msg ('obsolete', "autoconf input should be named 'configure.ac'," . +- " not 'configure.in'"); ++# msg ('obsolete', "autoconf input should be named 'configure.ac'," . ++# " not 'configure.in'"); I think this is an important war
[OE-core] [PATCH] autoconf: use --warning=cross only if supported
Adapt autoconf to pass --warning=cross to automake only if supported. [YOCTO #842] Signed-off-by: Constantin Musca --- .../autoconf/check-automake-cross-warning.patch| 34 meta/recipes-devtools/autoconf/autoconf_2.69.bb|3 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/autoconf/autoconf/check-automake-cross-warning.patch diff --git a/meta/recipes-devtools/autoconf/autoconf/check-automake-cross-warning.patch b/meta/recipes-devtools/autoconf/autoconf/check-automake-cross-warning.patch new file mode 100644 index 000..73394d7 --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf/check-automake-cross-warning.patch @@ -0,0 +1,34 @@ +Use --warning=cross only if supported by automake + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Constantin Musca + +--- a/bin/autoreconf.in b/bin/autoreconf.in +@@ -127,6 +127,8 @@ my $aclocal_supports_warnings = 0; + my $automake_supports_force_missing = 0; + # Does automake support -Wfoo? + my $automake_supports_warnings = 0; ++# Does automake support --warning=cross ++my $automake_supports_cross_warning = 0; + + my @prepend_include; + my @include; +@@ -191,6 +193,7 @@ sub parse_args () + $aclocal_supports_warnings = $aclocal_help =~ /--warnings/; + $automake_supports_force_missing = $automake_help =~ /--force-missing/; + $automake_supports_warnings = $automake_help =~ /--warnings/; ++ $automake_supports_cross_warning = $automake_help =~ /cross/; + + # Dispatch autoreconf's option to the tools. + # --include; +@@ -244,6 +247,8 @@ sub parse_args () + $libtoolize .= ' --debug'; + } + # --warnings; ++ @warning = grep { $_ ne "cross" } @warning ++if ! $automake_supports_cross_warning; + if (@warning) + { + my $warn = ' --warnings=' . join (',', @warning); diff --git a/meta/recipes-devtools/autoconf/autoconf_2.69.bb b/meta/recipes-devtools/autoconf/autoconf_2.69.bb index 478f8ed..1ec1cb5 100644 --- a/meta/recipes-devtools/autoconf/autoconf_2.69.bb +++ b/meta/recipes-devtools/autoconf/autoconf_2.69.bb @@ -1,6 +1,6 @@ require autoconf.inc -PR = "r7" +PR = "r8" PARALLEL_MAKE = "" @@ -8,6 +8,7 @@ LICENSE = "GPLv2 & GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504" SRC_URI += "file://autoreconf-include.patch \ + file://check-automake-cross-warning.patch \ file://autoreconf-exclude.patch \ file://autoreconf-foreign.patch \ file://autoreconf-gnuconfigize.patch \ -- 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] Cannot find -lssp during uclibc package build
Update: removing ssp from DISTRO_FEATURES solve to build error but (obviously) remove ssp support from uclibc package. Is there a way to avoid this? Cheers, Giuseppe 2012/9/7 Giuseppe Condorelli > This is a forward of the mail erroneously sent only to Khem. > > > -- Forwarded message -- > From: Giuseppe Condorelli > Date: 2012/9/7 > Subject: Re: [OE-core] Cannot find -lssp during uclibc package build > To: Khem Raj > > > Hi Khem, > > many thanks for your reply (see below). > > 2012/9/7 Khem Raj > >> On Fri, Sep 7, 2012 at 12:11 AM, Giuseppe Condorelli >> wrote: >> > Any news? >> > >> > >> > 2012/9/3 Giuseppe Condorelli >> >> >> >> Hi Khem, All >> >> >> >> I'm building an uclibc image using gcc 4.6.3 instead of the 4.7 version >> >> oe-core provides. >> >> I'm falling in the following linker error during uClibc package build: >> >> >> >> "Cannot find -lssp" >> >> have a look at the 4.6 recipes from meta-openemebedded/toolchain-layer >> does that work for you ? >> > I'll look soon > >> >> and may be you have 'ssp' in DISTRO_FEATURES then remove that. >> > Yes, I've ssp enabled in DISTRO_FEATURES and I thought this was right > because > uclibc uses DISTRO_FEATURES to create its .config where UCLIBC_HAS_SSP=y > should be available, isnt' it? > >> >> >> >> >> Now, ssp support is enabled in the uClibc package and disabled in the >> >> gcc-cross-initial package, so >> >> ld should not include that by default. Instead it does and if I switch >> to >> >> old OE-Core repository (June 2012) >> >> I can see all goes right just because the gcc-cross-intermediate >> package >> >> was still present and uClibc depends on it >> >> for building. Now, I know the -intermediate package was moved out and >> the >> >> -initial one should include it, but >> >> that's it. >> >> I've not tested that with gcc 4.7 version, this is out of my scope. >> >> Please, can you address me to solve this issue? >> >> >> >> Best Regards, >> >> Giuseppe >> >> >> > >> > >> > >> > ___ >> > 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] Cannot find -lssp during uclibc package build
This is a forward of the mail erroneously sent only to Khem. -- Forwarded message -- From: Giuseppe Condorelli Date: 2012/9/7 Subject: Re: [OE-core] Cannot find -lssp during uclibc package build To: Khem Raj Hi Khem, many thanks for your reply (see below). 2012/9/7 Khem Raj > On Fri, Sep 7, 2012 at 12:11 AM, Giuseppe Condorelli > wrote: > > Any news? > > > > > > 2012/9/3 Giuseppe Condorelli > >> > >> Hi Khem, All > >> > >> I'm building an uclibc image using gcc 4.6.3 instead of the 4.7 version > >> oe-core provides. > >> I'm falling in the following linker error during uClibc package build: > >> > >> "Cannot find -lssp" > > have a look at the 4.6 recipes from meta-openemebedded/toolchain-layer > does that work for you ? > I'll look soon > > and may be you have 'ssp' in DISTRO_FEATURES then remove that. > Yes, I've ssp enabled in DISTRO_FEATURES and I thought this was right because uclibc uses DISTRO_FEATURES to create its .config where UCLIBC_HAS_SSP=y should be available, isnt' it? > > >> > >> Now, ssp support is enabled in the uClibc package and disabled in the > >> gcc-cross-initial package, so > >> ld should not include that by default. Instead it does and if I switch > to > >> old OE-Core repository (June 2012) > >> I can see all goes right just because the gcc-cross-intermediate package > >> was still present and uClibc depends on it > >> for building. Now, I know the -intermediate package was moved out and > the > >> -initial one should include it, but > >> that's it. > >> I've not tested that with gcc 4.7 version, this is out of my scope. > >> Please, can you address me to solve this issue? > >> > >> Best Regards, > >> Giuseppe > >> > > > > > > > > ___ > > 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 1/1] packagegroups-core-lsb.bbappend: add perl-dev/doc
File CORE/config.h which is provided by perl-dev and file unicore/version which is provided by perl-doc are required by LSB perl test cases. Add perl-dev and perl-doc to packagegroups-core-lsb. [Yocto #3052 #3053 #3054 #3055] Signed-off-by: Kang Kai --- .../packagegroups/packagegroup-core-lsb.bbappend |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/meta-lsb/recipes-core/packagegroups/packagegroup-core-lsb.bbappend b/meta-lsb/recipes-core/packagegroups/packagegroup-core-lsb.bbappend index 9fba0b0..60a5768 100644 --- a/meta-lsb/recipes-core/packagegroups/packagegroup-core-lsb.bbappend +++ b/meta-lsb/recipes-core/packagegroups/packagegroup-core-lsb.bbappend @@ -5,6 +5,8 @@ RDEPENDS_packagegroup-core-lsb-core_append += "wget" RDEPENDS_packagegroup-core-lsb-perl_append += "\ +perl-dev \ +perl-doc \ libclass-isa-perl \ libenv-perl \ libdumpvalue-perl \ -- 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] One more LSB patch
Hi Saul, This patch depends on the previous serious LSB patches. Only when they are merged, this patch can be merged. Thanks, Kai The following changes since commit 718c07326229912636736fd1698f121d8fd9bd76: packagegroup-core-lsb.bbappend: add bbappend file (2012-09-06 09:23:21 +0800) are available in the git repository at: git://git.pokylinux.org/poky-contrib kangkai/lsb http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/lsb Kang Kai (1): packagegroups-core-lsb.bbappend: add perl-dev/doc .../packagegroups/packagegroup-core-lsb.bbappend |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) -- 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/6] Upgrade qemu to 1.2 and eglibc with kconfig
On Thu, Sep 6, 2012 at 3:32 PM, Khem Raj wrote: > This patchset updates qemu to 1.2 release > Adds kconfig to eglibc, kconfig is of interest for > eglibc upstream which is next step. > Removes nptl and enable-tls configure options from > x86 machine configurations I missed to push a patch to runqemu-internal script to pull branch now the branch has that additional patch along with these 6 > > The following changes since commit 610f8c0c0cab8e258919689fd641faec28b58caf: > > adt-installer: Allow changing YOCTOADT_REPO (2012-09-05 23:27:31 +0100) > > are available in the git repository at: > > git://git.openembedded.org/openembedded-core-contrib > kraj/qemu-eglibc-updates > > http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/qemu-eglibc-updates > > Khem Raj (6): > eglibc-2.16: Add kconfig infrastructure > eglibc: Enable kconfig for option management > kconfig-frontends: Create symlinks for conf and mconf > qemu-git: Move to tip of git past 1.2 release > qemu: Update from 0.15 to 1.2 > machines/x86: Drop redundant glibc configure knobs > > meta/conf/machine/include/ia32-base.inc|5 - > meta/conf/machine/qemux86-64.conf |3 - > meta/conf/machine/qemux86.conf |4 - > .../0001-eglibc-menuconfig-support.patch | 1007 > > ...0002-eglibc-menuconfig-hex-string-options.patch | 169 > ...0003-eglibc-menuconfig-build-instructions.patch | 176 > meta/recipes-core/eglibc/eglibc-initial.inc|1 + > meta/recipes-core/eglibc/eglibc-options.inc|4 +- > meta/recipes-core/eglibc/eglibc.inc|4 + > meta/recipes-core/eglibc/eglibc_2.16.bb|8 +- > .../kconfig-frontends/kconfig-frontends_3.5.bb |8 +- > .../qemu-0.15.1/0001-ppc64-Fix-linker-script.patch | 46 - > .../a4d1f142542935b90d2eb30f3aead4edcf455fe6.patch | 66 -- > ...-Actually-raise-interrupt-on-timer-expiry.patch | 41 - > .../qemu-0.15.1/ppc-s500-set-invalid-mask.patch| 610 > .../qemu/{qemu-0.15.1 => qemu-1.2.0}/arm-bgr.patch | 12 +- > .../enable-i386-linux-user.patch |0 > .../fallback-to-safe-mmap_min_addr.patch |0 > .../fix-configure-checks.patch | 18 +- > .../{qemu-0.15.1 => qemu-1.2.0}/init-info.patch|0 > .../larger_default_ram_size.patch |0 > .../{qemu-0.15.1 => qemu-1.2.0}/linker-flags.patch | 14 +- > .../{qemu-0.15.1 => qemu-1.2.0}/no-strip.patch |0 > .../{qemu-0.15.1 => qemu-1.2.0}/powerpc_rom.bin| Bin 4096 -> 4096 bytes > .../qemu-vmware-vga-depth.patch| 70 +- > .../recipes-devtools/qemu/qemu-git/powerpc_rom.bin | Bin 0 -> 4096 bytes > .../qemu/{qemu_0.15.1.bb => qemu_1.2.0.bb} | 18 +- > meta/recipes-devtools/qemu/qemu_git.bb | 15 +- > 28 files changed, 1431 insertions(+), 868 deletions(-) > create mode 100644 > meta/recipes-core/eglibc/eglibc-2.16/0001-eglibc-menuconfig-support.patch > create mode 100644 > meta/recipes-core/eglibc/eglibc-2.16/0002-eglibc-menuconfig-hex-string-options.patch > create mode 100644 > meta/recipes-core/eglibc/eglibc-2.16/0003-eglibc-menuconfig-build-instructions.patch > delete mode 100644 > meta/recipes-devtools/qemu/qemu-0.15.1/0001-ppc64-Fix-linker-script.patch > delete mode 100644 > meta/recipes-devtools/qemu/qemu-0.15.1/a4d1f142542935b90d2eb30f3aead4edcf455fe6.patch > delete mode 100644 > meta/recipes-devtools/qemu/qemu-0.15.1/hw-pl031-Actually-raise-interrupt-on-timer-expiry.patch > delete mode 100644 > meta/recipes-devtools/qemu/qemu-0.15.1/ppc-s500-set-invalid-mask.patch > rename meta/recipes-devtools/qemu/{qemu-0.15.1 => qemu-1.2.0}/arm-bgr.patch > (75%) > rename meta/recipes-devtools/qemu/{qemu-0.15.1 => > qemu-1.2.0}/enable-i386-linux-user.patch (100%) > rename meta/recipes-devtools/qemu/{qemu-0.15.1 => > qemu-1.2.0}/fallback-to-safe-mmap_min_addr.patch (100%) > rename meta/recipes-devtools/qemu/{qemu-0.15.1 => > qemu-1.2.0}/fix-configure-checks.patch (59%) > rename meta/recipes-devtools/qemu/{qemu-0.15.1 => > qemu-1.2.0}/init-info.patch (100%) > rename meta/recipes-devtools/qemu/{qemu-0.15.1 => > qemu-1.2.0}/larger_default_ram_size.patch (100%) > rename meta/recipes-devtools/qemu/{qemu-0.15.1 => > qemu-1.2.0}/linker-flags.patch (64%) > rename meta/recipes-devtools/qemu/{qemu-0.15.1 => qemu-1.2.0}/no-strip.patch > (100%) > rename meta/recipes-devtools/qemu/{qemu-0.15.1 => > qemu-1.2.0}/powerpc_rom.bin (100%) > rename meta/recipes-devtools/qemu/{qemu-0.15.1 => > qemu-1.2.0}/qemu-vmware-vga-depth.patch (61%) > create mode 100644 meta/recipes-devtools/qemu/qemu-git/powerpc_rom.bin > rename meta/recipes-devtools/qemu/{qemu_0.15.1.bb => qemu_1.2.0.bb} (57%) > > -- > 1.7.9.5 > ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.
Re: [OE-core] Cannot find -lssp during uclibc package build
On Fri, Sep 7, 2012 at 12:11 AM, Giuseppe Condorelli wrote: > Any news? > > > 2012/9/3 Giuseppe Condorelli >> >> Hi Khem, All >> >> I'm building an uclibc image using gcc 4.6.3 instead of the 4.7 version >> oe-core provides. >> I'm falling in the following linker error during uClibc package build: >> >> "Cannot find -lssp" have a look at the 4.6 recipes from meta-openemebedded/toolchain-layer does that work for you ? and may be you have 'ssp' in DISTRO_FEATURES then remove that. >> >> Now, ssp support is enabled in the uClibc package and disabled in the >> gcc-cross-initial package, so >> ld should not include that by default. Instead it does and if I switch to >> old OE-Core repository (June 2012) >> I can see all goes right just because the gcc-cross-intermediate package >> was still present and uClibc depends on it >> for building. Now, I know the -intermediate package was moved out and the >> -initial one should include it, but >> that's it. >> I've not tested that with gcc 4.7 version, this is out of my scope. >> Please, can you address me to solve this issue? >> >> Best Regards, >> Giuseppe >> > > > > ___ > 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 3/4] kernel.bbclass, module-base.bbclass: Use CC to form KERNEL_CC
On Wed, Aug 22, 2012 at 11:19 AM, Bruce Ashfield wrote: > On Wed, Aug 22, 2012 at 1:59 PM, Khem Raj wrote: >> kernel compiler is not special and we currently have it so >> we want to pass -march and -mtune options as CFLAGS to kernel >> build so that compiler picks the right subarch flags when >> compiling assembly files in particular. Otherwise defaults >> are chosen which may not be right in many case e.g. when >> compiling kernel for collie machine we should use arch=armv4 >> but it uses toolchain/as defaults which is armv5te >> >> in some case e.g. thumb1 we know that kernel can not be compiled >> in thumb1 mode so we can provide that information e.g. -marm >> option through KERNEL_HOST_CC_ARCH variable as we do now > > Having just fought with this a few months ago myself, I know that I ended up > needing to override KERNEL_CC completely, vs using any of the existing > variables and options. So I don't see a problem with streamlining the > variables. > > Some random questions below: > >> >> Signed-off-by: Khem Raj >> --- >> meta/classes/kernel.bbclass |9 +++-- >> meta/classes/module-base.bbclass |9 +++-- >> 2 files changed, 6 insertions(+), 12 deletions(-) >> >> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass >> index f34e632..766f345 100644 >> --- a/meta/classes/kernel.bbclass >> +++ b/meta/classes/kernel.bbclass >> @@ -1,7 +1,7 @@ >> inherit linux-kernel-base module_strip >> >> PROVIDES += "virtual/kernel" >> -DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native >> virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules" >> +DEPENDS += "virtual/${TARGET_PREFIX}gcc kmod-native update-modules" >> >> # we include gcc above, we dont need virtual/libc >> INHIBIT_DEFAULT_DEPS = "1" >> @@ -37,9 +37,6 @@ KERNEL_PRIORITY ?= >> "${@int(d.getVar('PV',1).split('-')[0].split('+')[0].split('. >> >> KERNEL_RELEASE ?= "${KERNEL_VERSION}" >> >> -KERNEL_CCSUFFIX ?= "" >> -KERNEL_LDSUFFIX ?= "" >> - >> # Set TARGET_??_KERNEL_ARCH in the machine .conf to set architecture >> # specific options necessary for building the kernel and modules. >> #FIXME: should be this: TARGET_CC_KERNEL_ARCH ?= "${TARGET_CC_ARCH}" >> @@ -48,8 +45,8 @@ HOST_CC_KERNEL_ARCH ?= "${TARGET_CC_KERNEL_ARCH}" >> TARGET_LD_KERNEL_ARCH ?= "" >> HOST_LD_KERNEL_ARCH ?= "${TARGET_LD_KERNEL_ARCH}" >> >> -KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX} >> ${HOST_CC_KERNEL_ARCH}${TOOLCHAIN_OPTIONS}" >> -KERNEL_LD = "${HOST_PREFIX}ld${KERNEL_LDSUFFIX} >> ${HOST_LD_KERNEL_ARCH}${TOOLCHAIN_OPTIONS}" >> +KERNEL_CC = "${CC} ${HOST_CC_KERNEL_ARCH}" >> +KERNEL_LD = "${LD} ${HOST_LD_KERNEL_ARCH}" > > I haven't looked at CC recently, I assume it can contain ccache within > it's variable > definition if a person is inclined to use ccache ? yes meta/conf/bitbake.conf:export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" > >> >> # Where built kernel lies in the kernel tree >> KERNEL_OUTPUT ?= "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}" >> diff --git a/meta/classes/module-base.bbclass >> b/meta/classes/module-base.bbclass >> index 9379bf8..72a0bff 100644 >> --- a/meta/classes/module-base.bbclass >> +++ b/meta/classes/module-base.bbclass >> @@ -7,9 +7,6 @@ export CROSS_COMPILE = "${TARGET_PREFIX}" >> >> export KERNEL_VERSION = >> "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}" >> KERNEL_OBJECT_SUFFIX = ".ko" >> -KERNEL_CCSUFFIX = >> "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ccsuffix')}" >> -KERNEL_LDSUFFIX = >> "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ldsuffix')}" >> -KERNEL_ARSUFFIX = >> "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-arsuffix')}" >> >> # Set TARGET_??_KERNEL_ARCH in the machine .conf to set architecture >> # specific options necessary for building the kernel and modules. >> @@ -20,9 +17,9 @@ HOST_LD_KERNEL_ARCH ?= "${TARGET_LD_KERNEL_ARCH}" >> TARGET_AR_KERNEL_ARCH ?= "" >> HOST_AR_KERNEL_ARCH ?= "${TARGET_AR_KERNEL_ARCH}" >> >> -KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX} >> ${HOST_CC_KERNEL_ARCH}" >> -KERNEL_LD = "${HOST_PREFIX}ld${KERNEL_LDSUFFIX} ${HOST_LD_KERNEL_ARCH}" >> -KERNEL_AR = "${HOST_PREFIX}ar${KERNEL_ARSUFFIX} ${HOST_AR_KERNEL_ARCH}" >> +KERNEL_CC = "${CC} ${HOST_CC_KERNEL_ARCH}" >> +KERNEL_LD = "${LD} ${HOST_LD_KERNEL_ARCH}" >> +KERNEL_AR = "${AR} ${HOST_AR_KERNEL_ARCH}" > > When I was working through my build issues, I wondered if the > module-base and kernel.bbclass > compile definitions could be unified to a single location (say > kernel-arch.bbclass). I know > that I found an issue with it, and didn't complete my work, but can > you see a way that > we could have a single definition vs the two ? These look to be > exactly the same now :) > yes but I feel kernel-arch.bbclass has a different abstraction and its used by few recipes like linux-libc-headers directly adding these variables there will not affect these recipes but kernel-arch will become loaded with unrelated stuff I
Re: [OE-core] Cannot find -lssp during uclibc package build
Any news? 2012/9/3 Giuseppe Condorelli > Hi Khem, All > > I'm building an uclibc image using gcc 4.6.3 instead of the 4.7 version > oe-core provides. > I'm falling in the following linker error during uClibc package build: > > "Cannot find -lssp" > > Now, ssp support is enabled in the uClibc package and disabled in the > gcc-cross-initial package, so > ld should not include that by default. Instead it does and if I switch to > old OE-Core repository (June 2012) > I can see all goes right just because the gcc-cross-intermediate package > was still present and uClibc depends on it > for building. Now, I know the -intermediate package was moved out and the > -initial one should include it, but > that's it. > I've not tested that with gcc 4.7 version, this is out of my scope. > Please, can you address me to solve this issue? > > Best Regards, > Giuseppe > > ___ 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] conf/tune: add tune-ppce300c3
On Thu, Sep 6, 2012 at 6:07 PM, Mark Hatle wrote: > On 9/6/12 5:59 PM, Richard Purdie wrote: >> >> On Thu, 2012-09-06 at 17:35 -0500, Mark Hatle wrote: >>> >>> On 9/6/12 5:20 PM, Bruce Ashfield wrote: On 12-09-06 6:19 PM, Richard Purdie wrote: > > On Thu, 2012-09-06 at 14:43 -0400, Bruce Ashfield wrote: >> >> It has been pointed out several times that the yocto mpc8315e-rdb >> reference was using the wrong tuning (603e), since it is actually >> a e300c3 board. >> >> This commit creates a e300c3 tune file based on the e300c2 variant >> already in oe-core. >> >> This commit also inhibits altivec in flac when this new tuning is >> enabled. It was also noticed that the existing tune based overrides >> in the flac package would not be triggered since DEFAULTTUNE is not >> in the overrides list. To avoid doing per-board disabling of altivec >> DEFAULTTUNE is added to the local package OVERRIDES and then used >> to disable altivec. >> >> [YOCTO #1192] >> >> Signed-off-by: Bruce Ashfield >> >> asdfkljds >> Signed-off-by: Bruce Ashfield >> --- >> meta/conf/machine/include/tune-ppce300c3.inc | 11 +++ >> meta/recipes-multimedia/flac/flac_1.2.1.bb |5 + >> 2 files changed, 16 insertions(+), 0 deletions(-) >> create mode 100644 meta/conf/machine/include/tune-ppce300c3.inc >> >> diff --git a/meta/conf/machine/include/tune-ppce300c3.inc >> b/meta/conf/machine/include/tune-ppce300c3.inc >> new file mode 100644 >> index 000..3f5ac26 >> --- /dev/null >> +++ b/meta/conf/machine/include/tune-ppce300c3.inc >> @@ -0,0 +1,11 @@ >> +DEFAULTTUNE ?= "ppce300c3" >> + >> +require conf/machine/include/powerpc/arch-powerpc.inc >> + >> +TUNEVALID[ppce300c3] = "Enable ppce300c3 specific processor >> optimizations" >> +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce300c3", >> "-mcpu=e300c3", "", d)}" >> + >> +AVAILTUNES += "ppce300c3" >> +TUNE_FEATURES_tune-ppce300c3 = "m32 fpu-soft ppce300c3" >> +TUNE_PKGARCH_tune-ppce300c3 = "ppce300c3" >> +PACKAGE_EXTRA_ARCHS_tune-ppce300c3 = >> "${PACKAGE_EXTRA_ARCHS_tune-powerpc-nf} ppce300c3" >> diff --git a/meta/recipes-multimedia/flac/flac_1.2.1.bb >> b/meta/recipes-multimedia/flac/flac_1.2.1.bb >> index 3c5b73c..25db1c4 100644 >> --- a/meta/recipes-multimedia/flac/flac_1.2.1.bb >> +++ b/meta/recipes-multimedia/flac/flac_1.2.1.bb >> @@ -36,9 +36,14 @@ EXTRA_OECONF = "--disable-oggtest >> --disable-id3libtest \ >> --without-xmms-exec-prefix \ >> --without-libiconv-prefix \ >> --without-id3lib" >> + >> +FLACOVERRIDE = ":${DEFAULTTUNE}" >> +OVERRIDES .= "${FLACOVERRIDE}" >> + >> EXTRA_OECONF_prepend_e500mc = "--disable-altivec " >> EXTRA_OECONF_prepend_e5500 = "--disable-altivec " >> EXTRA_OECONF_prepend_e5500-64b = "--disable-altivec " >> +EXTRA_OECONF_prepend_ppce300c3 = "--disable-altivec " >> > > This is getting ugly and is kind of unsafe. Perhaps the architecture > should be doing something like: > > MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "ppce300c3", > ":noaltivec", "" ,d)} > > or even in this recipe just do: > > EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "ppce300c3", " > --disable-altivec", "" ,d)} These don't work because you still have the other 3 lines that look just like this. Or am I missing something? I definitely considered this route. I can do that for the new arch, and the old ones, but can't test the old ones at the moment. >>> >>> >>> The problem is actually in the flac. This recipe sees powerpc as the >>> machine >>> type, and immediately enabled altivec. By default altivec support is >>> disabled >>> in OE-Core. >>> >>> Perhaps one way we could address this is add a tune flag that says if the >>> tune >>> has altivec support or not.. then in the flac binary, disable it unless >>> it's >>> enabled? >> >> >> I think having altivec in the tune_features would be ideal. I'd love to >> get this cleaned up too but I lack much knowledge about powerpc... > > > My proposal then would be to accept Bruce's patch, with the understanding > that we need to add a tune flag of 'altivec' to the PowerPC tunings (where > appropriate) and then make the flac recipe respect that flag. This sounds good to me. If a bug is filed against me I can take a look at it since I did the initial damage. -M > Unfortunately I don't have the time to do that right now or I would. Would > an enhancement bug in the Yocto Project bugzilla be enough to be sure the > work is done? > > --Mark > > >> Cheers, >> >> Richard >> > > > ___ > Openembedded-core mailing list > Open