diff options
Diffstat (limited to 'meta-yocto/conf/distro')
| -rw-r--r-- | meta-yocto/conf/distro/poky-lsb.conf | 2 | ||||
| -rw-r--r-- | meta-yocto/conf/distro/poky.conf | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/meta-yocto/conf/distro/poky-lsb.conf b/meta-yocto/conf/distro/poky-lsb.conf index 64603da..eb1cf82 100644 --- a/meta-yocto/conf/distro/poky-lsb.conf +++ b/meta-yocto/conf/distro/poky-lsb.conf @@ -1,7 +1,7 @@ require conf/distro/poky.conf DISTRO = "poky-lsb" -DISTROOVERRIDES = "poky:poky-lsb" +DISTROOVERRIDES = "poky:linuxstdbase" DISTRO_FEATURES += "pam largefile" PREFERRED_PROVIDER_virtual/libx11 = "libx11" diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf index 01ff45e..ebd8c5e 100644 --- a/meta-yocto/conf/distro/poky.conf +++ b/meta-yocto/conf/distro/poky.conf @@ -28,6 +28,8 @@ QA_LOGFILE = "${TMPDIR}/qa.log" IMAGE_ROOTFS_SIZE_ext2 ?= "131072" +LOCALCONF_VERSION = "1" + #IPK_FEED_URIS += " \ # upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \ #upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \ @@ -113,7 +115,7 @@ LOCALE_UTF8_ONLY = "0" DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci" -POKY_EXTRA_RDEPENDS = "task-poky-boot" +POKY_EXTRA_RDEPENDS = "task-core-boot" POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config" POKY_EXTRA_RDEPENDS_qemuarmv6 = "qemu-config" POKY_EXTRA_RDEPENDS_qemuarmv7 = "qemu-config" @@ -146,7 +148,7 @@ COMMERCIAL_VIDEO_PLUGINS ?= "" COMMERCIAL_QT ?= "" # COMMERCIAL_QT ?= "qmmp" # Set of common licenses used for license.bbclass -COMMON_LICENSE_DIR ??= "${POKYBASE}/meta/files/common-licenses" +COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses" BB_GENERATE_MIRROR_TARBALLS ??= "0" |
