diff options
-rw-r--r-- | meta/classes/core-image.bbclass | 28 | ||||
-rw-r--r-- | meta/classes/update-rc.d.bbclass | 4 | ||||
-rw-r--r-- | meta/conf/machine/qemux86.conf | 10 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc-locale.inc | 2 |
4 files changed, 28 insertions, 16 deletions
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index 88ca272145..acb2e82a11 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass @@ -37,18 +37,18 @@ # - stateless-rootfs - systemctl-native not run, image populated by systemd at runtime # - splash - bootup splash screen # -FEATURE_PACKAGES_x11 = "packagegroup-core-x11" -FEATURE_PACKAGES_x11-base = "packagegroup-core-x11-base" -FEATURE_PACKAGES_x11-sato = "packagegroup-core-x11-sato" -FEATURE_PACKAGES_tools-debug = "packagegroup-core-tools-debug" -FEATURE_PACKAGES_eclipse-debug = "packagegroup-core-eclipse-debug" -FEATURE_PACKAGES_tools-profile = "packagegroup-core-tools-profile" -FEATURE_PACKAGES_tools-testapps = "packagegroup-core-tools-testapps" -FEATURE_PACKAGES_tools-sdk = "packagegroup-core-sdk packagegroup-core-standalone-sdk-target" -FEATURE_PACKAGES_nfs-server = "packagegroup-core-nfs-server" -FEATURE_PACKAGES_nfs-client = "packagegroup-core-nfs-client" -FEATURE_PACKAGES_ssh-server-dropbear = "packagegroup-core-ssh-dropbear" -FEATURE_PACKAGES_ssh-server-openssh = "packagegroup-core-ssh-openssh" +FEATURE_PACKAGES_x11 = "${LIB32_PREFIX}packagegroup-core-x11" +FEATURE_PACKAGES_x11-base = "${LIB32_PREFIX}packagegroup-core-x11-base" +FEATURE_PACKAGES_x11-sato = "${LIB32_PREFIX}packagegroup-core-x11-sato" +FEATURE_PACKAGES_tools-debug = "${LIB32_PREFIX}packagegroup-core-tools-debug" +FEATURE_PACKAGES_eclipse-debug = "${LIB32_PREFIX}packagegroup-core-eclipse-debug" +FEATURE_PACKAGES_tools-profile = "${LIB32_PREFIX}packagegroup-core-tools-profile" +FEATURE_PACKAGES_tools-testapps = "${LIB32_PREFIX}packagegroup-core-tools-testapps" +FEATURE_PACKAGES_tools-sdk = "${LIB32_PREFIX}packagegroup-core-sdk ${LIB32_PREFIX}packagegroup-core-standalone-sdk-target" +FEATURE_PACKAGES_nfs-server = "${LIB32_PREFIX}packagegroup-core-nfs-server" +FEATURE_PACKAGES_nfs-client = "${LIB32_PREFIX}packagegroup-core-nfs-client" +FEATURE_PACKAGES_ssh-server-dropbear = "${LIB32_PREFIX}packagegroup-core-ssh-dropbear" +FEATURE_PACKAGES_ssh-server-openssh = "${LIB32_PREFIX}packagegroup-core-ssh-openssh" FEATURE_PACKAGES_hwcodecs = "${MACHINE_HWCODECS}" @@ -62,8 +62,8 @@ IMAGE_FEATURES_REPLACES_ssh-server-openssh = "ssh-server-dropbear" MACHINE_HWCODECS ??= "" CORE_IMAGE_BASE_INSTALL = '\ - packagegroup-core-boot \ - packagegroup-base-extended \ + ${LIB32_PREFIX}packagegroup-core-boot \ + ${LIB32_PREFIX}packagegroup-base-extended \ \ ${CORE_IMAGE_EXTRA_INSTALL} \ ' diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index 1366fee653..ea46634f37 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass @@ -1,6 +1,8 @@ UPDATERCPN ?= "${PN}" -DEPENDS_append_class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', ' update-rc.d initscripts', '', d)}" +# This is needed otherwise e.g. allarch run-postinst will +# depend on initscripts instead of lib32-initscripts +DEPENDS_append_class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', ' ${LIB32_PREFIX}update-rc.d ${LIB32_PREFIX}initscripts', '', d)}" UPDATERCD = "update-rc.d" UPDATERCD_class-cross = "" diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index 7e6723b880..f1411220df 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf @@ -39,3 +39,13 @@ do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_popula #For runqemu QB_SYSTEM_NAME = "qemu-system-i386" + +DEFAULTTUNE = "core2-64" +require conf/multilib.conf +MULTILIBS = "multilib:lib32" +DEFAULTTUNE_virtclass-multilib-lib32 = "core2-32" +#MACHINEOVERRIDES_virtclass-multilib-lib32 =. "x86:qemuall:qemux86:${WEBOS_EXTRA_MACHINEOVERRIDES}" +LIB32_PREFIX = "lib32-" +ROOTFS_PKGMANAGE = "${LIB32_PREFIX}opkg" +SPLASH = "${LIB32_PREFIX}psplash" +KMACHINE = "qemux86-64" diff --git a/meta/recipes-core/glibc/glibc-locale.inc b/meta/recipes-core/glibc/glibc-locale.inc index ef06389ff9..a7d94d31d3 100644 --- a/meta/recipes-core/glibc/glibc-locale.inc +++ b/meta/recipes-core/glibc/glibc-locale.inc @@ -35,7 +35,7 @@ PROVIDES = "virtual/libc-locale" PACKAGES = "localedef ${PN}-dbg" -PACKAGES_DYNAMIC = "^locale-base-.* \ +PACKAGES_DYNAMIC = "^${MLPREFIX}locale-base-.* \ ^glibc-gconv-.* ^glibc-charmap-.* ^glibc-localedata-.* ^glibc-binary-localedata-.* \ ^${MLPREFIX}glibc-gconv$" |