diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-20 23:53:12 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-21 00:29:32 +0100 |
commit | fc2cee5cc6299a5592af598c23a13f93bab1e5c8 (patch) | |
tree | 3add08cdba5c43517ced933880bc0752f2bf12d3 /meta/recipes-core | |
parent | aec20af824a862399f91d3382a052467dba71dc5 (diff) | |
download | poky-fc2cee5cc6299a5592af598c23a13f93bab1e5c8.tar.gz |
Rename poky-lsb override to linuxstdbase
(From OE-Core rev: 73a227a738da17229baac142ccd889c7929402ba)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/base-files/base-files_3.0.14.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/images/core-image-base.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/images/core-image-core.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/images/core-image-minimal-dev.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/images/core-image-minimal-initramfs.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/images/core-image-minimal.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/jpeg/jpeg_8b.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/libxml/libxml2.inc | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index d8f96c0b71..857df13332 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb | |||
@@ -160,7 +160,7 @@ do_install_append_netbook-pro () { | |||
160 | mkdir -p ${D}/initrd | 160 | mkdir -p ${D}/initrd |
161 | } | 161 | } |
162 | 162 | ||
163 | do_install_append_poky-lsb() { | 163 | do_install_append_linuxstdbase() { |
164 | for d in ${dirs3755}; do | 164 | for d in ${dirs3755}; do |
165 | install -m 0755 -d ${D}$d | 165 | install -m 0755 -d ${D}$d |
166 | done | 166 | done |
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 0319b9d04c..5ebff68a6f 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
@@ -29,7 +29,7 @@ S = "${WORKDIR}/glib-${PV}" | |||
29 | 29 | ||
30 | EXTRA_OECONF = "--disable-debug --enable-included-printf=no" | 30 | EXTRA_OECONF = "--disable-debug --enable-included-printf=no" |
31 | EXTRA_OECONF_virtclass-native = "" | 31 | EXTRA_OECONF_virtclass-native = "" |
32 | EXTRA_OECONF_poky-lsb = "--enable-included-printf=no" | 32 | EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no" |
33 | 33 | ||
34 | FILES_${PN} = "${libdir}/lib*${SOLIBS}" | 34 | FILES_${PN} = "${libdir}/lib*${SOLIBS}" |
35 | FILES_${PN}-dev += "${libdir}/glib-2.0/include" | 35 | FILES_${PN}-dev += "${libdir}/glib-2.0/include" |
diff --git a/meta/recipes-core/images/core-image-base.bb b/meta/recipes-core/images/core-image-base.bb index 461b805b60..13a76508a0 100644 --- a/meta/recipes-core/images/core-image-base.bb +++ b/meta/recipes-core/images/core-image-base.bb | |||
@@ -6,4 +6,4 @@ IMAGE_FEATURES += "apps-console-core" | |||
6 | 6 | ||
7 | LICENSE = "MIT" | 7 | LICENSE = "MIT" |
8 | 8 | ||
9 | inherit poky-image | 9 | inherit core-image |
diff --git a/meta/recipes-core/images/core-image-core.bb b/meta/recipes-core/images/core-image-core.bb index c232ccdc54..57ff0850da 100644 --- a/meta/recipes-core/images/core-image-core.bb +++ b/meta/recipes-core/images/core-image-core.bb | |||
@@ -6,4 +6,4 @@ IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES}" | |||
6 | 6 | ||
7 | LICENSE = "MIT" | 7 | LICENSE = "MIT" |
8 | 8 | ||
9 | inherit poky-image | 9 | inherit core-image |
diff --git a/meta/recipes-core/images/core-image-minimal-dev.bb b/meta/recipes-core/images/core-image-minimal-dev.bb index 248d29f031..89ec9f8833 100644 --- a/meta/recipes-core/images/core-image-minimal-dev.bb +++ b/meta/recipes-core/images/core-image-minimal-dev.bb | |||
@@ -9,7 +9,7 @@ IMAGE_LINGUAS = " " | |||
9 | 9 | ||
10 | LICENSE = "MIT" | 10 | LICENSE = "MIT" |
11 | 11 | ||
12 | inherit poky-image | 12 | inherit core-image |
13 | 13 | ||
14 | # remove not needed ipkg informations | 14 | # remove not needed ipkg informations |
15 | ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " | 15 | ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " |
diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb index 3da4a952f7..21aaa6c70e 100644 --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb | |||
@@ -7,4 +7,4 @@ IMAGE_LINGUAS = "" | |||
7 | 7 | ||
8 | LICENSE = "MIT" | 8 | LICENSE = "MIT" |
9 | 9 | ||
10 | inherit poky-image | 10 | inherit core-image |
diff --git a/meta/recipes-core/images/core-image-minimal.bb b/meta/recipes-core/images/core-image-minimal.bb index 3aae04edde..aa00e67c1a 100644 --- a/meta/recipes-core/images/core-image-minimal.bb +++ b/meta/recipes-core/images/core-image-minimal.bb | |||
@@ -7,7 +7,7 @@ IMAGE_LINGUAS = " " | |||
7 | 7 | ||
8 | LICENSE = "MIT" | 8 | LICENSE = "MIT" |
9 | 9 | ||
10 | inherit poky-image | 10 | inherit core-image |
11 | 11 | ||
12 | # remove not needed ipkg informations | 12 | # remove not needed ipkg informations |
13 | ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " | 13 | ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " |
diff --git a/meta/recipes-core/jpeg/jpeg_8b.bb b/meta/recipes-core/jpeg/jpeg_8b.bb index 78fabf1efd..93aa7be678 100644 --- a/meta/recipes-core/jpeg/jpeg_8b.bb +++ b/meta/recipes-core/jpeg/jpeg_8b.bb | |||
@@ -46,7 +46,7 @@ FILES_jpeg-tools = "${bindir}/*" | |||
46 | 46 | ||
47 | BBCLASSEXTEND = "native" | 47 | BBCLASSEXTEND = "native" |
48 | 48 | ||
49 | pkg_postinst_${PN}_poky-lsb () { | 49 | pkg_postinst_${PN}_linuxstdbase () { |
50 | if [ "$D" = "" ]; then | 50 | if [ "$D" = "" ]; then |
51 | if [ ! -e ${libdir}/libjpeg.so.62 ]; then | 51 | if [ ! -e ${libdir}/libjpeg.so.62 ]; then |
52 | JPEG=`find ${libdir} -type f -name libjpeg.so.\*.\*.\*` | 52 | JPEG=`find ${libdir} -type f -name libjpeg.so.\*.\*.\*` |
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc index ba6db8f2c0..d9ea816e6d 100644 --- a/meta/recipes-core/libxml/libxml2.inc +++ b/meta/recipes-core/libxml/libxml2.inc | |||
@@ -21,7 +21,7 @@ inherit autotools pkgconfig binconfig | |||
21 | 21 | ||
22 | EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n" | 22 | EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n" |
23 | EXTRA_OECONF_virtclass-native = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n" | 23 | EXTRA_OECONF_virtclass-native = "--with-python=${STAGING_BINDIR}/python --without-legacy --with-catalog --without-docbook --with-c14n" |
24 | EXTRA_OECONF_poky-lsb = "--without-python --with-debug --with-legacy --with-catalog --with-docbook --with-c14n" | 24 | EXTRA_OECONF_linuxstdbase = "--without-python --with-debug --with-legacy --with-catalog --with-docbook --with-c14n" |
25 | 25 | ||
26 | # required for pythong binding | 26 | # required for pythong binding |
27 | export HOST_SYS | 27 | export HOST_SYS |