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 64603daa63..eb1cf8239c 100644 --- a/meta-yocto/conf/distro/poky-lsb.conf +++ b/meta-yocto/conf/distro/poky-lsb.conf | |||
@@ -1,7 +1,7 @@ | |||
1 | require conf/distro/poky.conf | 1 | require conf/distro/poky.conf |
2 | 2 | ||
3 | DISTRO = "poky-lsb" | 3 | DISTRO = "poky-lsb" |
4 | DISTROOVERRIDES = "poky:poky-lsb" | 4 | DISTROOVERRIDES = "poky:linuxstdbase" |
5 | 5 | ||
6 | DISTRO_FEATURES += "pam largefile" | 6 | DISTRO_FEATURES += "pam largefile" |
7 | PREFERRED_PROVIDER_virtual/libx11 = "libx11" | 7 | PREFERRED_PROVIDER_virtual/libx11 = "libx11" |
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf index 01ff45e383..ebd8c5e96f 100644 --- a/meta-yocto/conf/distro/poky.conf +++ b/meta-yocto/conf/distro/poky.conf | |||
@@ -28,6 +28,8 @@ QA_LOGFILE = "${TMPDIR}/qa.log" | |||
28 | 28 | ||
29 | IMAGE_ROOTFS_SIZE_ext2 ?= "131072" | 29 | IMAGE_ROOTFS_SIZE_ext2 ?= "131072" |
30 | 30 | ||
31 | LOCALCONF_VERSION = "1" | ||
32 | |||
31 | #IPK_FEED_URIS += " \ | 33 | #IPK_FEED_URIS += " \ |
32 | # upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \ | 34 | # upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \ |
33 | #upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \ | 35 | #upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \ |
@@ -113,7 +115,7 @@ LOCALE_UTF8_ONLY = "0" | |||
113 | 115 | ||
114 | DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci" | 116 | DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci" |
115 | 117 | ||
116 | POKY_EXTRA_RDEPENDS = "task-poky-boot" | 118 | POKY_EXTRA_RDEPENDS = "task-core-boot" |
117 | POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config" | 119 | POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config" |
118 | POKY_EXTRA_RDEPENDS_qemuarmv6 = "qemu-config" | 120 | POKY_EXTRA_RDEPENDS_qemuarmv6 = "qemu-config" |
119 | POKY_EXTRA_RDEPENDS_qemuarmv7 = "qemu-config" | 121 | POKY_EXTRA_RDEPENDS_qemuarmv7 = "qemu-config" |
@@ -146,7 +148,7 @@ COMMERCIAL_VIDEO_PLUGINS ?= "" | |||
146 | COMMERCIAL_QT ?= "" | 148 | COMMERCIAL_QT ?= "" |
147 | # COMMERCIAL_QT ?= "qmmp" | 149 | # COMMERCIAL_QT ?= "qmmp" |
148 | # Set of common licenses used for license.bbclass | 150 | # Set of common licenses used for license.bbclass |
149 | COMMON_LICENSE_DIR ??= "${POKYBASE}/meta/files/common-licenses" | 151 | COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses" |
150 | 152 | ||
151 | BB_GENERATE_MIRROR_TARBALLS ??= "0" | 153 | BB_GENERATE_MIRROR_TARBALLS ??= "0" |
152 | 154 | ||