Re: [OE-core] [PATCH 1/1] add checking to standardize how .bbappend files do FILESEXTRAPATHS
I think it is more reasonable to move the checking to insance.bbclass rather than create a new bbclass. Please drop this, V2 incoming. //Hongxu On 07/21/2014 01:34 PM, Hongxu Jia wrote: When adding patches or config files from bbappend files, it requires the use of FILESEXTRAPATHS, which has been an issue and failure point for people starting to work with bitbake and oe-core. We add checking to standardize how to use FILESEXTRAPATHS. Only the format of: FILESEXTRAPATHS_append := ${THISDIR}/Your_Files_Path or FILESEXTRAPATHS_prepend := ${THISDIR}/Your_Files_Path is acceptable. [YOCTO #5412] Signed-off-by: Hongxu Jia hongxu@windriver.com --- meta/classes/base.bbclass | 1 + meta/classes/filesextrapaths_check.bbclass | 10 ++ meta/classes/utils.bbclass | 2 ++ meta/conf/bitbake.conf | 2 ++ 4 files changed, 15 insertions(+) create mode 100644 meta/classes/filesextrapaths_check.bbclass diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 8114cf6..be8400a 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -9,6 +9,7 @@ inherit utils inherit utility-tasks inherit metadata_scm inherit logging +inherit filesextrapaths_check OE_IMPORTS += os sys time oe.path oe.utils oe.data oe.package oe.packagegroup oe.sstatesig oe.lsb oe.cachedpath OE_IMPORTS[type] = list diff --git a/meta/classes/filesextrapaths_check.bbclass b/meta/classes/filesextrapaths_check.bbclass new file mode 100644 index 000..6863e0c --- /dev/null +++ b/meta/classes/filesextrapaths_check.bbclass @@ -0,0 +1,10 @@ +python __anonymous() { +# Checking ${FILESEXTRAPATHS} +extrapaths = (d.getVar(FILESEXTRAPATHS, True) or ) +if '__default' not in extrapaths.split(:): +msg = Please assign FILESEXTRAPATHS with the format of:\n +msg += FILESEXTRAPATHS_append := ${THISDIR}/Your_Files_Path or\n +msg += FILESEXTRAPATHS_prepend := ${THISDIR}/Your_Files_Path\n +msg += in your bbappend file\n +bb.fatal(msg) +} diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass index 0ee13e0..0f2a484 100644 --- a/meta/classes/utils.bbclass +++ b/meta/classes/utils.bbclass @@ -312,6 +312,8 @@ def explode_deps(s): def base_set_filespath(path, d): filespath = [] extrapaths = (d.getVar(FILESEXTRAPATHS, True) or ) +# Remove default flag which was used for checking +extrapaths = extrapaths.replace(__default:, ) # Don't prepend empty strings to the path list if extrapaths != : path = extrapaths.split(:) + path diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index f4870d5..6a0cf7a 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -311,6 +311,8 @@ FILES_${PN}-locale = ${datadir}/locale FILE_DIRNAME = ${@os.path.dirname(d.getVar('FILE'))} # FILESPATH is set in base.bbclass #FILESPATH = ${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/${BP}:${FILE_DIRNAME}/${BPN}:${FILE_DIRNAME}/files:${FILE_DIRNAME} +# This default was only used for checking +FILESEXTRAPATHS ?= __default: ## # General work and output directories for the build system. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 0/1] insane: add checking to standardize how .bbappend files do FILESEXTRAPATHS
Change in V2: - It is more reasonable to move the checking to insance.bbclass rather than create a new bbclass. Test Steps: 1) Edit meta-yocto/recipes-core/busybox/busybox_%.bbappend and assigned FILESEXTRAPATHS incorrectly: ... --- a/meta-yocto/recipes-core/busybox/busybox_%.bbappend +++ b/meta-yocto/recipes-core/busybox/busybox_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := ${THISDIR}/${BPN}: +FILESEXTRAPATHS := ${THISDIR}/${BPN}: ... 2) bitbake busybox ... ERROR: FILESEXTRAPATHS-variable, must always use _prepend (or _append) type of assignment. Please assign it with the format of: FILESEXTRAPATHS_append := ${THISDIR}/Your_Files_Path or FILESEXTRAPATHS_prepend := ${THISDIR}/Your_Files_Path in your bbappend file ERROR: Failed to parse recipe: /home/jiahongxu/yocto/poky/meta/recipes-core/busybox/busybox_git.bb ... //Hongxu The following changes since commit 4d2ac6f6df2b3ef98699dd4f7afadb2d994222bb: rootfs: Remove the extraneous install directory (2014-07-19 00:18:21 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib hongxu/filesextrapaths http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/filesextrapaths Hongxu Jia (1): insane: add checking to standardize how .bbappend files do FILESEXTRAPATHS meta/classes/insane.bbclass | 10 ++ meta/classes/utils.bbclass | 2 ++ meta/conf/bitbake.conf | 2 ++ 3 files changed, 14 insertions(+) -- 1.8.1.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] insane: add checking to standardize how .bbappend files do FILESEXTRAPATHS
When adding patches or config files from bbappend files, it requires the use of FILESEXTRAPATHS, which has been an issue and failure point for people starting to work with bitbake and oe-core. We add checking to standardize how to use FILESEXTRAPATHS. Only the format of: FILESEXTRAPATHS_append := ${THISDIR}/Your_Files_Path or FILESEXTRAPATHS_prepend := ${THISDIR}/Your_Files_Path is acceptable. [YOCTO #5412] Signed-off-by: Hongxu Jia hongxu@windriver.com --- meta/classes/insane.bbclass | 10 ++ meta/classes/utils.bbclass | 2 ++ meta/conf/bitbake.conf | 2 ++ 3 files changed, 14 insertions(+) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index b26216e..c3a6e9a 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -1022,6 +1022,16 @@ python () { # Check various variables ### +# Checking ${FILESEXTRAPATHS} +extrapaths = (d.getVar(FILESEXTRAPATHS, True) or ) +if '__default' not in extrapaths.split(:): +msg = FILESEXTRAPATHS-variable, must always use _prepend (or _append)\n +msg += type of assignment. Please assign it with the format of:\n +msg += FILESEXTRAPATHS_append := ${THISDIR}/Your_Files_Path or\n +msg += FILESEXTRAPATHS_prepend := ${THISDIR}/Your_Files_Path\n +msg += in your bbappend file +bb.fatal(msg) + if d.getVar('do_stage', True) is not None: bb.fatal(Legacy staging found for %s as it has a do_stage function. This will need conversion to a do_install or often simply removal to work with OE-core % d.getVar(FILE, True)) diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass index 0ee13e0..0f2a484 100644 --- a/meta/classes/utils.bbclass +++ b/meta/classes/utils.bbclass @@ -312,6 +312,8 @@ def explode_deps(s): def base_set_filespath(path, d): filespath = [] extrapaths = (d.getVar(FILESEXTRAPATHS, True) or ) +# Remove default flag which was used for checking +extrapaths = extrapaths.replace(__default:, ) # Don't prepend empty strings to the path list if extrapaths != : path = extrapaths.split(:) + path diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index f4870d5..6a0cf7a 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -311,6 +311,8 @@ FILES_${PN}-locale = ${datadir}/locale FILE_DIRNAME = ${@os.path.dirname(d.getVar('FILE'))} # FILESPATH is set in base.bbclass #FILESPATH = ${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/${BP}:${FILE_DIRNAME}/${BPN}:${FILE_DIRNAME}/files:${FILE_DIRNAME} +# This default was only used for checking +FILESEXTRAPATHS ?= __default: ## # General work and output directories for the build system. -- 1.8.1.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V5 0/2] shadow: upgrade from 4.1.4.3 to 4.2.1
On Thu, 2014-07-17 at 15:53 +0800, Chen Qi wrote: The following changes since commit 846bc50fde11bbb36c8eb5b2e3ae6bb644c037f3: ltp: use foreign automake strictness (2014-07-16 10:27:16 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib ChenQi/shadow-4.2.1 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/shadow-4.2.1 Chen Qi (2): shadow: upgrade from 4.1.4.3 to 4.2.1 oeqa: fix return status in pam.py to match shadow-4.2.1 I think but am not 100% sure this has introduced another regression: https://autobuilder.yoctoproject.org/main/builders/nightly-oecore/builds/177 The issue is that X doesn't start in oe-core built images. It does work correctly in poky. The issue is that the /etc/init.d/xserver-nodm script returns: root@qemuarm:/etc# /etc/init.d/xserver-nodm start Starting Xserver su: applet not found or to be more specific: root@qemuarm:/etc# su -l -c '/etc/X11/Xserver' xuser su: applet not found The poky images appear to work since we install bash. If you remove bash from packagegroup-core-device-devel.bb, the poky images will show the same error. I think this is something to do with the none-suid busybox binary not containing su support, but why su is being called there, I don't know. su is being provided by shadow in the image. If I make su provided by busybox the problem also goes away. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] shadow: Add PACKAGECONFIG for acl/attr
Otherwise builds are not deterministic. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 40f58f0..66541f4 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -75,6 +75,8 @@ PACKAGECONFIG = ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} PACKAGECONFIG_class-native = PACKAGECONFIG_class-nativesdk = PACKAGECONFIG[pam] = --with-libpam,--without-libpam,libpam,${PAM_PLUGINS} +PACKAGECONFIG[attr] = --with-attr,--without-attr,attr +PACKAGECONFIG[acl] = --with-acl,--without-acl,acl RDEPENDS_${PN} = shadow-securetty \ base-passwd -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Fix for YB6502
The following changes since commit 4d2ac6f6df2b3ef98699dd4f7afadb2d994222bb: rootfs: Remove the extraneous install directory (2014-07-19 00:18:21 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib roxana/YB6502 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=roxana/YB6502 Roxana Ciobanu (1): image.bbclass/rootfs.py: add variables to rootfs[vardeps] meta/classes/image.bbclass | 21 - meta/lib/oe/rootfs.py | 21 + 2 files changed, 41 insertions(+), 1 deletion(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] image.bbclass/rootfs.py: add variables to rootfs[vardeps]
Added base variables and package backend specific variables to rootfs[vardeps] in order for rootfs to rebuild when changes are made. Set some variables as [func] to inform bitbake that they are shell scripts, so that it invokes its shell dependency parsing. Without marking them as functions, changes in the actual function body would not trigger rootfs rebuilds. [YOCTO #6502] Signed-off-by: Roxana Ciobanu roxana.ciob...@intel.com --- meta/classes/image.bbclass | 21 - meta/lib/oe/rootfs.py | 21 + 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 772c3ed..577aa6a 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -72,10 +72,29 @@ LDCONFIGDEPEND ?= ldconfig-native:do_populate_sysroot LDCONFIGDEPEND_libc-uclibc = LDCONFIGDEPEND_libc-musl = +python () { +variables = ['ROOTFS_POSTPROCESS_COMMAND', 'OPKG_PREPROCESS_COMMANDS', 'OPKG_POSTPROCESS_COMMANDS', 'IMAGE_POSTPROCESS_COMMAND', 'IMAGE_PREPROCESS_COMMAND', 'POPULATE_SDK_POST_HOST_COMMAND', 'POPULATE_SDK_POST_TARGET_COMMAND', 'SDK_POSTPROCESS_COMMAND'] +for var in variables: +d.appendVarFlag(var, 'func', '1') +} + do_rootfs[depends] += makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND} do_rootfs[depends] += virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot do_rootfs[recrdeptask] += do_packagedata -do_rootfs[vardeps] += BAD_RECOMMENDATIONS NO_RECOMMENDATIONS + +def rootfs_variables(d): +from oe.rootfs import variable_depends +variables = ['IMAGE_DEVICE_TABLES','BUILD_IMAGES_FROM_FEEDS','IMAGE_TYPEDEP_','IMAGE_TYPES_MASKED','IMAGE_ROOTFS_ALIGNMENT','IMAGE_OVERHEAD_FACTOR','IMAGE_ROOTFS_SIZE','IMAGE_ROOTFS_EXTRA_SPACE' + 'IMAGE_ROOTFS_MAXSIZE','IMAGE_NAME','IMAGE_LINK_NAME','IMAGE_MANIFEST','DEPLOY_DIR_IMAGE','RM_OLD_IMAGE','IMAGE_FSTYPES','IMAGE_PREPROCESS_COMMAND','IMAGE_POSTPROCESS_COMMAND' + 'IMAGE_INSTALL_COMPLEMENTARY','IMAGE_LINGUAS','SDK_OS','SDK_OUTPUT','SDKPATHNATIVE','SDKTARGETSYSROOT','SDK_DIR','SDK_POSTPROCESS_COMMAND','SDK_VENDOR','SDKIMAGE_INSTALL_COMPLEMENTARY' + 'POPULATE_SDK_POST_TARGET_COMMAND','POPULATE_SDK_POST_HOST_COMMAND','SDK_PACKAGE_ARCHS','SDK_OUTPUT','SDKTARGETSYSROOT','MULTILIBRE_ALLOW_REP','MULTILIB_TEMP_ROOTFS', + 'MULTILIB_VARIANTS','MULTILIBS','ALL_MULTILIB_PACKAGE_ARCHS','MULTILIB_GLOBAL_VARIANTS','ROOTFS_POSTINSTALL_COMMAND','ROOTFS_PREPROCESS_COMMAND','ROOTFS_POSTPROCESS_COMMAND', + 'BAD_RECOMMENDATIONS','NO_RECOMMENDATIONS','PACKAGE_ARCHS','PACKAGE_CLASSES','TARGET_VENDOR','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','OVERRIDES','BBEXTENDVARIANT', + 'FEED_DEPLOYDIR_BASE_URI','INTERCEPT_DIR','BUILDNAME','USE_DEVFS','STAGING_KERNEL_DIR','COMPRESSIONTYPES'] +variables.extend(variable_depends(d)) +return .join(variables) + +do_rootfs[vardeps] += ${@rootfs_variables(d)} do_build[depends] += virtual/kernel:do_deploy diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index b34856c..d145d5d 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -327,6 +327,10 @@ class RpmRootfs(Rootfs): self.pm.rpm_setup_smart_target_config() +@staticmethod +def _depends_list(): +return ['DEPLOY_DIR_RPM', 'INC_RPM_IMAGE_GEN', 'RPM_PREPROCESS_COMMANDS', 'RPM_POSTPROCESS_COMMANDS'] + def _get_delayed_postinsts(self): postinst_dir = self.d.expand(${IMAGE_ROOTFS}${sysconfdir}/rpm-postinsts) if os.path.isdir(postinst_dir): @@ -418,6 +422,10 @@ class DpkgRootfs(Rootfs): self.pm.run_pre_post_installs() +@staticmethod +def _depends_list(): +return ['DEPLOY_DIR_DEB', 'DEB_SDK_ARCH', 'APTCONF_TARGET', 'APT_ARGS', 'DPKG_ARCH', 'DEB_PREPROCESS_COMMANDS', 'DEB_POSTPROCESS_COMMAND'] + def _get_delayed_postinsts(self): pkg_list = [] with open(self.image_rootfs + /var/lib/dpkg/status) as status: @@ -680,6 +688,10 @@ class OpkgRootfs(Rootfs): if self.inc_opkg_image_gen == 1: self.pm.backup_packaging_data() +@staticmethod +def _depends_list(): +return ['IPKGCONF_SDK', 'IPK_FEED_URIS', 'DEPLOY_DIR_IPK', 'IPKGCONF_TARGET', 'INC_IPK_IMAGE_GEN', 'OPKG_ARGS', 'OPKGLIBDIR', 'OPKG_PREPROCESS_COMMANDS', 'OPKG_POSTPROCESS_COMMANDS', 'OPKGLIBDIR'] + def _get_delayed_postinsts(self): pkg_list = [] status_file = os.path.join(self.image_rootfs, @@ -723,6 +735,15 @@ class OpkgRootfs(Rootfs): def _cleanup(self): pass +def get_class_for_type(imgtype): +return {rpm: RpmRootfs, +ipk: OpkgRootfs, +deb: DpkgRootfs}[imgtype] + +def variable_depends(d, manifest_dir=None): +img_type = d.getVar('IMAGE_PKGTYPE', True) +cls = get_class_for_type(img_type) +return
Re: [OE-core] [PATCH 1/1] image.bbclass/rootfs.py: add variables to rootfs[vardeps]
On Mon, 2014-07-21 at 12:15 +0300, Roxana Ciobanu wrote: Added base variables and package backend specific variables to rootfs[vardeps] in order for rootfs to rebuild when changes are made. Set some variables as [func] to inform bitbake that they are shell scripts, so that it invokes its shell dependency parsing. Without marking them as functions, changes in the actual function body would not trigger rootfs rebuilds. [YOCTO #6502] Signed-off-by: Roxana Ciobanu roxana.ciob...@intel.com --- meta/classes/image.bbclass | 21 - meta/lib/oe/rootfs.py | 21 + 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 772c3ed..577aa6a 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -72,10 +72,29 @@ LDCONFIGDEPEND ?= ldconfig-native:do_populate_sysroot LDCONFIGDEPEND_libc-uclibc = LDCONFIGDEPEND_libc-musl = +python () { +variables = ['ROOTFS_POSTPROCESS_COMMAND', 'OPKG_PREPROCESS_COMMANDS', 'OPKG_POSTPROCESS_COMMANDS', 'IMAGE_POSTPROCESS_COMMAND', 'IMAGE_PREPROCESS_COMMAND', 'POPULATE_SDK_POST_HOST_COMMAND', 'POPULATE_SDK_POST_TARGET_COMMAND', 'SDK_POSTPROCESS_COMMAND'] +for var in variables: +d.appendVarFlag(var, 'func', '1') +} + I know we've done a few iterations on this, could I ask for one more tweak please? Could you put the list above into a command_variables(d): function and then call it both above, and from rootfs_variables where we'd add it to the list there. We can then remove the duplication with the list in rootfs_variables? Cheers, Richard do_rootfs[depends] += makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND} do_rootfs[depends] += virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot do_rootfs[recrdeptask] += do_packagedata -do_rootfs[vardeps] += BAD_RECOMMENDATIONS NO_RECOMMENDATIONS + +def rootfs_variables(d): +from oe.rootfs import variable_depends +variables = ['IMAGE_DEVICE_TABLES','BUILD_IMAGES_FROM_FEEDS','IMAGE_TYPEDEP_','IMAGE_TYPES_MASKED','IMAGE_ROOTFS_ALIGNMENT','IMAGE_OVERHEAD_FACTOR','IMAGE_ROOTFS_SIZE','IMAGE_ROOTFS_EXTRA_SPACE' + 'IMAGE_ROOTFS_MAXSIZE','IMAGE_NAME','IMAGE_LINK_NAME','IMAGE_MANIFEST','DEPLOY_DIR_IMAGE','RM_OLD_IMAGE','IMAGE_FSTYPES','IMAGE_PREPROCESS_COMMAND','IMAGE_POSTPROCESS_COMMAND' + 'IMAGE_INSTALL_COMPLEMENTARY','IMAGE_LINGUAS','SDK_OS','SDK_OUTPUT','SDKPATHNATIVE','SDKTARGETSYSROOT','SDK_DIR','SDK_POSTPROCESS_COMMAND','SDK_VENDOR','SDKIMAGE_INSTALL_COMPLEMENTARY' + 'POPULATE_SDK_POST_TARGET_COMMAND','POPULATE_SDK_POST_HOST_COMMAND','SDK_PACKAGE_ARCHS','SDK_OUTPUT','SDKTARGETSYSROOT','MULTILIBRE_ALLOW_REP','MULTILIB_TEMP_ROOTFS', + 'MULTILIB_VARIANTS','MULTILIBS','ALL_MULTILIB_PACKAGE_ARCHS','MULTILIB_GLOBAL_VARIANTS','ROOTFS_POSTINSTALL_COMMAND','ROOTFS_PREPROCESS_COMMAND','ROOTFS_POSTPROCESS_COMMAND', + 'BAD_RECOMMENDATIONS','NO_RECOMMENDATIONS','PACKAGE_ARCHS','PACKAGE_CLASSES','TARGET_VENDOR','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','OVERRIDES','BBEXTENDVARIANT', + 'FEED_DEPLOYDIR_BASE_URI','INTERCEPT_DIR','BUILDNAME','USE_DEVFS','STAGING_KERNEL_DIR','COMPRESSIONTYPES'] +variables.extend(variable_depends(d)) +return .join(variables) + +do_rootfs[vardeps] += ${@rootfs_variables(d)} do_build[depends] += virtual/kernel:do_deploy diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index b34856c..d145d5d 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -327,6 +327,10 @@ class RpmRootfs(Rootfs): self.pm.rpm_setup_smart_target_config() +@staticmethod +def _depends_list(): +return ['DEPLOY_DIR_RPM', 'INC_RPM_IMAGE_GEN', 'RPM_PREPROCESS_COMMANDS', 'RPM_POSTPROCESS_COMMANDS'] + def _get_delayed_postinsts(self): postinst_dir = self.d.expand(${IMAGE_ROOTFS}${sysconfdir}/rpm-postinsts) if os.path.isdir(postinst_dir): @@ -418,6 +422,10 @@ class DpkgRootfs(Rootfs): self.pm.run_pre_post_installs() +@staticmethod +def _depends_list(): +return ['DEPLOY_DIR_DEB', 'DEB_SDK_ARCH', 'APTCONF_TARGET', 'APT_ARGS', 'DPKG_ARCH', 'DEB_PREPROCESS_COMMANDS', 'DEB_POSTPROCESS_COMMAND'] + def _get_delayed_postinsts(self): pkg_list = [] with open(self.image_rootfs + /var/lib/dpkg/status) as status: @@ -680,6 +688,10 @@ class OpkgRootfs(Rootfs): if self.inc_opkg_image_gen == 1: self.pm.backup_packaging_data() +@staticmethod +def _depends_list(): +return ['IPKGCONF_SDK', 'IPK_FEED_URIS', 'DEPLOY_DIR_IPK', 'IPKGCONF_TARGET', 'INC_IPK_IMAGE_GEN', 'OPKG_ARGS', 'OPKGLIBDIR', 'OPKG_PREPROCESS_COMMANDS', 'OPKG_POSTPROCESS_COMMANDS',
Re: [OE-core] [PATCH 1/1] buildtools-tarball: Add wget to buildtools-tarball
On 20 July 2014 21:00, Tudor Florea tudor.flo...@enea.com wrote: DEPENDS = gnutls zlib libpcre +DEPENDS_class-nativesdk = nativesdk-gnutls nativesdk-zlib nativesdk-libpcre Why do you need to set DEPENDS_class-nativesdk? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] connman: Fix PPTP VPN plugin QA issue
Fixing this error by skipping dev-so QA check for connman-plugin-vpn-pptp package. ERROR: QA Issue: non -dev/-dbg/-nativesdk package contains symlink .so: connman-plugin-vpn-pptp path '/work/core2-32-oe-linux/connman/1.24+gitAUTOINC+42779cd63c-r20.0/packages-split/connman-plugin-vpn-pptp/usr/lib/connman/scripts/libppp-plugin.so' [dev-so] ERROR: QA run found fatal errors. Please consider fixing them. ERROR: Function failed: do_package_qa Signed-off-by: Jukka Rissanen jukka.rissa...@linux.intel.com --- Hi, just upgraded to head 4d2ac6f6df2b3ef98699dd4f7afadb2d994222bb in master and started to see this QA error. Adding proper INSANE_SKIP seem to fix it. Just wondered why I am seeing this now but not earlier. Cheers, Jukka meta/recipes-connectivity/connman/connman.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index f121a81..3e9d027 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -211,5 +211,6 @@ DESCRIPTION_${PN}-plugin-vpn-pptp = The ConnMan PPTP plugin uses pptp-linux cli to create a VPN connection to PPTP server. FILES_${PN}-plugin-vpn-pptp += ${libdir}/connman/scripts/libppp-plugin.so* \ ${libdir}/connman/plugins-vpn/pptp.so +INSANE_SKIP_${PN}-plugin-vpn-pptp += dev-so RDEPENDS_${PN}-plugin-vpn-pptp += ${PN}-vpn RRECOMMENDS_${PN} += ${@bb.utils.contains('PACKAGECONFIG','pptp','${PN}-plugin-vpn-pptp', '', d)} -- 1.8.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH][V2] perf: split package
On Mon, Jul 21, 2014 at 4:03 AM, Chong Lu chong...@windriver.com wrote: Currently, perf can't split to perf-archive, perf-tests, perf-python and perf-perl. All files are included in perf package. Change the files paths to make split successfully and add perf package RDEPEND on the other four to keep it consistent. Could it be that this is depending on which kernel version is building ? I'm using Freescales 3.10.17 kernel, and my perf packages do have perl scripts in perf-perl, python scripts in perl-python, etc. /Jacob -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] connman: Fix PPTP VPN plugin QA issue
On 21 July 2014 11:03, Jukka Rissanen jukka.rissa...@linux.intel.com wrote: Fixing this error by skipping dev-so QA check for connman-plugin-vpn-pptp package. As discussed on IM but repeating for the list, plugins should always be real .so files and not symlinks to versioned files. If a plugin is on disk as symlinks and versioned files, then you need to pass more flags to libtool: -shared -avoid-version -module is the canonical set to get a loadable module without a static counterpart and versioned symlinks. Ideally a few patches to the build will remove the need for every dev-so insane skip in connman. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V5 0/2] shadow: upgrade from 4.1.4.3 to 4.2.1
On 2014-07-21 02:27, Richard Purdie wrote: On Thu, 2014-07-17 at 15:53 +0800, Chen Qi wrote: The following changes since commit 846bc50fde11bbb36c8eb5b2e3ae6bb644c037f3: ltp: use foreign automake strictness (2014-07-16 10:27:16 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib ChenQi/shadow-4.2.1 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/shadow-4.2.1 Chen Qi (2): shadow: upgrade from 4.1.4.3 to 4.2.1 oeqa: fix return status in pam.py to match shadow-4.2.1 I think but am not 100% sure this has introduced another regression: https://autobuilder.yoctoproject.org/main/builders/nightly-oecore/builds/177 The issue is that X doesn't start in oe-core built images. It does work correctly in poky. The issue is that the /etc/init.d/xserver-nodm script returns: root@qemuarm:/etc# /etc/init.d/xserver-nodm start Starting Xserver su: applet not found or to be more specific: root@qemuarm:/etc# su -l -c '/etc/X11/Xserver' xuser su: applet not found The poky images appear to work since we install bash. If you remove bash from packagegroup-core-device-devel.bb, the poky images will show the same error. I think this is something to do with the none-suid busybox binary not containing su support, but why su is being called there, I don't know. su is being provided by shadow in the image. If I make su provided by busybox the problem also goes away. The problem (reported last week on the Yocto list) is su.shadow changed how it behaves. The old version would end up passing the script off by 6761 execve(/bin/sh, [/bin/sh, -c, /etc/X11/Xserver], [/* 7 vars */]) = 0 whereas the new version does 961 execve(/bin/sh, [-su, -c, /etc/X11/Xserver], [/* 7 vars */]) = 0 I still haven't figured out why su.shadow now behaves this way. -- Gary Thomas | Consulting for the MLB Associates |Embedded world -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] libomxil-0.9.3: Remove versioning for .so files.
Acked-by: Ross Burton ross.bur...@intel.com On 20 July 2014 21:13, Drew Moseley drew_mose...@mentor.com wrote: The so files installed by libomxil are not versioned and should be installed without version-based symlinks so that omxregister-bellagio can properly find and register them. Signed-off-by: Drew Moseley drew_mose...@mentor.com --- .../libomxil-0.9.3/disable-so-versioning.patch | 69 ++ meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb | 17 -- 2 files changed, 80 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch diff --git a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch b/meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch new file mode 100644 index 000..9c63b4d --- /dev/null +++ b/meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch @@ -0,0 +1,69 @@ +Disable so versioning since they are really not a versioned shared lib. + +Upstream-Status: Submitted @ https://sourceforge.net/p/omxil/bugs/59/ + +Signed-off-by: Drew Moseley drew_mose...@mentor.com + +diff -rub libomxil-bellagio-0.9.3-orig/src/components/audio_effects/Makefile.am libomxil-bellagio-0.9.3/src/components/audio_effects/Makefile.am +--- libomxil-bellagio-0.9.3-orig/src/components/audio_effects/Makefile.am 2014-07-20 15:22:00.858425234 -0400 libomxil-bellagio-0.9.3/src/components/audio_effects/Makefile.am 2014-07-20 15:25:42.687525225 -0400 +@@ -10,4 +10,5 @@ + libomxaudio_effects_la_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/base ++libomxaudio_effects_la_LDFLAGS = -avoid-version + +diff -rub libomxil-bellagio-0.9.3-orig/src/components/clocksrc/Makefile.am libomxil-bellagio-0.9.3/src/components/clocksrc/Makefile.am +--- libomxil-bellagio-0.9.3-orig/src/components/clocksrc/Makefile.am 2014-07-20 15:22:00.858425234 -0400 libomxil-bellagio-0.9.3/src/components/clocksrc/Makefile.am 2014-07-20 15:24:49.151259753 -0400 +@@ -10,4 +10,4 @@ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/base +- ++libomxclocksrc_la_LDFLAGS = -avoid-version +diff -rub libomxil-bellagio-0.9.3-orig/src/components/videoscheduler/Makefile.am libomxil-bellagio-0.9.3/src/components/videoscheduler/Makefile.am +--- libomxil-bellagio-0.9.3-orig/src/components/videoscheduler/Makefile.am 2014-07-20 15:22:00.862425254 -0400 libomxil-bellagio-0.9.3/src/components/videoscheduler/Makefile.am 2014-07-20 15:22:36.462601786 -0400 +@@ -6,7 +6,7 @@ + library_entry_point.c + + libomxvideosched_la_LIBADD = $(top_builddir)/src/libomxil-bellagio.la +-libomxvideosched_la_LDFLAGS = ++libomxvideosched_la_LDFLAGS = -avoid-version + libomxvideosched_la_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/base +diff -rub libomxil-bellagio-0.9.3-orig/src/dynamic_loader/Makefile.am libomxil-bellagio-0.9.3/src/dynamic_loader/Makefile.am +--- libomxil-bellagio-0.9.3-orig/src/dynamic_loader/Makefile.am 2014-07-20 15:22:00.862425254 -0400 libomxil-bellagio-0.9.3/src/dynamic_loader/Makefile.am 2014-07-20 15:22:36.462601786 -0400 +@@ -3,7 +3,7 @@ + omxdynamicloader_LTLIBRARIES = libomxdynamicloader.la + libomxdynamicloader_la_SOURCES = ste_dynamic_component_loader.c ste_dynamic_component_loader.h + +-libomxdynamicloader_la_LDFLAGS = -lomxil-bellagio -L$(top_builddir)/src/.libs ++libomxdynamicloader_la_LDFLAGS = -lomxil-bellagio -L$(top_builddir)/src/.libs -avoid-version + libomxdynamicloader_la_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/base \ +diff -rub libomxil-bellagio-0.9.3-orig/src/Makefile.am libomxil-bellagio-0.9.3/src/Makefile.am +--- libomxil-bellagio-0.9.3-orig/src/Makefile.am 2014-07-20 15:22:00.862425254 -0400 libomxil-bellagio-0.9.3/src/Makefile.am2014-07-20 15:22:36.462601786 -0400 +@@ -8,7 +8,7 @@ + omxregister_bellagio_CFLAGS = -DOMXILCOMPONENTSPATH=\$(plugindir)/\ \ + -I$(top_srcdir)/include + omxregister_bellagio_LDADD = $(lib_LTLIBRARIES) +-omxregister_bellagio_LDFLAGS = -lomxil-bellagio -L$(builddir) ++omxregister_bellagio_LDFLAGS = -lomxil-bellagio -L$(builddir) -avoid-version + + lib_LTLIBRARIES = libomxil-bellagio.la + libomxil_bellagio_la_SOURCES = component_loader.h \ +@@ -29,7 +29,7 @@ + libomxil_bellagio_la_CFLAGS = -I$(top_srcdir)/include -I$(srcdir)/base -I$(srcdir)/core_extensions \ +
[OE-core] [OE-code][PATCH] wic: include partition label in fs image file name
Not including the label image but having multiple partitions of the same type, the image file of one partition would overwrite the other. Signed-off-by: Maciej Borzecki maciej.borze...@open-rnd.pl Signed-off-by: Maciek Borzecki maciek.borze...@gmail.com --- scripts/lib/mic/kickstart/custom_commands/partition.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/lib/mic/kickstart/custom_commands/partition.py b/scripts/lib/mic/kickstart/custom_commands/partition.py index 06f29a9..d0f1b78 100644 --- a/scripts/lib/mic/kickstart/custom_commands/partition.py +++ b/scripts/lib/mic/kickstart/custom_commands/partition.py @@ -343,7 +343,7 @@ class Wic_PartData(Mic_PartData): Prepare an empty ext2/3/4 partition. -fs = %s/fs.%s % (cr_workdir, self.fstype) +fs = %s/fs_%s.%s % (cr_workdir, self.label, self.fstype) dd_cmd = dd if=/dev/zero of=%s bs=1M seek=%d count=0 % \ (fs, self.size) @@ -363,7 +363,7 @@ class Wic_PartData(Mic_PartData): Prepare an empty btrfs partition. -fs = %s/fs.%s % (cr_workdir, self.fstype) +fs = %s/fs_%s.%s % (cr_workdir, self.label, self.fstype) dd_cmd = dd if=/dev/zero of=%s bs=1M seek=%d count=0 % \ (fs, self.size) @@ -384,7 +384,7 @@ class Wic_PartData(Mic_PartData): Prepare an empty vfat partition. -fs = %s/fs.%s % (cr_workdir, self.fstype) +fs = %s/fs_%s.%s % (cr_workdir, self.label, self.fstype) blocks = self.size * 1024 -- 1.9.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] connman: Fix PPTP VPN plugin QA issue
Hi Ross, On ma, 2014-07-21 at 11:55 +0100, Burton, Ross wrote: On 21 July 2014 11:03, Jukka Rissanen jukka.rissa...@linux.intel.com wrote: Fixing this error by skipping dev-so QA check for connman-plugin-vpn-pptp package. As discussed on IM but repeating for the list, plugins should always be real .so files and not symlinks to versioned files. If a plugin is on disk as symlinks and versioned files, then you need to pass more flags to libtool: -shared -avoid-version -module is the canonical set to get a loadable module without a static counterpart and versioned symlinks. Ideally a few patches to the build will remove the need for every dev-so insane skip in connman. Sure, I can prepare a more sane version :) Cheers, Jukka -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] buildtools-tarball: Add wget to buildtools-tarball
-Original Message- From: Burton, Ross [mailto:ross.bur...@intel.com] Sent: Monday, July 21, 2014 12:57 To: Tudor Florea Cc: OE-core Subject: Re: [OE-core] [PATCH 1/1] buildtools-tarball: Add wget to buildtools- tarball On 20 July 2014 21:00, Tudor Florea tudor.flo...@enea.com wrote: DEPENDS = gnutls zlib libpcre +DEPENDS_class-nativesdk = nativesdk-gnutls nativesdk-zlib nativesdk- libpcre Why do you need to set DEPENDS_class-nativesdk? Ross I'll remove the line and send V2 patch. Tudor. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] pixbufcache: Add missing dependency on jpeg-native
gdk-pixbuf-native uses png and jpeg loaders. When updating the loader-cache, these needs to be already populated in the sysroot. Although png was present, the jpeg dependency was missing, so add it. Fixes: DEBUG: Executing shell function pixbufcache_sstate_postinst g_module_open() failed for snip/libpixbufloader-jpeg.so: libjpeg.so.8: cannot open shared object file: No such file or directory Signed-off-by: Jacob Kroon jacob.kr...@mikrodidakt.se --- meta/classes/pixbufcache.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass index b8d75bd..418ace0 100644 --- a/meta/classes/pixbufcache.bbclass +++ b/meta/classes/pixbufcache.bbclass @@ -67,6 +67,6 @@ pixbufcache_sstate_postinst() { # Packages that use this class should extend this variable with their runtime # dependencies. PIXBUFCACHE_SYSROOT_DEPS = -PIXBUFCACHE_SYSROOT_DEPS_class-native = ${@['gdk-pixbuf-native:do_populate_sysroot_setscene', '']['${BPN}' == 'gdk-pixbuf']} glib-2.0-native:do_populate_sysroot_setscene libffi-native:do_populate_sysroot_setscene libpng-native:do_populate_sysroot_setscene zlib-native:do_populate_sysroot_setscene +PIXBUFCACHE_SYSROOT_DEPS_class-native = ${@['gdk-pixbuf-native:do_populate_sysroot_setscene', '']['${BPN}' == 'gdk-pixbuf']} glib-2.0-native:do_populate_sysroot_setscene libffi-native:do_populate_sysroot_setscene libpng-native:do_populate_sysroot_setscene jpeg-native:do_populate_sysroot_setscene zlib-native:do_populate_sysroot_setscene do_populate_sysroot_setscene[depends] += ${PIXBUFCACHE_SYSROOT_DEPS} do_populate_sysroot[depends] += ${@d.getVar('PIXBUFCACHE_SYSROOT_DEPS', True).replace('_setscene','')} -- 1.9.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] pixbufcache: Add missing dependency on jpeg-native
On 21 July 2014 13:39, Jacob Kroon jacob.kr...@mikrodidakt.se wrote: gdk-pixbuf-native uses png and jpeg loaders. When updating the loader-cache, these needs to be already populated in the sysroot. Although png was present, the jpeg dependency was missing, so add it. But those dependencies are dependent on a PACKAGECONFIG setting, so you'll potentially be forcing a build of libjpeg purely to satisfy a fetch from sstate of a JPEG-disabled gdk-pixbuf. Also, libtiff and libjasper are missing. If we can't change the sysroot creation order so that the order is zlib, libpng, libjpeg, and then gdk-pixbuf then I think this needs to be pulled out to a function that can do neater logic, such as iterate through PACKAGECONFIG and add the required dependencies (for each enabled option, turn the build depends into %s-native:do_populate_sysroot_setscene). Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/1] buildtools-tarball: Add wget to buildtools-tarball
GNU Wget cannot be upgrated to a newer that 1.12 version on supported Centos distro. GNU Wget 1.12 and earlier uses a server-provided filename instead of the original URL to determine the destination filename of a download. This means the files downloaded when fetching cannot be properly used: $ wget http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/3.4.2/source/eventlog_0.2.13.tar.gz $ ls eventlog_0.2.13.tar.gz?AWSAccessKeyId=AKIAICTJ5MANGPMOH7JAExpires=1400838672Signature=TjakOBpOvHtEKKDgF14iVinWpY0= This in turn lead to build errors like: WARNING: Failed to fetch URL http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/3.4.2/source/eventlog_0.2.13.tar.gz, attempting MIRRORS if available ERROR: Fetcher failure for URL: 'http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/3.4.2/source/eventlog_0.2.13.tar.gz#39;. The fetch command returned success for url http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/3.4.2/source/eventlog_0.2.13.tar.gz but /path/to/downloads/eventlog_0.2.13.tar.gz doesn't exist?! ERROR: Function failed: Fetcher failure for URL: 'http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/3.4.2/source/eventlog_0.2.13.tar.gz#39;. Unable to fetch URL from any source. ERROR: Logfile of failure stored in: /path/to/tmp/work/ppce500v2-enea-linux-gnuspe/eventlog/0.2.13-r0/temp/log.do_fetch.28302 ERROR: Task 4 (/path/to/poky/meta-openembedded/meta-oe/recipes-support/eventlog/eventlog_0.2.13.bb, do_fetch) failed with exit code '1' [YOCTO #6549] Signed-off-by: Tudor Florea tudor.flo...@enea.com --- meta/recipes-core/meta/buildtools-tarball.bb | 1 + meta/recipes-extended/wget/wget.inc | 3 +++ meta/recipes-support/gnutls/gnutls.inc | 2 +- meta/recipes-support/nettle/nettle_2.7.1.bb | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 62e1e0b..c54d9e8 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -41,6 +41,7 @@ TOOLCHAIN_HOST_TASK ?= \ nativesdk-git \ nativesdk-pigz \ nativesdk-make \ +nativesdk-wget \ TOOLCHAIN_OUTPUTNAME ?= ${SDK_NAME}-buildtools-nativesdk-standalone-${DISTRO_VERSION} diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc index 642d502..386e3e8 100644 --- a/meta/recipes-extended/wget/wget.inc +++ b/meta/recipes-extended/wget/wget.inc @@ -13,6 +13,9 @@ EXTRA_OECONF = --enable-ipv6 --with-ssl=gnutls --disable-rpath --disable-iri \ ac_cv_header_uuid_uuid_h=no ALTERNATIVE_${PN} = wget +ALTERNATIVE_${PN}_class-nativesdk = ALTERNATIVE_PRIORITY = 100 RRECOMMENDS_${PN} += ca-certificates + +BBCLASSEXTEND += nativesdk diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index 8820b0e..2193ea0 100644 --- a/meta/recipes-support/gnutls/gnutls.inc +++ b/meta/recipes-support/gnutls/gnutls.inc @@ -42,4 +42,4 @@ FILES_${PN}-xx = ${libdir}/libgnutlsxx.so.* LDFLAGS_append_libc-uclibc += -pthread -BBCLASSEXTEND = native +BBCLASSEXTEND = native nativesdk diff --git a/meta/recipes-support/nettle/nettle_2.7.1.bb b/meta/recipes-support/nettle/nettle_2.7.1.bb index 8aa5351..f53afcc 100644 --- a/meta/recipes-support/nettle/nettle_2.7.1.bb +++ b/meta/recipes-support/nettle/nettle_2.7.1.bb @@ -23,4 +23,4 @@ do_configure_prepend() { inherit autotools -BBCLASSEXTEND = native +BBCLASSEXTEND = native nativesdk -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] connman: Fix PPTP VPN plugin QA issue
This error was seen when building ConnMan. Fixed by not building ConnMan pptp plugin with module versioning info. ERROR: QA Issue: non -dev/-dbg/-nativesdk package contains symlink .so: connman-plugin-vpn-pptp path '/work/core2-32-oe-linux/connman/1.24+gitAUTOINC+42779cd63c-r20/packages-split/connman-plugin-vpn-pptp/usr/lib/connman/scripts/libppp-plugin.so' [dev-so] ERROR: QA run found fatal errors. Please consider fixing them. ERROR: Function failed: do_package_qa Signed-off-by: Jukka Rissanen jukka.rissa...@linux.intel.com --- ...ild-libppp-plugin-without-versioning-info.patch | 32 ++ meta/recipes-connectivity/connman/connman_1.24.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-connectivity/connman/connman/build-libppp-plugin-without-versioning-info.patch diff --git a/meta/recipes-connectivity/connman/connman/build-libppp-plugin-without-versioning-info.patch b/meta/recipes-connectivity/connman/connman/build-libppp-plugin-without-versioning-info.patch new file mode 100644 index 000..8e81f1b --- /dev/null +++ b/meta/recipes-connectivity/connman/connman/build-libppp-plugin-without-versioning-info.patch @@ -0,0 +1,32 @@ +Upstream-Status: Submitted +Signed-off-by: Jukka Rissanen jukka.rissa...@linux.intel.com + +From dd8044ed6ccb468558bab037257e27a409903d86 Mon Sep 17 00:00:00 2001 +From: Jukka Rissanen jukka.rissa...@linux.intel.com +Date: Mon, 21 Jul 2014 15:01:45 +0300 +Subject: [PATCH] scripts: Build libppp-plugin as a plain .so file + +There is no need to have module versioning for libppp-plugin.so +file so build the plugin same way as other vpn plugins. + +This issue was seen when building ConnMan for Yocto. +--- + Makefile.plugins | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.plugins b/Makefile.plugins +index 294cae0..8139967 100644 +--- a/Makefile.plugins b/Makefile.plugins +@@ -4,7 +4,7 @@ plugin_cflags = -fvisibility=hidden -I$(srcdir)/gdbus \ + plugin_ldflags = -no-undefined -module -avoid-version + + script_cflags = -fvisibility=hidden -I$(srcdir)/gdbus \ +- @DBUS_CFLAGS@ ++ @DBUS_CFLAGS@ $(plugin_ldflags) -shared + + if LOOPBACK + builtin_modules += loopback +-- +1.8.3.1 + diff --git a/meta/recipes-connectivity/connman/connman_1.24.bb b/meta/recipes-connectivity/connman/connman_1.24.bb index 66a8c58..29e239c 100644 --- a/meta/recipes-connectivity/connman/connman_1.24.bb +++ b/meta/recipes-connectivity/connman/connman_1.24.bb @@ -4,6 +4,7 @@ SRC_URI = ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ file://add_xuser_dbus_permission.patch \ file://connman \ +file://build-libppp-plugin-without-versioning-info.patch \ SRC_URI[md5sum] = dd6e1b4d9b9a28d127edb9f9b58bdec1 SRC_URI[sha256sum] = 551df7a5f0c6e4d69523dd2b3aa2c54525b323457d5135f64816215bad3dc24c -- 1.8.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Regarding dhcp
Hi, Getting error while compiling dhcp. Please find the log as attachment. Please help. Regards, Himanshu From: Himanshu Pandeypandey_himansh...@rediffmail.com Sent: Mon, 21 Jul 2014 18:31:02 +0530 To: Robert Yang liezhi.y...@windriver.com Subject: Regarding dhcp Hi, I am getting an error in compiling dhcp package. Please find the log as attachment. Regards, Himanshu From: Robert Yang lt;liezhi.y...@windriver.comgt; Sent: Fri, 18 Jul 2014 16:30:11 To: Himanshu Pandey lt;pandey_himansh...@rediffmail.comgt; Subject: Re: Regarding Lighttpd On 07/18/2014 05:20 PM, Himanshu Pandey wrote: gt; Hi, gt; gt; I am compiling Lighttpd package. Below is my receipe. I am getting an error, gt; please find the log as attachment. gt; gt; Please help to resolve the same. gt; gt; DESCRIPTION = Lightweight high-performance web server gt; HOMEPAGE = http://www.lighttpd.net/; gt; BUGTRACKER = http://redmine.lighttpd.net/projects/lighttpd/issues; gt; gt; LICENSE = BSD gt; LIC_FILES_CHKSUM = file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579 gt; gt; gt; SECTION = net gt; DEPENDS = zlib libpcre gt; RDEPENDS_${PN} += \ gt; lighttpd-module-access \ gt; lighttpd-module-accesslog \ gt; lighttpd-module-indexfile \ gt; lighttpd-module-dirlisting \ gt; lighttpd-module-staticfile \ gt; gt; gt; PR = r0 gt; gt; SRC_URI = gt; http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.tar.bz2 \ gt; file://index.html.lighttpd \ gt; file://lighttpd.conf \ gt; file://lighttpd \ gt; file://lighttpd.service \ gt; gt; gt; SRC_URI[md5sum] = 8e2d4ae8e918d4de1aeb9842584d170b gt; SRC_URI[sha256sum] = gt; 60691b2dcf3ad2472c06b23d75eb0c164bf48a08a630ed3f308f61319104701f gt; gt; EXTRA_OECONF = \ gt;--without-bzip2 \ gt;--without-ldap \ gt;--without-lua \ gt;--without-memcache \ gt;--with-pcre \ gt;--without-webdav-props \ gt;--without-webdav-locks \ gt;--without-openssl \ gt;--disable-static \ gt; gt; gt; S = ${WORKDIR}/lighttpd_1.4.32 gt; #inherit autotools pkgconfig update-rc.d gettext systemd gt; gt; #INITSCRIPT_NAME = lighttpd gt; #INITSCRIPT_PARAMS = defaults 70 gt; gt; SYSTEMD_SERVICE_${PN} = lighttpd.service gt; gt; do_configure() { gt; gt; ./configure --prefix=${D}/opt/lighttpd --host=${HOST_SYS} The error is: run.do_configure.4585: line 97: ./configure: No such file or directory Is it an autotools class ? You need use the inherit autotools if so. Otherwise you need find our where is the configure. gt; oe_runmake Don't do this in do_configure, it should be done in do_compile. // Robert gt; } gt; gt; do_install() { gt;install -d ${D}/opt/lighttpd gt;oe_runmake install gt; } gt; gt; do_install_append() { gt; #install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav gt; ${D}/www/var gt; #install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d gt; #install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir} gt; #install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html gt; gt; #install -d ${D}${systemd_unitdir}/system gt; #install -m 0644 ${WORKDIR}/lighttpd.service ${D}${systemd_unitdir}/system gt; #sed -i -e 's,@SBINDIR@,${sbindir},g' \ gt; -e 's,@SYSCONFDIR@,${sysconfdir},g' \ gt; -e 's,@BASE_BINDIR@,${base_bindir},g' \ gt; ${D}${systemd_unitdir}/system/lighttpd.service gt; } gt; gt; #FILES_${PN} += ${sysconfdir} /www gt; gt; #CONFFILES_${PN} = ${sysconfdir}/lighttpd.conf gt; gt; PACKAGES_DYNAMIC += ^lighttpd-module-.* gt; gt; python populate_packages_prepend () { gt; # lighttpd_libdir = d.expand('${libdir}') gt; # do_split_packages(d, lighttpd_libdir, '^mod_(.*)\.so$', gt; 'lighttpd-module-%s', 'Lighttpd module for %s', extra_depends='') gt; } gt; gt; gt; gt; gt; gt; From: Robert Yang lt;liezhi.y...@windriver.comgt; gt; Sent: Thu, 17 Jul 2014 10:38:53 gt; To: Himanshu Pandey lt;pandey_himansh...@rediffmail.comgt; gt; Subject: Re: Regarding pppoe package gt; gt; Seems that your pppoe is a little old ? See the errors, it searchs for kernel gt; 2.4.X, now the kernel is 3.10. gt; gt; checking for id... /usr/bin/id gt; checking for Linux 2.4.X kernel-mode PPPoE support... cross-compiling, default: gt; no gt; configure: WARNING: *** Oops! I couldn't find pppd, the PPP daemon anywhere. gt; configure: WARNING: *** You must install pppd, version 2.3.10 or later. gt; configure: WARNING: *** I will keep going, but it may not work. gt; configure: WARNING: *** Oops. I cannot figure out what version of pppd you have. gt; configure: WARNING: *** All I got back was '' gt; configure: WARNING: *** I will keep going, but it may not work. gt; checking packing order of bit fields... no defaults for cross-compiling gt;
Re: [OE-core] [PATCH] kernelshark: Remove trace-cmd from the kernelshark package
On 7/18/14, 16:01, Darren Hart dvh...@linux.intel.com wrote: Fixes [YOCTO 6550] Images installing both trace-cmd and kernelshark would fail with: error: file /usr/bin/trace-cmd conflicts between attempted installs of kernelshark-1.2+git0+7055ffd37b-r3.core2_32 and trace-cmd-1.2+git0+7055ffd37b-r3.core2_32 This patch removes ${bindir}/trace-cmd from the install prior to packaging, as is already done with the ${datadir}. Reported-by: California Sullivan california.l.sulli...@intel.com Signed-off-by: Darren Hart dvh...@linux.intel.com (cherry picked from commit eb08ae8f729ef77329892d19b23ddfdaa7953de0) Apologies for the cherry-picked line, that shouldn't have appeared here. Please remove prior to merge. I can resubmit if that is preferred. -- Darren Hart Open Source Technology Center darren.h...@intel.com Intel Corporation -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kernelshark: Remove trace-cmd from the kernelshark package
On Mon, 2014-07-21 at 08:21 -0700, Darren Hart wrote: On 7/18/14, 16:01, Darren Hart dvh...@linux.intel.com wrote: Fixes [YOCTO 6550] Images installing both trace-cmd and kernelshark would fail with: error: file /usr/bin/trace-cmd conflicts between attempted installs of kernelshark-1.2+git0+7055ffd37b-r3.core2_32 and trace-cmd-1.2+git0+7055ffd37b-r3.core2_32 This patch removes ${bindir}/trace-cmd from the install prior to packaging, as is already done with the ${datadir}. Reported-by: California Sullivan california.l.sulli...@intel.com Signed-off-by: Darren Hart dvh...@linux.intel.com (cherry picked from commit eb08ae8f729ef77329892d19b23ddfdaa7953de0) Apologies for the cherry-picked line, that shouldn't have appeared here. Please remove prior to merge. I can resubmit if that is preferred. Too late, its in... Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] pixbufcache: Add missing dependency on jpeg-native
On Mon, Jul 21, 2014 at 5:49 AM, Burton, Ross ross.bur...@intel.com wrote: If we can't change the sysroot creation order so that the order is zlib, libpng, libjpeg, and then gdk-pixbuf then I think this needs to be pulled out to a function that can do neater logic, such as iterate through PACKAGECONFIG and add the required dependencies (for each enabled option, turn the build depends into %s-native:do_populate_sysroot_setscene). I'm a bit confused by this. It's the class that needs to know the deps, and it's inherited by a bunch of recipes, but the packageconfig you're talking about is in the gdk-pixbuf-native recipe -- how is it going to iterate over the packageconfig of another recipe, or are you saying that the packageconfigs of anyone using pixbufcache need to mirror that of the tool in question? -- Christopher Larson clarson at kergoth dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics Corporation -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] bootlogd: Don't run savelog if it's not installed
From: Richard Tollerton rich.toller...@ni.com bootlogd's default log rotation code on stop requires `savelog`, which is in debianutils, which may not be installed. If it's not installed, don't try to perform the log rotation. That is: in the affected code block, `savelog` is what is responsible for creating boot.0. When `savelog` doesn't exist, an error message gets printed on bootup to the effect of mv: can't find boot.0. Signed-off-by: Richard Tollerton rich.toller...@ni.com Signed-off-by: Ben Shelton ben.shel...@ni.com --- meta/recipes-core/sysvinit/sysvinit/bootlogd.init | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/sysvinit/sysvinit/bootlogd.init b/meta/recipes-core/sysvinit/sysvinit/bootlogd.init index 06af465..df5aa43 100755 --- a/meta/recipes-core/sysvinit/sysvinit/bootlogd.init +++ b/meta/recipes-core/sysvinit/sysvinit/bootlogd.init @@ -63,8 +63,8 @@ case $ACTION in [ ${VERBOSE} != no ] echo -n Stopping $DESC: start-stop-daemon --stop --quiet --exec $DAEMON - if [ $STOPPER ] [ -f /var/log/boot ] \ - [ -f /var/log/boot~ ] + if [ $STOPPER ] [ $(which savelog 2/dev/null) ] \ + [ -f /var/log/boot ] [ -f /var/log/boot~ ] then cd /var/log chgrp adm boot -- 2.0.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] bootlogd: Honor VERBOSE
From: Richard Tollerton rich.toller...@ni.com The messages echoed when starting and stopping bootlogd are currently printed regardless of the setting of VERBOSE. Adjust the initscript so they're only printed when VERBOSE is enabled. Signed-off-by: Richard Tollerton rich.toller...@ni.com Signed-off-by: Ben Shelton ben.shel...@ni.com --- meta/recipes-core/sysvinit/sysvinit/bootlogd.init | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/sysvinit/sysvinit/bootlogd.init b/meta/recipes-core/sysvinit/sysvinit/bootlogd.init index 7d6518d..06af465 100755 --- a/meta/recipes-core/sysvinit/sysvinit/bootlogd.init +++ b/meta/recipes-core/sysvinit/sysvinit/bootlogd.init @@ -46,7 +46,7 @@ esac case $ACTION in start) - echo -n Starting $DESC: + [ ${VERBOSE} != no ] echo -n Starting $DESC: if [ -d /proc/1/. ] then umask 027 @@ -55,10 +55,12 @@ case $ACTION in else $DAEMON -r -c fi - echo $NAME. + [ ${VERBOSE} != no ] echo $NAME. ;; stop) - echo -n Stopping $DESC: + # stop may get called during bootup, so let it honor + # rcS VERBOSE setting + [ ${VERBOSE} != no ] echo -n Stopping $DESC: start-stop-daemon --stop --quiet --exec $DAEMON if [ $STOPPER ] [ -f /var/log/boot ] \ @@ -71,7 +73,7 @@ case $ACTION in mv boot~ boot.0 fi - echo $NAME. + [ ${VERBOSE} != no ] echo $NAME. ;; restart|force-reload) echo -n Restarting $DESC: -- 2.0.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] bootlogd: ensure /var/log/boot is created in volatiles
From: Richard Tollerton rich.toller...@ni.com bootlogd does not write to /var/log/boot if it does not exist, so if using the volatiles facility (presumed to mount /var/log under a tmpfs), ensure that /var/log/boot gets created. Signed-off-by: Richard Tollerton rich.toller...@ni.com Signed-off-by: Ben Shelton ben.shel...@ni.com --- meta/recipes-core/sysvinit/sysvinit/01_bootlogd | 1 + meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 7 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/sysvinit/sysvinit/01_bootlogd diff --git a/meta/recipes-core/sysvinit/sysvinit/01_bootlogd b/meta/recipes-core/sysvinit/sysvinit/01_bootlogd new file mode 100644 index 000..a689d92 --- /dev/null +++ b/meta/recipes-core/sysvinit/sysvinit/01_bootlogd @@ -0,0 +1 @@ +f root root 0644 /var/log/boot none diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb index 448d021..a8c10f2 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb @@ -16,7 +16,9 @@ SRC_URI = ${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.bz2 \ file://rcS-default \ file://rc \ file://rcS \ - file://bootlogd.init + file://bootlogd.init \ + file://01_bootlogd \ + SRC_URI[md5sum] = 6eda8a97b86e0a6f59dabbf25202aa6f SRC_URI[sha256sum] = 60bbc8c1e1792056e23761d22960b30bb13eccc2cabff8c7310a01f4d5df1519 @@ -92,6 +94,9 @@ do_install () { update-rc.d -r ${D} bootlogd start 07 S . update-rc.d -r ${D} stop-bootlogd start 99 2 3 4 5 . + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/01_bootlogd ${D}${sysconfdir}/default/volatiles + chown root.shutdown ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown chmod o-x,u+s ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown } -- 2.0.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] image.bbclass/rootfs.py: add variables to rootfs[vardeps]
Added base variables and package backend specific variables to rootfs[vardeps] in order for rootfs to rebuild when changes are made. Set some variables as [func] to inform bitbake that they are shell scripts, so that it invokes its shell dependency parsing. Without marking them as functions, changes in the actual function body would not trigger rootfs rebuilds. [YOCTO #6502] Signed-off-by: Roxana Ciobanu roxana.ciob...@intel.com --- meta/classes/image.bbclass | 27 ++- meta/lib/oe/rootfs.py | 21 + 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 772c3ed..da13bb8 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -75,7 +75,32 @@ LDCONFIGDEPEND_libc-musl = do_rootfs[depends] += makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND} do_rootfs[depends] += virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot do_rootfs[recrdeptask] += do_packagedata -do_rootfs[vardeps] += BAD_RECOMMENDATIONS NO_RECOMMENDATIONS + +def command_variables(d): +return ['ROOTFS_POSTPROCESS_COMMAND','ROOTFS_PREPROCESS_COMMAND','ROOTFS_POSTINSTALL_COMMAND','OPKG_PREPROCESS_COMMANDS','OPKG_POSTPROCESS_COMMANDS','IMAGE_POSTPROCESS_COMMAND', + 'IMAGE_PREPROCESS_COMMAND','ROOTFS_POSTPROCESS_COMMAND','POPULATE_SDK_POST_HOST_COMMAND','POPULATE_SDK_POST_TARGET_COMMAND','SDK_POSTPROCESS_COMMAND','RPM_PREPROCESS_COMMANDS', +'RPM_POSTPROCESS_COMMANDS'] + +python () { +variables = command_variables(d) +for var in variables: +if d.getVar(var): +d.setVarFlag(var, 'func', '1') +} + +def rootfs_variables(d): +from oe.rootfs import variable_depends +variables = ['IMAGE_DEVICE_TABLES','BUILD_IMAGES_FROM_FEEDS','IMAGE_TYPEDEP_','IMAGE_TYPES_MASKED','IMAGE_ROOTFS_ALIGNMENT','IMAGE_OVERHEAD_FACTOR','IMAGE_ROOTFS_SIZE','IMAGE_ROOTFS_EXTRA_SPACE', + 'IMAGE_ROOTFS_MAXSIZE','IMAGE_NAME','IMAGE_LINK_NAME','IMAGE_MANIFEST','DEPLOY_DIR_IMAGE','RM_OLD_IMAGE','IMAGE_FSTYPES','IMAGE_INSTALL_COMPLEMENTARY','IMAGE_LINGUAS','SDK_OS', + 'SDK_OUTPUT','SDKPATHNATIVE','SDKTARGETSYSROOT','SDK_DIR','SDK_VENDOR','SDKIMAGE_INSTALL_COMPLEMENTARY','SDK_PACKAGE_ARCHS','SDK_OUTPUT','SDKTARGETSYSROOT','MULTILIBRE_ALLOW_REP', + 'MULTILIB_TEMP_ROOTFS','MULTILIB_VARIANTS','MULTILIBS','ALL_MULTILIB_PACKAGE_ARCHS','MULTILIB_GLOBAL_VARIANTS','BAD_RECOMMENDATIONS','NO_RECOMMENDATIONS','PACKAGE_ARCHS', + 'PACKAGE_CLASSES','TARGET_VENDOR','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','OVERRIDES','BBEXTENDVARIANT','FEED_DEPLOYDIR_BASE_URI','INTERCEPT_DIR','BUILDNAME','USE_DEVFS', + 'STAGING_KERNEL_DIR','COMPRESSIONTYPES'] +variables.extend(command_variables(d)) +variables.extend(variable_depends(d)) +return .join(variables) + +do_rootfs[vardeps] += ${@rootfs_variables(d)} do_build[depends] += virtual/kernel:do_deploy diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index b34856c..d145d5d 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -327,6 +327,10 @@ class RpmRootfs(Rootfs): self.pm.rpm_setup_smart_target_config() +@staticmethod +def _depends_list(): +return ['DEPLOY_DIR_RPM', 'INC_RPM_IMAGE_GEN', 'RPM_PREPROCESS_COMMANDS', 'RPM_POSTPROCESS_COMMANDS'] + def _get_delayed_postinsts(self): postinst_dir = self.d.expand(${IMAGE_ROOTFS}${sysconfdir}/rpm-postinsts) if os.path.isdir(postinst_dir): @@ -418,6 +422,10 @@ class DpkgRootfs(Rootfs): self.pm.run_pre_post_installs() +@staticmethod +def _depends_list(): +return ['DEPLOY_DIR_DEB', 'DEB_SDK_ARCH', 'APTCONF_TARGET', 'APT_ARGS', 'DPKG_ARCH', 'DEB_PREPROCESS_COMMANDS', 'DEB_POSTPROCESS_COMMAND'] + def _get_delayed_postinsts(self): pkg_list = [] with open(self.image_rootfs + /var/lib/dpkg/status) as status: @@ -680,6 +688,10 @@ class OpkgRootfs(Rootfs): if self.inc_opkg_image_gen == 1: self.pm.backup_packaging_data() +@staticmethod +def _depends_list(): +return ['IPKGCONF_SDK', 'IPK_FEED_URIS', 'DEPLOY_DIR_IPK', 'IPKGCONF_TARGET', 'INC_IPK_IMAGE_GEN', 'OPKG_ARGS', 'OPKGLIBDIR', 'OPKG_PREPROCESS_COMMANDS', 'OPKG_POSTPROCESS_COMMANDS', 'OPKGLIBDIR'] + def _get_delayed_postinsts(self): pkg_list = [] status_file = os.path.join(self.image_rootfs, @@ -723,6 +735,15 @@ class OpkgRootfs(Rootfs): def _cleanup(self): pass +def get_class_for_type(imgtype): +return {rpm: RpmRootfs, +ipk: OpkgRootfs, +deb: DpkgRootfs}[imgtype] + +def variable_depends(d, manifest_dir=None): +img_type = d.getVar('IMAGE_PKGTYPE', True) +cls = get_class_for_type(img_type) +return cls._depends_list() def
[OE-core] [PATCH 0/1] Fix for YB6502
The following changes since commit 4d2ac6f6df2b3ef98699dd4f7afadb2d994222bb: rootfs: Remove the extraneous install directory (2014-07-19 00:18:21 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib roxana/YB6502 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=roxana/YB6502 Roxana Ciobanu (1): image.bbclass/rootfs.py: add variables to rootfs[vardeps] meta/classes/image.bbclass | 27 ++- meta/lib/oe/rootfs.py | 21 + 2 files changed, 47 insertions(+), 1 deletion(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] pixbufcache: Add missing dependency on jpeg-native
Hi Ross, On Mon, Jul 21, 2014 at 2:49 PM, Burton, Ross ross.bur...@intel.com wrote: On 21 July 2014 13:39, Jacob Kroon jacob.kr...@mikrodidakt.se wrote: gdk-pixbuf-native uses png and jpeg loaders. When updating the loader-cache, these needs to be already populated in the sysroot. Although png was present, the jpeg dependency was missing, so add it. But those dependencies are dependent on a PACKAGECONFIG setting, so you'll potentially be forcing a build of libjpeg purely to satisfy a fetch from sstate of a JPEG-disabled gdk-pixbuf. Also, libtiff and libjasper are missing. If we can't change the sysroot creation order so that the order is zlib, libpng, libjpeg, and then gdk-pixbuf then I think this needs to be pulled out to a function that can do neater logic, such as iterate through PACKAGECONFIG and add the required dependencies (for each enabled option, turn the build depends into %s-native:do_populate_sysroot_setscene). What about something like the patch below. It looks at the package's DEPENDS, and for native packages just adds them to do_populate_sysroot[depends] do_populate_sysroot_setscene[depends] diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass index b8d75bd..86cadad 100644 --- a/meta/classes/pixbufcache.bbclass +++ b/meta/classes/pixbufcache.bbclass @@ -47,6 +47,8 @@ python populate_packages_append() { # # Add an sstate postinst hook to update the cache for native packages. +# For this to work, the dependencies of the package itself need to be +# populated first. # An error exit during populate_sysroot_setscene allows bitbake to # try to recover by re-building the package. # @@ -59,14 +61,15 @@ pixbufcache_sstate_postinst() { fi } -# Add all of the dependencies of gdk-pixbuf as dependencies of -# do_populate_sysroot_setscene so that pixbufcache_sstate_postinst can work -# (otherwise gdk-pixbuf-query-loaders may not exist or link). Only add -# gdk-pixbuf-native if we're not building gdk-pixbuf itself. -# -# Packages that use this class should extend this variable with their runtime -# dependencies. -PIXBUFCACHE_SYSROOT_DEPS = -PIXBUFCACHE_SYSROOT_DEPS_class-native = ${@['gdk-pixbuf-native:do_populate_sysroot_setscene', '']['${BPN}' == 'gdk-pixbuf']} glib-2.0-native:do_populate_sysroot_setscene libffi-native:do_populate_sysroot_setscene libpng-native:do_populate_sysroot_setscene zlib-native:do_populate_sysroot_setscene -do_populate_sysroot_setscene[depends] += ${PIXBUFCACHE_SYSROOT_DEPS} -do_populate_sysroot[depends] += ${@d.getVar('PIXBUFCACHE_SYSROOT_DEPS', True).replace('_setscene','')} +python () { +pn = d.getVar('PN', True) +if not pn.endswith('-native'): +return +for pkg in d.getVar('DEPENDS', True).split(): +d.appendVarFlag('do_populate_sysroot', +'depends', +' ' + pkg + ':do_populate_sysroot') +d.appendVarFlag('do_populate_sysroot_setscene', +'depends', +' ' + pkg + ':do_populate_sysroot_setscene') +} diff --git a/meta/recipes-gnome/librsvg/librsvg_2.40.2.bb b/meta/recipes-gnome/librsvg/librsvg_2.40.2.bb index 34d8ca1..27659aa 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.40.2.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.40.2.bb @@ -51,5 +51,3 @@ FILES_rsvg = ${bindir}/rsvg* \ FILES_librsvg-gtk = ${libdir}/gdk-pixbuf-2.0/*/*/*.so PIXBUF_PACKAGES = librsvg-gtk - -PIXBUFCACHE_SYSROOT_DEPS_append_class-native = harfbuzz-native:do_populate_sysroot_setscene pango-native:do_populate_sysroot_setscene icu-native:do_populate_sysroot_setscene -- 1.9.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] mkefidisk.sh: Remove initrd entry for gummiboot
My previous patch adding gummiboot support was missing the line to remove the initrd line from the boot config. This was an oversight in copying over the grub setup to gummiboot. Add the necessary logic to remove it. Signed-off-by: Darren Hart dvh...@linux.intel.com --- scripts/contrib/mkefidisk.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh index 7ec373e..ba2b563 100755 --- a/scripts/contrib/mkefidisk.sh +++ b/scripts/contrib/mkefidisk.sh @@ -355,6 +355,7 @@ if [ -d $GUMMI_ENTRIES ]; then echo ERROR: $GUMMI_CFG not found fi + sed -i /initrd /d $GUMMI_CFG sed -i s@ root=[^ ]*@ @ $GUMMI_CFG sed -i s@options *LABEL=boot @options LABEL=Boot root=$TARGET_ROOTFS ro rootwait quiet @ $GUMMI_CFG fi -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kernelshark: Remove trace-cmd from the kernelshark package
On 7/21/14, 8:32, Richard Purdie richard.pur...@linuxfoundation.org wrote: On Mon, 2014-07-21 at 08:21 -0700, Darren Hart wrote: On 7/18/14, 16:01, Darren Hart dvh...@linux.intel.com wrote: Fixes [YOCTO 6550] Images installing both trace-cmd and kernelshark would fail with: error: file /usr/bin/trace-cmd conflicts between attempted installs of kernelshark-1.2+git0+7055ffd37b-r3.core2_32 and trace-cmd-1.2+git0+7055ffd37b-r3.core2_32 This patch removes ${bindir}/trace-cmd from the install prior to packaging, as is already done with the ${datadir}. Reported-by: California Sullivan california.l.sulli...@intel.com Signed-off-by: Darren Hart dvh...@linux.intel.com (cherry picked from commit eb08ae8f729ef77329892d19b23ddfdaa7953de0) Apologies for the cherry-picked line, that shouldn't have appeared here. Please remove prior to merge. I can resubmit if that is preferred. Too late, its in... Yeah, I saw that. My apologies, that was sloppy and unacceptable. I'll correct this going forward. -- Darren Hart Open Source Technology Center darren.h...@intel.com Intel Corporation -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] busybox: mdev: Make /dev/shm world-writable
From: Gratian Crisan gratian.cri...@ni.com Otherwise, users cannot use named semaphores or shared memory. Signed-off-by: Richard Tollerton rich.toller...@ni.com Signed-off-by: Ben Shelton ben.shel...@ni.com --- meta/recipes-core/busybox/files/mdev | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/busybox/files/mdev b/meta/recipes-core/busybox/files/mdev index 4eba619..f7ed1f3 100755 --- a/meta/recipes-core/busybox/files/mdev +++ b/meta/recipes-core/busybox/files/mdev @@ -2,6 +2,7 @@ mount -t tmpfs tmpfs /dev -o size=64k,mode=0755 mkdir /dev/pts /dev/shm +chmod 777 /dev/shm mount -t devpts devpts /dev/pts echo /sbin/mdev /proc/sys/kernel/hotplug mdev -s -- 2.0.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] busybox: mdev: Use mdev.seq
From: Bill Pittman bill.pitt...@ni.com /dev/mdev.seq exists to synchronize concurrently running instances of mdev and to ensure that they execute in the proper order. Without this synchronization, it is possible to have inconsistent mount points, to leak device nodes, or to have a node erroneously removed in rapid hotplug scenarios. Enable the use of mdev.seq by creating an empty /dev/mdev.seq at boot. Signed-off-by: Richard Tollerton rich.toller...@ni.com Signed-off-by: Ben Shelton ben.shel...@ni.com --- meta/recipes-core/busybox/files/mdev | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/busybox/files/mdev b/meta/recipes-core/busybox/files/mdev index f7ed1f3..c4447ef 100755 --- a/meta/recipes-core/busybox/files/mdev +++ b/meta/recipes-core/busybox/files/mdev @@ -4,5 +4,6 @@ mount -t tmpfs tmpfs /dev -o size=64k,mode=0755 mkdir /dev/pts /dev/shm chmod 777 /dev/shm mount -t devpts devpts /dev/pts +touch /dev/mdev.seq echo /sbin/mdev /proc/sys/kernel/hotplug mdev -s -- 2.0.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] busybox: Allow busybox-mdev to RPROVIDES hotplug
From: Richard Tollerton rich.toller...@ni.com This is for symmetry with udev which also RPROVIDES hotplug. Signed-off-by: Richard Tollerton rich.toller...@ni.com Signed-off-by: Ben Shelton ben.shel...@ni.com --- meta/recipes-core/busybox/busybox.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index bd66e4f..b4b9684 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -42,6 +42,7 @@ SYSTEMD_SERVICE_${PN}-syslog = busybox-syslog.service CONFFILES_${PN}-syslog = ${sysconfdir}/syslog-startup.conf.${BPN} CONFFILES_${PN}-mdev = ${sysconfdir}/mdev.conf +RPROVIDES_${PN}-mdev = hotplug RRECOMMENDS_${PN} = ${PN}-syslog ${PN}-udhcpc -- 2.0.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] busybox: mdev: Ensure /dev/initctl exists after tmpfs mount
During boot, there is a brief window during which /dev/initctl is missing, which breaks initscripts that would need to access it. This occurs because /etc/init.d/mountall.sh (rcS.d/S02...) attempts to ensure /dev/initctl is present, but /etc/init.d/mdev (rcS.d/S06...) mounts over /dev and clobbers the work done by mountall, and then does not wait synchronously until initctl is ready before continuing. To close this window, in /etc/init.d/mdev, we check whether /dev/initctl is present, and if not, we remove it and recreate it. This is the same thing that is done by /etc/init.d/mountall.sh, and we have verified that any writers of /dev/initctl will wait synchronously until sysvinit notices the change in fd and does the read, so no race exists. Signed-off-by: Richard Tollerton rich.toller...@ni.com Signed-off-by: Ben Shelton ben.shel...@ni.com --- meta/recipes-core/busybox/files/mdev | 10 ++ 1 file changed, 10 insertions(+) diff --git a/meta/recipes-core/busybox/files/mdev b/meta/recipes-core/busybox/files/mdev index c4447ef..9625247 100755 --- a/meta/recipes-core/busybox/files/mdev +++ b/meta/recipes-core/busybox/files/mdev @@ -7,3 +7,13 @@ mount -t devpts devpts /dev/pts touch /dev/mdev.seq echo /sbin/mdev /proc/sys/kernel/hotplug mdev -s + +# +# We might have mounted something over /dev, see if /dev/initctl is there. +# +if test ! -p /dev/initctl +then +rm -f /dev/initctl +mknod -m 600 /dev/initctl p +fi + -- 2.0.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/4] busybox: Allow busybox-mdev to RPROVIDES hotplug
On Mon, 2014-07-21 at 11:53 -0500, Ben Shelton wrote: From: Richard Tollerton rich.toller...@ni.com This is for symmetry with udev which also RPROVIDES hotplug. Signed-off-by: Richard Tollerton rich.toller...@ni.com Signed-off-by: Ben Shelton ben.shel...@ni.com --- meta/recipes-core/busybox/busybox.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index bd66e4f..b4b9684 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -42,6 +42,7 @@ SYSTEMD_SERVICE_${PN}-syslog = busybox-syslog.service CONFFILES_${PN}-syslog = ${sysconfdir}/syslog-startup.conf.${BPN} CONFFILES_${PN}-mdev = ${sysconfdir}/mdev.conf +RPROVIDES_${PN}-mdev = hotplug RRECOMMENDS_${PN} = ${PN}-syslog ${PN}-udhcpc Why add this? I'm curious what would actually use that naming? The RPROVIDES in udev was for backwards compatibility when hotplug actually existed iirc, its long since dead? Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V5 0/2] shadow: upgrade from 4.1.4.3 to 4.2.1
On Mon, 2014-07-21 at 04:59 -0600, Gary Thomas wrote: On 2014-07-21 02:27, Richard Purdie wrote: On Thu, 2014-07-17 at 15:53 +0800, Chen Qi wrote: The following changes since commit 846bc50fde11bbb36c8eb5b2e3ae6bb644c037f3: ltp: use foreign automake strictness (2014-07-16 10:27:16 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib ChenQi/shadow-4.2.1 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/shadow-4.2.1 Chen Qi (2): shadow: upgrade from 4.1.4.3 to 4.2.1 oeqa: fix return status in pam.py to match shadow-4.2.1 I think but am not 100% sure this has introduced another regression: https://autobuilder.yoctoproject.org/main/builders/nightly-oecore/builds/177 The issue is that X doesn't start in oe-core built images. It does work correctly in poky. The issue is that the /etc/init.d/xserver-nodm script returns: root@qemuarm:/etc# /etc/init.d/xserver-nodm start Starting Xserver su: applet not found or to be more specific: root@qemuarm:/etc# su -l -c '/etc/X11/Xserver' xuser su: applet not found The poky images appear to work since we install bash. If you remove bash from packagegroup-core-device-devel.bb, the poky images will show the same error. I think this is something to do with the none-suid busybox binary not containing su support, but why su is being called there, I don't know. su is being provided by shadow in the image. If I make su provided by busybox the problem also goes away. The problem (reported last week on the Yocto list) is su.shadow changed how it behaves. The old version would end up passing the script off by 6761 execve(/bin/sh, [/bin/sh, -c, /etc/X11/Xserver], [/* 7 vars */]) = 0 whereas the new version does 961 execve(/bin/sh, [-su, -c, /etc/X11/Xserver], [/* 7 vars */]) = 0 Hmm, busybox is interpreting that -su as an argument to call su, which busybox.nosuid doesn't have within it as an applet, hence the error message. I still haven't figured out why su.shadow now behaves this way. That does indeed look like what we need to figure out... Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/4] busybox: Allow busybox-mdev to RPROVIDES hotplug
Richard Purdie richard.pur...@linuxfoundation.org writes: On Mon, 2014-07-21 at 11:53 -0500, Ben Shelton wrote: From: Richard Tollerton rich.toller...@ni.com This is for symmetry with udev which also RPROVIDES hotplug. Signed-off-by: Richard Tollerton rich.toller...@ni.com Signed-off-by: Ben Shelton ben.shel...@ni.com --- meta/recipes-core/busybox/busybox.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index bd66e4f..b4b9684 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -42,6 +42,7 @@ SYSTEMD_SERVICE_${PN}-syslog = busybox-syslog.service CONFFILES_${PN}-syslog = ${sysconfdir}/syslog-startup.conf.${BPN} CONFFILES_${PN}-mdev = ${sysconfdir}/mdev.conf +RPROVIDES_${PN}-mdev = hotplug RRECOMMENDS_${PN} = ${PN}-syslog ${PN}-udhcpc Why add this? I'm curious what would actually use that naming? The RPROVIDES in udev was for backwards compatibility when hotplug actually existed iirc, its long since dead? Sorry, this was a mild case of cargo cult programming on my part. I saw the RPROVIDES in the udev recipe, and while I couldn't find it ever being used, I couldn't preclude the possibility that some other layer somebody else would use might depend on it. I agree that AFAIK, this code is dead, and the patch can be dropped. Cheers, Richard -- Richard Tollerton rich.toller...@ni.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] pixbufcache: Add missing dependency on jpeg-native
On Mon, Jul 21, 2014 at 6:00 PM, Jacob Kroon jacob.kr...@gmail.com wrote: Hi Ross, On Mon, Jul 21, 2014 at 2:49 PM, Burton, Ross ross.bur...@intel.com wrote: On 21 July 2014 13:39, Jacob Kroon jacob.kr...@mikrodidakt.se wrote: gdk-pixbuf-native uses png and jpeg loaders. When updating the loader-cache, these needs to be already populated in the sysroot. Although png was present, the jpeg dependency was missing, so add it. But those dependencies are dependent on a PACKAGECONFIG setting, so you'll potentially be forcing a build of libjpeg purely to satisfy a fetch from sstate of a JPEG-disabled gdk-pixbuf. Also, libtiff and libjasper are missing. If we can't change the sysroot creation order so that the order is zlib, libpng, libjpeg, and then gdk-pixbuf then I think this needs to be pulled out to a function that can do neater logic, such as iterate through PACKAGECONFIG and add the required dependencies (for each enabled option, turn the build depends into %s-native:do_populate_sysroot_setscene). What about something like the patch below. It looks at the package's DEPENDS, and for native packages just adds them to do_populate_sysroot[depends] do_populate_sysroot_setscene[depends] Thinking some more about it I don't see this working either, since it only guarantees 1-level-of-dependencies to be populated, right ? Wouldn't the right thing here be to somehow postpone updating the loader-caches until the entire sysroot is populated ? -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] OE Changelog since 2014-07-13 until 2014-07-20
Changelog since 2014-07-13 until 2014-07-20. Projects included in this report: bitbake: git://git.openembedded.org/bitbake openembedded-core: git://git.openembedded.org/openembedded-core meta-openembedded: git://git.openembedded.org/meta-openembedded meta-angstrom: git://github.com/Angstrom-distribution/meta-angstrom.git meta-arago: git://arago-project.org/git/meta-arago.git meta-beagleboard: git://github.com/beagleboard/meta-beagleboard.git meta-browser: git://github.com/OSSystems/meta-browser.git meta-bug: git://github.com/buglabs/meta-bug.git meta-chicken: git://github.com/OSSystems/meta-chicken meta-efikamx: git://github.com/kraj/meta-efikamx.git meta-ettus: http://github.com/koenkooi/meta-ettus.git meta-fsl-arm: git://git.yoctoproject.org/meta-fsl-arm meta-fsl-arm-extra: git://github.com/Freescale/meta-fsl-arm-extra.git meta-fsl-ppc: git://git.yoctoproject.org/meta-fsl-ppc meta-guacamayo: git://github.com/Guacamayo/meta-guacamayo.git meta-gumstix: git://github.com/gumstix/meta-gumstix.git meta-gumstix-community: git://gitorious.org/schnitzeltony-oe-meta/meta-gumstix-community.git meta-handheld: git://git.openembedded.org/meta-handheld meta-igep: http://github.com/ebutera/meta-igep.git meta-intel: git://git.yoctoproject.org/meta-intel meta-ivi: git://git.yoctoproject.org/meta-ivi meta-java: git://github.com/woglinde/meta-java meta-kde: git://gitorious.org/openembedded-core-layers/meta-kde.git meta-micro: git://git.openembedded.org/meta-micro meta-mono: git://git.yoctoproject.org/meta-mono.git meta-netbookpro: git://github.com/tworaz/meta-netbookpro meta-nslu2: git://github.com/kraj/meta-nslu2 meta-opie: git://git.openembedded.org/meta-opie meta-qt3: git://git.yoctoproject.org/meta-qt3 meta-qt5: git://github.com/meta-qt5/meta-qt5.git meta-slugos: git://github.com/kraj/meta-slugos meta-systemd: git://git.yoctoproject.org/meta-systemd meta-raspberrypi: git://github.com/djwillis/meta-raspberrypi.git meta-smartphone: http://git.shr-project.org/repo/meta-smartphone.git meta-ti: git://git.yoctoproject.org/meta-ti meta-webos: git://github.com/openwebos/meta-webos.git meta-xilinx: git://git.yoctoproject.org/meta-xilinx meta-yocto: git://git.yoctoproject.org/meta-yocto openembedded: git://git.openembedded.org/openembedded Changelog for bitbake: Changelog for openembedded-core: Armin Kuster (1): lz4: update to latest Blair Elliott (1): initscripts: save /etc/timestamp with seconds accuracy Chen Qi (3): eglibc: check for required distro features shadow: upgrade from 4.1.4.3 to 4.2.1 oeqa: fix return status in pam.py to match shadow-4.2.1 Chong Lu (2): classes/insane: Show QA check name diffstat: update to version 1.59 Corneliu Stoicescu (3): scripts/test-remote-image: add --skip-download option scripts/oe-selftest: add command-line parsing and options scripts/test-remote-image: use the scriptpath module Daniel BORNAZ (1): qemu: security patch for CVE-2014-3471 Darren Hart (9): mkefidisk.sh: Use all caps for volume names mkefidisk.sh: Add mount error checking mkefidisk.sh: Add gummiboot support mkefidisk.sh: Copy the EFI dir recursively mkefidisk.sh: Improve logging mkefidisk.sh: Add die() and cleanup() routines mkefidisk.sh: Make the rootfs copy the last step mkefidisk.sh: Reduce output and add verbose flag kernelshark: Remove trace-cmd from the kernelshark package Drew Moseley (1): gstreamer1.0-omx: Use variables for CORE_NAME processing. Hongxu Jia (11): docbook-xml: add docbook-xsl-stylesheets 1.78.1 docbook-xml: add docbook-xml-dtd4 xmlto: add version 0.0.25 alsa-utils-native: add missing dep for xmlto xorg-proto-common.inc: add missing dep for xmlto xorg-lib-common.inc: add missing dep for xmlto xserver-xorg.inc: add missing dep for xmlto libxml2: enable catalog support perl-rdepends: Add perl as perl-misc/${PN}-pod runtime dep busybox: enable CONFIG_FEATURE_AWK_LIBM by default eglibc: rewritten tzselect as posix sh and move it to tzcode package Hu Yadi (1): libpcap: Avoid libpcap build error when libnl1 is involved Joe Slater (1): rpm: compile rpmqv.c instead of rpmqv.cc João Henrique Ferreira de Freitas (2): python-distribute: add nativesdk to BBCLASSEXTEND populate_sdk_base: ensure that filenames with empty space character are hand Ken Sharp (1): initscripts: Use current date as an additional source of entropy Lucian Musat (1): oeqs/selftest: Added test case decorators for toaster Ming Liu (3): flac: explicitly disable checking for nasm gmp: use PACKAGECONFIG to address readline dependency insane.bbclass: avoid QA errors for n32 kernel Nicolas Dechesne (3): git: update to v2.0.1 libdrm: upgrade to 2.4.54 libdrm: enable freedreno experimental support Peter Seebach (2): pseudo_1.6.0.bb: uprev to pseudo 1.6 pseudo: uprev to 1.6.1 Richard Purdie (25): pkgconfig: Drop version from RPROVIDES
Re: [OE-core] [OE-code][PATCH] wic: include partition label in fs image file name
On Mon, 2014-07-21 at 13:01 +0200, Maciej Borzecki wrote: Not including the label image but having multiple partitions of the same type, the image file of one partition would overwrite the other. Right, the empty-partition case somehow missed the label - good catch. Acked-by: Tom Zanussi tom.zanu...@linux.intel.com Signed-off-by: Maciej Borzecki maciej.borze...@open-rnd.pl Signed-off-by: Maciek Borzecki maciek.borze...@gmail.com --- scripts/lib/mic/kickstart/custom_commands/partition.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/lib/mic/kickstart/custom_commands/partition.py b/scripts/lib/mic/kickstart/custom_commands/partition.py index 06f29a9..d0f1b78 100644 --- a/scripts/lib/mic/kickstart/custom_commands/partition.py +++ b/scripts/lib/mic/kickstart/custom_commands/partition.py @@ -343,7 +343,7 @@ class Wic_PartData(Mic_PartData): Prepare an empty ext2/3/4 partition. -fs = %s/fs.%s % (cr_workdir, self.fstype) +fs = %s/fs_%s.%s % (cr_workdir, self.label, self.fstype) dd_cmd = dd if=/dev/zero of=%s bs=1M seek=%d count=0 % \ (fs, self.size) @@ -363,7 +363,7 @@ class Wic_PartData(Mic_PartData): Prepare an empty btrfs partition. -fs = %s/fs.%s % (cr_workdir, self.fstype) +fs = %s/fs_%s.%s % (cr_workdir, self.label, self.fstype) dd_cmd = dd if=/dev/zero of=%s bs=1M seek=%d count=0 % \ (fs, self.size) @@ -384,7 +384,7 @@ class Wic_PartData(Mic_PartData): Prepare an empty vfat partition. -fs = %s/fs.%s % (cr_workdir, self.fstype) +fs = %s/fs_%s.%s % (cr_workdir, self.label, self.fstype) blocks = self.size * 1024 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] wic: original fstab restored too early
Contents of /etc/fstab were restored too early, thus overwriting the autogenerated ones. Signed-off-by: Maciej Borzecki maciej.borze...@open-rnd.pl Signed-off-by: Maciek Borzecki maciek.borze...@gmail.com --- scripts/lib/mic/imager/direct.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/lib/mic/imager/direct.py b/scripts/lib/mic/imager/direct.py index 2cf4c8d..beae372 100644 --- a/scripts/lib/mic/imager/direct.py +++ b/scripts/lib/mic/imager/direct.py @@ -266,7 +266,6 @@ class DirectImageCreator(BaseImageCreator): self.bootimg_dir, self.kernel_dir, self.native_sysroot) fstab = self.__write_fstab(p.get_rootfs()) -self._restore_fstab(fstab) self.__instimage.add_partition(int(p.size), p.disk, @@ -278,6 +277,9 @@ class DirectImageCreator(BaseImageCreator): boot = p.active, align = p.align, part_type = p.part_type) + +self._restore_fstab(fstab) + self.__instimage.layout_partitions(self._ptable_format) self.__imgdir = self.workdir -- 1.9.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] wic: --fsoptions handling
Add handling of --fsoptions in parition definition. Default value of mount option is 'defaults', all user defined options are appended. Signed-off-by: Maciej Borzecki maciej.borze...@open-rnd.pl Signed-off-by: Maciek Borzecki maciek.borze...@gmail.com --- scripts/lib/mic/imager/direct.py | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/lib/mic/imager/direct.py b/scripts/lib/mic/imager/direct.py index beae372..024cd09 100644 --- a/scripts/lib/mic/imager/direct.py +++ b/scripts/lib/mic/imager/direct.py @@ -113,7 +113,14 @@ class DirectImageCreator(BaseImageCreator): device_name = /dev/ + p.disk + str(num + 1) else: device_name = /dev/ + p.disk + str(num) -fstab_entry = device_name + \t + p.mountpoint + \t + p.fstype + \tdefaults\t0\t0\n +opts = defaults +if p.fsopts: +opts += , +opts += p.fsopts +fstab_entry = device_name + \t + \ + p.mountpoint + \t + \ + p.fstype + \t + \ + opts + \t0\t0\n fstab_lines.append(fstab_entry) def _write_fstab(self, fstab, fstab_lines): -- 1.9.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC][PATCH] kernel-module-split.bbclass: Allow autoloading multiple modules or modules where basename != module name
* new KERNEL_MODULE_AUTOLOAD syntax doesn't support modules where basename and module name don't match (usually - and _), e.g.: module_autoload_bq27x00_battery = bq27x00-battery * sometimes it's useful to load modules in particular order and module_autoload allowed to just list multiple modules, e.g.: module_autoload_snd-soc-neo1973-wm8753 = snd-soc-s3c24xx snd_soc_s3c24xx_i2s snd-soc-dfbmcs320 snd-soc-wm8753 snd-soc-neo1973-wm8753 or module_autoload_g_ether = s3c2410_udc g_ether restore this possibility which is useful for incorrect dependencies between modules Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/classes/kernel-module-split.bbclass | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass index 0c045c9..9a95b72 100644 --- a/meta/classes/kernel-module-split.bbclass +++ b/meta/classes/kernel-module-split.bbclass @@ -132,12 +132,18 @@ python split_kernel_module_packages () { # appropriate modprobe commands to the postinst autoloadlist = (d.getVar(KERNEL_MODULE_AUTOLOAD, True) or ).split() autoload = d.getVar('module_autoload_%s' % basename, True) -if autoload: -bb.error(KERNEL_MODULE_AUTOLOAD has replaced module_autoload_%s, please replace it! % basename) +if autoload and autoload == basename: +bb.warn(module_autoload_%s was replaced by KERNEL_MODULE_AUTOLOAD for cases where basename == module name, please drop it % basename) +if autoload and basename not in autoloadlist: +bb.warn(module_autoload_%s is defined but '%s' isn't included in KERNEL_MODULE_AUTOLOAD, please add it there % (basename, basename)) if basename in autoloadlist: name = '%s/etc/modules-load.d/%s.conf' % (dvar, basename) f = open(name, 'w') -f.write('%s\n' % basename) +if autoload: +for m in autoload.split(): +f.write('%s\n' % m) +else: +f.write('%s\n' % basename) f.close() postinst = d.getVar('pkg_postinst_%s' % pkg, True) if not postinst: -- 2.0.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] udev: update init script for conditional probing of platform bus
On Tue, Jul 15, 2014 at 11:38:41AM -0400, Denys Dmytriyenko wrote: On Tue, Jul 15, 2014 at 08:30:04AM -0700, Saul Wold wrote: On 07/14/2014 07:41 PM, Denys Dmytriyenko wrote: On Thu, Jun 26, 2014 at 01:43:53PM -0400, Denys Dmytriyenko wrote: On Wed, Jun 25, 2014 at 11:41:05PM +0100, Richard Purdie wrote: On Wed, 2014-06-25 at 12:22 -0400, Denys Dmytriyenko wrote: On Wed, Jun 25, 2014 at 05:20:23PM +0100, Paul Eggleton wrote: On Tuesday 24 June 2014 20:52:55 Denys Dmytriyenko wrote: Ping? Any comments? Any better suggestions? Looks like Richard has merged this, FWIW. Yes, I saw it. Already submitted backport for daisy... :) I'd like this to see some testing in master for a while before we backport it... I'm Ok waiting a bit longer to test it in master. I'll ping on it later... But this fixes a very common issue that affects different platforms from different BSP layers, including BeagleBone Black in meta-yocto-bsp. The goal is to be least intrusive and preserve the old udev cache behavior as much as possible. Alternative options were to disable udev cache completely or forcefully load necessary modules when they won't be probed on subsequent boots. Hi, Richard, Was it enough wait time to get the change tested in master? Should I re-submit the patch for daisy one more time or you have it in the archives? Thanks! I have it in my daisy-next (1.6.2) branch (I know it's not in daisy yet). Thanks! Saul, Do you have any ETA on when daisy will be updated? Thanks. -- Denys -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-commits] Peter Seebach : pseudo_1.6.0.bb: uprev to pseudo 1.6
On Wed, Jul 16, 2014 at 09:25:25AM +, g...@git.openembedded.org wrote: Module: openembedded-core.git Branch: master Commit: b8f5d6b493ec759a97b92cf9b4c07ad8a8114de6 URL: http://git.openembedded.org/?p=openembedded-core.gita=commit;h=b8f5d6b493ec759a97b92cf9b4c07ad8a8114de6 Author: Peter Seebach peter.seeb...@windriver.com Date: Mon Jul 14 14:12:29 2014 -0500 pseudo_1.6.0.bb: uprev to pseudo 1.6 This uprevs pseudo to 1.6. This merges in all of the existing fixes, and also adds partial support for extended attributes, including storing arbitrary extended attributes in the database, and also interpreting the posix permissions ACLs as chmod requests. The extended attribute support means we need xattr.h, the simplest way to be sure of this is to build attr before pseudo, which doesn't take long. Signed-off-by: Peter Seebach peter.seeb...@windriver.com Signed-off-by: Saul Wold s...@linux.intel.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org I know there is 1.6.1 version in pseudo_git.bb but 1.6.0 is still default version and target version fails to build with: | arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork --sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm -O2 -pipe -g -feliminate-unused-debug-types -pipe -std=gnu99 -Wall -W -Wextra -fPIC -D_LARGEFILE64_SOURCE -D_ATFILE_SOURCE -O2 -pipe -g -feliminate-unused-debug-types -DPSEUDO_PREFIX='/usr' -DPSEUDO_SUFFIX='' -DPSEUDO_BINDIR='bin' -DPSEUDO_LIBDIR='lib/pseudo/lib' -DPSEUDO_LOCALSTATEDIR='var/pseudo' -DPSEUDO_VERSION='1.6.0' -DUSE_MEMORY_DB -DPSEUDO_FORCE_ASYNC -DPSEUDO_PASSWD_FALLBACK='' -O2 -g -L/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm/usr/lib -I/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm/usr/include -o bin/pseudolog pseudolog.o pseudo_client.o pseudo_ipc.o \ | pseudo_db.o pseudo_tables.o pseudo_util.o /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm/usr/lib/libsqlite3.a -lpthread -ldl -lpthread | pseudo.c:556: error: undefined reference to 'memcpy', version 'GLIBC_2.0' .. full log http://logs.nslu2-linux.org/buildlogs/oe/world/log.dependencies.20140721_022210.log/3_min/failed/pseudo.log Can you please check it? --- meta/recipes-devtools/pseudo/pseudo.inc | 6 +- meta/recipes-devtools/pseudo/pseudo_1.5.1.bb | 4 meta/recipes-devtools/pseudo/pseudo_1.6.0.bb | 10 ++ meta/recipes-devtools/pseudo/pseudo_git.bb | 4 ++-- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc index 42738ab..11a8514 100644 --- a/meta/recipes-devtools/pseudo/pseudo.inc +++ b/meta/recipes-devtools/pseudo/pseudo.inc @@ -7,11 +7,7 @@ HOMEPAGE = http://git.yoctoproject.org/cgit/cgit.cgi/pseudo; LIC_FILES_CHKSUM = file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad SECTION = base LICENSE = LGPL2.1 -DEPENDS = sqlite3 - -SRC_URI_append_class-nativesdk = file://symver.patch - -SRC_URI_append_class-native = file://symver.patch +DEPENDS = sqlite3 attr FILES_${PN} = ${prefix}/lib/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo FILES_${PN}-dbg += ${prefix}/lib/pseudo/lib*/.debug diff --git a/meta/recipes-devtools/pseudo/pseudo_1.5.1.bb b/meta/recipes-devtools/pseudo/pseudo_1.5.1.bb index 47291fd..8d562ec 100644 --- a/meta/recipes-devtools/pseudo/pseudo_1.5.1.bb +++ b/meta/recipes-devtools/pseudo/pseudo_1.5.1.bb @@ -10,6 +10,10 @@ SRC_URI = \ file://pseudo-fchmodat-permissions.patch \ +SRC_URI_append_class-nativesdk = file://symver.patch + +SRC_URI_append_class-native = file://symver.patch + SRC_URI[md5sum] = 5ec67c7bff5fe68c56de500859c19172 SRC_URI[sha256sum] = 3b896f592f4d568569bd02323fad2d6b8c398e16ca36ee5a8947d2ff6c1d3d52 diff --git a/meta/recipes-devtools/pseudo/pseudo_1.6.0.bb b/meta/recipes-devtools/pseudo/pseudo_1.6.0.bb new file mode 100644 index 000..e92c4d7 --- /dev/null +++ b/meta/recipes-devtools/pseudo/pseudo_1.6.0.bb @@ -0,0 +1,10 @@ +require pseudo.inc + +SRC_URI = \ +http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \ + + +SRC_URI[md5sum] = 78c3f8aa8efe8cf15a2b21261174e3b6 +SRC_URI[sha256sum] = e24f526443b31c3292ec5ba04950d230b5388e8983c7e192e9e489c007f3dba3 + +PSEUDO_EXTRA_OPTS ?= --enable-force-async diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb index 66fc85f..ef258fa 100644 --- a/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -1,7 +1,7 @@ require pseudo.inc -SRCREV = b9eb2b5633b5a23efe72c950494728d93c2b5823 -PV = 1.5.1+git${SRCPV} +SRCREV = 512b84fb539c970464a93107995edf0e775d13fa +PV = 1.6.0+git${SRCPV} DEFAULT_PREFERENCE = -1 -- ___ Openembedded-commits
[OE-core] [PATCH 1/2] mkefidisk.sh: Fix redirection to 1
The current script intends to redirect stderr to stdout, but instead redirects to a file named 1. No doubt a regex replace error. Replace all instances of 21 with 21. Signed-off-by: Darren Hart dvh...@linux.intel.com --- scripts/contrib/mkefidisk.sh | 38 +++--- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh index 7ec373e..44ab8d5 100755 --- a/scripts/contrib/mkefidisk.sh +++ b/scripts/contrib/mkefidisk.sh @@ -257,22 +257,22 @@ echo info Partitioning installation media ($DEVICE) debug Deleting partition table on $DEVICE -dd if=/dev/zero of=$DEVICE bs=512 count=2 $OUT 21 || die Failed to zero beginning of $DEVICE +dd if=/dev/zero of=$DEVICE bs=512 count=2 $OUT 21 || die Failed to zero beginning of $DEVICE debug Creating new partition table (MSDOS) on $DEVICE -parted $DEVICE mklabel msdos $OUT 21 || die Failed to create MSDOS partition table +parted $DEVICE mklabel msdos $OUT 21 || die Failed to create MSDOS partition table debug Creating boot partition on $BOOTFS -parted $DEVICE mkpart primary 0% $BOOT_SIZE $OUT 21 || die Failed to create BOOT partition +parted $DEVICE mkpart primary 0% $BOOT_SIZE $OUT 21 || die Failed to create BOOT partition debug Enabling boot flag on $BOOTFS -parted $DEVICE set 1 boot on $OUT 21 || die Failed to enable boot flag +parted $DEVICE set 1 boot on $OUT 21 || die Failed to enable boot flag debug Creating ROOTFS partition on $ROOTFS -parted $DEVICE mkpart primary $ROOTFS_START $ROOTFS_END $OUT 21 || die Failed to create ROOTFS partition +parted $DEVICE mkpart primary $ROOTFS_START $ROOTFS_END $OUT 21 || die Failed to create ROOTFS partition debug Creating swap partition on $SWAP -parted $DEVICE mkpart primary $SWAP_START 100% $OUT 21 || die Failed to create SWAP partition +parted $DEVICE mkpart primary $SWAP_START 100% $OUT 21 || die Failed to create SWAP partition if [ $DEBUG -eq 1 ]; then parted $DEVICE print @@ -291,34 +291,34 @@ unmount_device || die Failed to unmount $DEVICE partitions info Formating partitions debug Formatting $BOOTFS as vfat if [ ! ${DEVICE#/dev/loop} = ${DEVICE} ]; then - mkfs.vfat -I $BOOTFS -n EFI $OUT 21 || die Failed to format $BOOTFS + mkfs.vfat -I $BOOTFS -n EFI $OUT 21 || die Failed to format $BOOTFS else - mkfs.vfat $BOOTFS -n EFI $OUT 21 || die Failed to format $BOOTFS + mkfs.vfat $BOOTFS -n EFI $OUT 21 || die Failed to format $BOOTFS fi debug Formatting $ROOTFS as ext3 -mkfs.ext3 -F $ROOTFS -L ROOT $OUT 21 || die Failed to format $ROOTFS +mkfs.ext3 -F $ROOTFS -L ROOT $OUT 21 || die Failed to format $ROOTFS debug Formatting swap partition ($SWAP) -mkswap $SWAP $OUT 21 || die Failed to prepare swap +mkswap $SWAP $OUT 21 || die Failed to prepare swap # # Installing to $DEVICE # debug Mounting images and device in preparation for installation -mount -o loop $HDDIMG $HDDIMG_MNT $OUT 21 || error Failed to mount $HDDIMG -mount -o loop $HDDIMG_MNT/rootfs.img $HDDIMG_ROOTFS_MNT $OUT 21 || error Failed to mount rootfs.img -mount $ROOTFS $ROOTFS_MNT $OUT 21 || error Failed to mount $ROOTFS on $ROOTFS_MNT -mount $BOOTFS $BOOTFS_MNT $OUT 21 || error Failed to mount $BOOTFS on $BOOTFS_MNT +mount -o loop $HDDIMG $HDDIMG_MNT $OUT 21 || error Failed to mount $HDDIMG +mount -o loop $HDDIMG_MNT/rootfs.img $HDDIMG_ROOTFS_MNT $OUT 21 || error Failed to mount rootfs.img +mount $ROOTFS $ROOTFS_MNT $OUT 21 || error Failed to mount $ROOTFS on $ROOTFS_MNT +mount $BOOTFS $BOOTFS_MNT $OUT 21 || error Failed to mount $BOOTFS on $BOOTFS_MNT info Preparing boot partition EFIDIR=$BOOTFS_MNT/EFI/BOOT -cp $HDDIMG_MNT/vmlinuz $BOOTFS_MNT $OUT 21 || error Failed to copy vmlinuz +cp $HDDIMG_MNT/vmlinuz $BOOTFS_MNT $OUT 21 || error Failed to copy vmlinuz # Copy the efi loader and configs (booti*.efi and grub.cfg if it exists) -cp -r $HDDIMG_MNT/EFI $BOOTFS_MNT $OUT 21 || error Failed to copy EFI dir +cp -r $HDDIMG_MNT/EFI $BOOTFS_MNT $OUT 21 || error Failed to copy EFI dir # Silently ignore a missing gummiboot loader dir (we might just be a GRUB image) -cp -r $HDDIMG_MNT/loader $BOOTFS_MNT $OUT 21 +cp -r $HDDIMG_MNT/loader $BOOTFS_MNT $OUT 21 # Update the boot loaders configurations for an installed image # Remove any existing root= kernel parameters and: @@ -349,7 +349,7 @@ GUMMI_CFG=$GUMMI_ENTRIES/boot.conf if [ -d $GUMMI_ENTRIES ]; then info Configuring Gummiboot # remove the install target if it exists - rm $GUMMI_ENTRIES/install.conf $OUT 21 + rm $GUMMI_ENTRIES/install.conf $OUT 21 if [ ! -e $GUMMI_CFG ]; then echo ERROR: $GUMMI_CFG not found @@ -366,7 +366,7 @@ fi info Copying ROOTFS files (this may take a while) -cp -a $HDDIMG_ROOTFS_MNT/* $ROOTFS_MNT $OUT 21 || die Root FS copy failed +cp -a $HDDIMG_ROOTFS_MNT/* $ROOTFS_MNT $OUT 21 || die Root FS copy failed echo $TARGET_SWAP swap
[OE-core] [PATCH 2/2] mkefidisk.sh: Add signal handling
Add basic signal handling to unmount and remove any temporary files. Signed-off-by: Darren Hart dvh...@linux.intel.com --- scripts/contrib/mkefidisk.sh | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh index 44ab8d5..7d48b53 100755 --- a/scripts/contrib/mkefidisk.sh +++ b/scripts/contrib/mkefidisk.sh @@ -46,7 +46,9 @@ cleanup() { if [ -d $TMPDIR ]; then rm -rf $TMPDIR || error Failed to remove $TMPDIR fi + exit $1 } +trap cleanup HUP INT TERM # Logging routines WARNINGS=0 @@ -72,8 +74,7 @@ success() { } die() { error $1 - cleanup - exit 1 + cleanup 1 } debug() { if [ $DEBUG -eq 1 ]; then @@ -375,10 +376,6 @@ if [ -d $ROOTFS_MNT/etc/udev/ ] ; then echo $TARGET_DEVICE $ROOTFS_MNT/etc/udev/mount.blacklist fi - -# Call cleanup to unmount devices and images and remove the TMPDIR -cleanup - echo if [ $WARNINGS -ne 0 ] [ $ERRORS -eq 0 ]; then echo ${YELLOW}Installation completed with warnings${CLEAR} @@ -391,3 +388,6 @@ else success Installation completed successfully fi echo + +# Call cleanup to unmount devices and images and remove the TMPDIR +cleanup 0 -- 2.0.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-commits] Peter Seebach : pseudo_1.6.0.bb: uprev to pseudo 1.6
On 7/21/14, 5:32 PM, Martin Jansa wrote: On Wed, Jul 16, 2014 at 09:25:25AM +, g...@git.openembedded.org wrote: Module: openembedded-core.git Branch: master Commit: b8f5d6b493ec759a97b92cf9b4c07ad8a8114de6 URL: http://git.openembedded.org/?p=openembedded-core.gita=commit;h=b8f5d6b493ec759a97b92cf9b4c07ad8a8114de6 Author: Peter Seebach peter.seeb...@windriver.com Date: Mon Jul 14 14:12:29 2014 -0500 pseudo_1.6.0.bb: uprev to pseudo 1.6 This uprevs pseudo to 1.6. This merges in all of the existing fixes, and also adds partial support for extended attributes, including storing arbitrary extended attributes in the database, and also interpreting the posix permissions ACLs as chmod requests. The extended attribute support means we need xattr.h, the simplest way to be sure of this is to build attr before pseudo, which doesn't take long. Signed-off-by: Peter Seebach peter.seeb...@windriver.com Signed-off-by: Saul Wold s...@linux.intel.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org I know there is 1.6.1 version in pseudo_git.bb but 1.6.0 is still default version and target version fails to build with: | arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork --sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm -O2 -pipe -g -feliminate-unused-debug-types -pipe -std=gnu99 -Wall -W -Wextra -fPIC -D_LARGEFILE64_SOURCE -D_ATFILE_SOURCE -O2 -pipe -g -feliminate-unused-debug-types -DPSEUDO_PREFIX='/usr' -DPSEUDO_SUFFIX='' -DPSEUDO_BINDIR='bin' -DPSEUDO_LIBDIR='lib/pseudo/lib' -DPSEUDO_LOCALSTATEDIR='var/pseudo' -DPSEUDO_VERSION='1.6.0' -DUSE_MEMORY_DB -DPSEUDO_FORCE_ASYNC -DPSEUDO_PASSWD_FALLBACK='' -O2 -g -L/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm/usr/lib -I/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm/usr/include -o bin/pseudolog pseudolog.o pseudo_client.o pseudo_ipc.o \ | pseudo_db.o pseudo_tables.o pseudo_util.o /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm/usr/lib/libsqlite3.a -lpthread -ldl -lpthread | pseudo.c:556: error: undefined reference to 'memcpy', version 'GLIBC_2.0' .. full log http://logs.nslu2-linux.org/buildlogs/oe/world/log.dependencies.20140721_022210.log/3_min/failed/pseudo.log Can you please check it? This is the exact error fixed by one of the commits in 1.6.1. Look at the git log and it's clear how it was fixed. (Changing an #if #else...) 1.6.0 should have been removed if 1.6.1 went in. --Mark --- meta/recipes-devtools/pseudo/pseudo.inc | 6 +- meta/recipes-devtools/pseudo/pseudo_1.5.1.bb | 4 meta/recipes-devtools/pseudo/pseudo_1.6.0.bb | 10 ++ meta/recipes-devtools/pseudo/pseudo_git.bb | 4 ++-- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc index 42738ab..11a8514 100644 --- a/meta/recipes-devtools/pseudo/pseudo.inc +++ b/meta/recipes-devtools/pseudo/pseudo.inc @@ -7,11 +7,7 @@ HOMEPAGE = http://git.yoctoproject.org/cgit/cgit.cgi/pseudo; LIC_FILES_CHKSUM = file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad SECTION = base LICENSE = LGPL2.1 -DEPENDS = sqlite3 - -SRC_URI_append_class-nativesdk = file://symver.patch - -SRC_URI_append_class-native = file://symver.patch +DEPENDS = sqlite3 attr FILES_${PN} = ${prefix}/lib/pseudo/lib*/libpseudo.so ${bindir}/* ${localstatedir}/pseudo ${prefix}/var/pseudo FILES_${PN}-dbg += ${prefix}/lib/pseudo/lib*/.debug diff --git a/meta/recipes-devtools/pseudo/pseudo_1.5.1.bb b/meta/recipes-devtools/pseudo/pseudo_1.5.1.bb index 47291fd..8d562ec 100644 --- a/meta/recipes-devtools/pseudo/pseudo_1.5.1.bb +++ b/meta/recipes-devtools/pseudo/pseudo_1.5.1.bb @@ -10,6 +10,10 @@ SRC_URI = \ file://pseudo-fchmodat-permissions.patch \ +SRC_URI_append_class-nativesdk = file://symver.patch + +SRC_URI_append_class-native = file://symver.patch + SRC_URI[md5sum] = 5ec67c7bff5fe68c56de500859c19172 SRC_URI[sha256sum] = 3b896f592f4d568569bd02323fad2d6b8c398e16ca36ee5a8947d2ff6c1d3d52 diff --git a/meta/recipes-devtools/pseudo/pseudo_1.6.0.bb b/meta/recipes-devtools/pseudo/pseudo_1.6.0.bb new file mode 100644 index 000..e92c4d7 --- /dev/null +++ b/meta/recipes-devtools/pseudo/pseudo_1.6.0.bb @@ -0,0 +1,10 @@ +require pseudo.inc + +SRC_URI = \ +http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \ + + +SRC_URI[md5sum] = 78c3f8aa8efe8cf15a2b21261174e3b6 +SRC_URI[sha256sum] = e24f526443b31c3292ec5ba04950d230b5388e8983c7e192e9e489c007f3dba3 + +PSEUDO_EXTRA_OPTS ?= --enable-force-async diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb index 66fc85f..ef258fa 100644 --- a/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -1,7 +1,7 @@ require pseudo.inc -SRCREV = b9eb2b5633b5a23efe72c950494728d93c2b5823 -PV = 1.5.1+git${SRCPV} +SRCREV =
Re: [OE-core] [PATCH 2/2] mkefidisk.sh: Add signal handling
Please ignore this one (2/2), it rearranges output in a way that might lead to someone pulling the USB key before the sync completes. I will resend 2/2 of separately. Apologies :/ On 7/21/14, 15:45, Darren Hart dvh...@linux.intel.com wrote: Add basic signal handling to unmount and remove any temporary files. Signed-off-by: Darren Hart dvh...@linux.intel.com --- scripts/contrib/mkefidisk.sh | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh index 44ab8d5..7d48b53 100755 --- a/scripts/contrib/mkefidisk.sh +++ b/scripts/contrib/mkefidisk.sh @@ -46,7 +46,9 @@ cleanup() { if [ -d $TMPDIR ]; then rm -rf $TMPDIR || error Failed to remove $TMPDIR fi + exit $1 } +trap cleanup HUP INT TERM # Logging routines WARNINGS=0 @@ -72,8 +74,7 @@ success() { } die() { error $1 - cleanup - exit 1 + cleanup 1 } debug() { if [ $DEBUG -eq 1 ]; then @@ -375,10 +376,6 @@ if [ -d $ROOTFS_MNT/etc/udev/ ] ; then echo $TARGET_DEVICE $ROOTFS_MNT/etc/udev/mount.blacklist fi - -# Call cleanup to unmount devices and images and remove the TMPDIR -cleanup - echo if [ $WARNINGS -ne 0 ] [ $ERRORS -eq 0 ]; then echo ${YELLOW}Installation completed with warnings${CLEAR} @@ -391,3 +388,6 @@ else success Installation completed successfully fi echo + +# Call cleanup to unmount devices and images and remove the TMPDIR +cleanup 0 -- 2.0.0 -- Darren Hart Open Source Technology Center darren.h...@intel.com Intel Corporation -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] mkefidisk.sh: Add signal handling
Add basic signal handling to unmount and remove any temporary files. Correct a quoting issue with the die() function caught testing signal handling. Fix a minor typo in formatting output. Signed-off-by: Darren Hart dvh...@linux.intel.com --- scripts/contrib/mkefidisk.sh | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh index 28cfb6d..b96b7d4 100755 --- a/scripts/contrib/mkefidisk.sh +++ b/scripts/contrib/mkefidisk.sh @@ -48,6 +48,8 @@ cleanup() { fi } +trap 'die Signal Received, Aborting...' HUP INT TERM + # Logging routines WARNINGS=0 ERRORS=0 @@ -71,7 +73,7 @@ success() { echo ${GREEN}$1${CLEAR} } die() { - error $1 + error $1 cleanup exit 1 } @@ -288,7 +290,7 @@ unmount_device || die Failed to unmount $DEVICE partitions # # Format $DEVICE partitions # -info Formating partitions +info Formatting partitions debug Formatting $BOOTFS as vfat if [ ! ${DEVICE#/dev/loop} = ${DEVICE} ]; then mkfs.vfat -I $BOOTFS -n EFI $OUT 21 || die Failed to format $BOOTFS -- 2.0.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] shadow: fix the behavior of su
In systems where bash is not installed and /bin/sh is provided by busybox. Commands like `su -l -c '/home/root/test' xuser' would fail complaining the the 'su' applet could not be found. This patch references the old version of shadow to keep the behaviour the way it was in old version so that we would avoid the problem mentioned above. Signed-off-by: Chen Qi qi.c...@windriver.com --- .../0001-su.c-fix-to-exec-command-correctly.patch | 25 meta/recipes-extended/shadow/shadow.inc|1 + 2 files changed, 26 insertions(+) create mode 100644 meta/recipes-extended/shadow/files/0001-su.c-fix-to-exec-command-correctly.patch diff --git a/meta/recipes-extended/shadow/files/0001-su.c-fix-to-exec-command-correctly.patch b/meta/recipes-extended/shadow/files/0001-su.c-fix-to-exec-command-correctly.patch new file mode 100644 index 000..31337de --- /dev/null +++ b/meta/recipes-extended/shadow/files/0001-su.c-fix-to-exec-command-correctly.patch @@ -0,0 +1,25 @@ +Upstream-Status: Pending + +Subject: su.c: fix to exec command correctly + +Signed-off-by: Chen Qi qi.c...@windriver.com +--- + src/su.c |2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/su.c b/src/su.c +index 3704217..bc4f2ac 100644 +--- a/src/su.c b/src/su.c +@@ -1156,7 +1156,7 @@ int main (int argc, char **argv) +* Use the shell and create an argv +* with the rest of the command line included. +*/ +- argv[-1] = cp; ++ argv[-1] = shellstr; + execve_shell (shellstr, argv[-1], environ); + err = errno; + (void) fprintf (stderr, +-- +1.7.9.5 + diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 66541f4..84d1f86 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -14,6 +14,7 @@ SRC_URI = http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.xz \ file://shadow-4.1.3-dots-in-usernames.patch \ file://usermod-fix-compilation-failure-with-subids-disabled.patch \ file://fix-installation-failure-with-subids-disabled.patch \ + file://0001-su.c-fix-to-exec-command-correctly.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] systemd: change dependency relationships
The following changes since commit 5bcda42a946ae8b14aee8864d18745be0a997aaa: bitbake: fetch2: Add module for ClearCase (ccrc://) (2014-07-21 19:24:29 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib ChenQi/systemd-udev-hwdb http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/systemd-udev-hwdb Chen Qi (1): systemd: change dependency relationships meta/recipes-core/systemd/systemd_213.bb |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] systemd: change dependency relationships
When building out a systemd based image, the udev-hwdb postinstall script always fails at rootfs time. This is because that the 'udevadm' command used in udev-hwdb postinstall script is now in the udev package and udev recommends udev-hwdb. Instead of letting udev recommends udev-hwdb, we let systemd do it and make udev-hwdb rdepend on udev. Signed-off-by: Chen Qi qi.c...@windriver.com --- meta/recipes-core/systemd/systemd_213.bb |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_213.bb b/meta/recipes-core/systemd/systemd_213.bb index 28cc4cb..5de7cdc 100644 --- a/meta/recipes-core/systemd/systemd_213.bb +++ b/meta/recipes-core/systemd/systemd_213.bb @@ -244,7 +244,7 @@ FILES_${PN}-dev += ${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ $ RDEPENDS_${PN} += kmod dbus util-linux-mount udev (= ${EXTENDPKGV}) -RRECOMMENDS_${PN} += systemd-serialgetty systemd-compat-units \ +RRECOMMENDS_${PN} += systemd-serialgetty systemd-compat-units udev-hwdb\ util-linux-agetty \ util-linux-fsck e2fsprogs-e2fsck \ kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \ @@ -255,7 +255,8 @@ PACKAGES =+ udev-dbg udev udev-hwdb FILES_udev-dbg += /lib/udev/.debug RPROVIDES_udev = hotplug -RRECOMMENDS_udev += udev-hwdb + +RDEPENDS_udev-hwdb += udev FILES_udev += ${base_sbindir}/udevd \ ${rootlibexecdir}/systemd/systemd-udevd \ -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] adt-installer: fix sed input file error
When use default install directory, we can't get the environment setup script path. The reason is that opkg-cl list incorrect files paths. This patch sets env_script variable to make us get correct environment setup script path. [YOCTO #6443] Signed-off-by: Chong Lu chong...@windriver.com --- .../installer/adt-installer/scripts/adt_installer_internal | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal index cdf93da..00db301 100755 --- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal @@ -163,6 +163,7 @@ for target_type in $YOCTOADT_TARGETS; do # opkg will not install packagegroup-cross-canadian package if it was already # installed. So, the environment script is in one place or the other. + [ -e $INSTALL_FOLDER/$env_script_original ] env_script=$INSTALL_FOLDER/$env_script_original [ -e $env_script_original ] env_script=$env_script_original [ -e $env_script_relocated ] env_script=$env_script_relocated -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core