diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-29 23:59:42 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-30 00:02:10 +0100 |
commit | 80747190ccce6628ce8815cf856f6ab867a00b5d (patch) | |
tree | 07be151fe85a5cf4207b8606fbe566e339e105e5 /recipes-support | |
parent | 27eafbb395fd4f607249b2e57085012e40283926 (diff) | |
download | meta-gplv2-80747190ccce6628ce8815cf856f6ab867a00b5d.tar.gz |
meta-gplv2: Convert to new override syntax
This converts the layer to the new override syntax. This was done using
<oe-core>/scripts/contrib/convert-overrides.py <this-layer>
with no manual fixes.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'recipes-support')
-rw-r--r-- | recipes-support/gdbm/gdbm_1.8.3.bb | 2 | ||||
-rw-r--r-- | recipes-support/gmp/gmp.inc | 4 | ||||
-rw-r--r-- | recipes-support/gmp/gmp_4.2.1.bb | 2 | ||||
-rw-r--r-- | recipes-support/gnupg/gnupg_1.4.7.bb | 8 | ||||
-rw-r--r-- | recipes-support/gnutls/gnutls.inc | 20 | ||||
-rw-r--r-- | recipes-support/libiconv/libiconv_1.11.1.bb | 6 | ||||
-rw-r--r-- | recipes-support/nettle/nettle.inc | 2 | ||||
-rw-r--r-- | recipes-support/nettle/nettle_2.7.1.bb | 2 | ||||
-rw-r--r-- | recipes-support/shared-mime-info/shared-mime-info.inc | 10 |
9 files changed, 28 insertions, 28 deletions
diff --git a/recipes-support/gdbm/gdbm_1.8.3.bb b/recipes-support/gdbm/gdbm_1.8.3.bb index b253dc1..b7551ad 100644 --- a/recipes-support/gdbm/gdbm_1.8.3.bb +++ b/recipes-support/gdbm/gdbm_1.8.3.bb | |||
@@ -18,7 +18,7 @@ inherit autotools texinfo | |||
18 | 18 | ||
19 | BBCLASSEXTEND = "native nativesdk" | 19 | BBCLASSEXTEND = "native nativesdk" |
20 | 20 | ||
21 | do_install_append () { | 21 | do_install:append () { |
22 | oe_runmake install-compat DESTDIR=${D} | 22 | oe_runmake install-compat DESTDIR=${D} |
23 | install -d ${D}${includedir}/gdbm | 23 | install -d ${D}${includedir}/gdbm |
24 | install -m 0644 ${S}/dbm.h ${D}${includedir}/ | 24 | install -m 0644 ${S}/dbm.h ${D}${includedir}/ |
diff --git a/recipes-support/gmp/gmp.inc b/recipes-support/gmp/gmp.inc index abac8cf..60520c2 100644 --- a/recipes-support/gmp/gmp.inc +++ b/recipes-support/gmp/gmp.inc | |||
@@ -8,5 +8,5 @@ inherit autotools texinfo | |||
8 | PACKAGECONFIG ??= "" | 8 | PACKAGECONFIG ??= "" |
9 | PACKAGECONFIG[readline] = "--with-readline=yes,--with-readline=no,readline" | 9 | PACKAGECONFIG[readline] = "--with-readline=yes,--with-readline=no,readline" |
10 | 10 | ||
11 | ARM_INSTRUCTION_SET_armv4 = "arm" | 11 | ARM_INSTRUCTION_SET:armv4 = "arm" |
12 | ARM_INSTRUCTION_SET_armv5 = "arm" | 12 | ARM_INSTRUCTION_SET:armv5 = "arm" |
diff --git a/recipes-support/gmp/gmp_4.2.1.bb b/recipes-support/gmp/gmp_4.2.1.bb index 029e728..88d8f9b 100644 --- a/recipes-support/gmp/gmp_4.2.1.bb +++ b/recipes-support/gmp/gmp_4.2.1.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require gmp.inc | 1 | require gmp.inc |
2 | 2 | ||
3 | LICENSE = "LGPLv2.1+ & GPLv2+" | 3 | LICENSE = "LGPLv2.1+ & GPLv2+" |
4 | LICENSE_${PN} = "LGPLv2.1+" | 4 | LICENSE:${PN} = "LGPLv2.1+" |
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a \ | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a \ |
7 | file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \ | 7 | file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \ |
diff --git a/recipes-support/gnupg/gnupg_1.4.7.bb b/recipes-support/gnupg/gnupg_1.4.7.bb index c7da052..7f146a1 100644 --- a/recipes-support/gnupg/gnupg_1.4.7.bb +++ b/recipes-support/gnupg/gnupg_1.4.7.bb | |||
@@ -100,14 +100,14 @@ do_install () { | |||
100 | } | 100 | } |
101 | 101 | ||
102 | # split out gpgv from main package | 102 | # split out gpgv from main package |
103 | RDEPENDS_${PN} = "gpgv" | 103 | RDEPENDS:${PN} = "gpgv" |
104 | RDEPENDS_${PN}_class-native = "" | 104 | RDEPENDS:${PN}:class-native = "" |
105 | 105 | ||
106 | PACKAGES =+ "gpgv" | 106 | PACKAGES =+ "gpgv" |
107 | FILES_gpgv = "${bindir}/gpgv" | 107 | FILES:gpgv = "${bindir}/gpgv" |
108 | 108 | ||
109 | # Exclude debug files from the main packages | 109 | # Exclude debug files from the main packages |
110 | FILES_${PN} = "${bindir}/* ${datadir}/${BPN} ${libexecdir}/${BPN}/*" | 110 | FILES:${PN} = "${bindir}/* ${datadir}/${BPN} ${libexecdir}/${BPN}/*" |
111 | 111 | ||
112 | PACKAGECONFIG ??= "" | 112 | PACKAGECONFIG ??= "" |
113 | PACKAGECONFIG[curl] = "--with-libcurl=${STAGING_LIBDIR},--without-libcurl,curl" | 113 | PACKAGECONFIG[curl] = "--with-libcurl=${STAGING_LIBDIR},--without-libcurl,curl" |
diff --git a/recipes-support/gnutls/gnutls.inc b/recipes-support/gnutls/gnutls.inc index 6b46e54..491fdbf 100644 --- a/recipes-support/gnutls/gnutls.inc +++ b/recipes-support/gnutls/gnutls.inc | |||
@@ -3,16 +3,16 @@ HOMEPAGE = "http://www.gnu.org/software/gnutls/" | |||
3 | BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" | 3 | BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" |
4 | 4 | ||
5 | LICENSE = "GPLv3+ & LGPLv2.1+" | 5 | LICENSE = "GPLv3+ & LGPLv2.1+" |
6 | LICENSE_${PN} = "LGPLv2.1+" | 6 | LICENSE:${PN} = "LGPLv2.1+" |
7 | LICENSE_${PN}-xx = "LGPLv2.1+" | 7 | LICENSE:${PN}-xx = "LGPLv2.1+" |
8 | LICENSE_${PN}-bin = "GPLv3+" | 8 | LICENSE:${PN}-bin = "GPLv3+" |
9 | LICENSE_${PN}-openssl = "GPLv3+" | 9 | LICENSE:${PN}-openssl = "GPLv3+" |
10 | 10 | ||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ | 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ |
12 | file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" | 12 | file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" |
13 | 13 | ||
14 | DEPENDS = "nettle gmp virtual/libiconv" | 14 | DEPENDS = "nettle gmp virtual/libiconv" |
15 | DEPENDS_append_libc-musl = " argp-standalone" | 15 | DEPENDS:append:libc-musl = " argp-standalone" |
16 | 16 | ||
17 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" | 17 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
18 | 18 | ||
@@ -38,9 +38,9 @@ EXTRA_OECONF = " \ | |||
38 | --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \ | 38 | --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \ |
39 | " | 39 | " |
40 | 40 | ||
41 | LDFLAGS_append_libc-musl = " -largp" | 41 | LDFLAGS:append:libc-musl = " -largp" |
42 | 42 | ||
43 | do_configure_prepend() { | 43 | do_configure:prepend() { |
44 | for dir in . lib; do | 44 | for dir in . lib; do |
45 | rm -f ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4 | 45 | rm -f ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4 |
46 | done | 46 | done |
@@ -48,8 +48,8 @@ do_configure_prepend() { | |||
48 | 48 | ||
49 | PACKAGES =+ "${PN}-openssl ${PN}-xx" | 49 | PACKAGES =+ "${PN}-openssl ${PN}-xx" |
50 | 50 | ||
51 | FILES_${PN}-dev += "${bindir}/gnutls-cli-debug" | 51 | FILES:${PN}-dev += "${bindir}/gnutls-cli-debug" |
52 | FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" | 52 | FILES:${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" |
53 | FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*" | 53 | FILES:${PN}-xx = "${libdir}/libgnutlsxx.so.*" |
54 | 54 | ||
55 | BBCLASSEXTEND = "native nativesdk" | 55 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/recipes-support/libiconv/libiconv_1.11.1.bb b/recipes-support/libiconv/libiconv_1.11.1.bb index f28e64a..1e6668e 100644 --- a/recipes-support/libiconv/libiconv_1.11.1.bb +++ b/recipes-support/libiconv/libiconv_1.11.1.bb | |||
@@ -31,17 +31,17 @@ EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable" | |||
31 | 31 | ||
32 | LEAD_SONAME = "libiconv.so" | 32 | LEAD_SONAME = "libiconv.so" |
33 | 33 | ||
34 | do_configure_prepend () { | 34 | do_configure:prepend () { |
35 | rm -f ${S}/m4/libtool.m4 ${S}/m4/ltoptions.m4 ${S}/m4/ltsugar.m4 ${S}/m4/ltversion.m4 ${S}/m4/lt~obsolete.m4 ${S}/libcharset/m4/libtool.m4 ${S}/libcharset/m4/ltoptions.m4 ${S}/libcharset/m4/ltsugar.m4 ${S}/libcharset/m4/ltversion.m4 ${S}/libcharset/m4/lt~obsolete.m4 | 35 | rm -f ${S}/m4/libtool.m4 ${S}/m4/ltoptions.m4 ${S}/m4/ltsugar.m4 ${S}/m4/ltversion.m4 ${S}/m4/lt~obsolete.m4 ${S}/libcharset/m4/libtool.m4 ${S}/libcharset/m4/ltoptions.m4 ${S}/libcharset/m4/ltsugar.m4 ${S}/libcharset/m4/ltversion.m4 ${S}/libcharset/m4/lt~obsolete.m4 |
36 | } | 36 | } |
37 | 37 | ||
38 | do_configure_append () { | 38 | do_configure:append () { |
39 | # forcibly remove RPATH from libtool | 39 | # forcibly remove RPATH from libtool |
40 | sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' *libtool | 40 | sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' *libtool |
41 | sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=_NO_RPATH_|g' *libtool | 41 | sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=_NO_RPATH_|g' *libtool |
42 | } | 42 | } |
43 | 43 | ||
44 | do_install_append () { | 44 | do_install:append () { |
45 | rm -rf ${D}${libdir}/preloadable_libiconv.so | 45 | rm -rf ${D}${libdir}/preloadable_libiconv.so |
46 | rm -rf ${D}${libdir}/charset.alias | 46 | rm -rf ${D}${libdir}/charset.alias |
47 | } | 47 | } |
diff --git a/recipes-support/nettle/nettle.inc b/recipes-support/nettle/nettle.inc index af51fb6..5c27c1e 100644 --- a/recipes-support/nettle/nettle.inc +++ b/recipes-support/nettle/nettle.inc | |||
@@ -15,7 +15,7 @@ inherit autotools ptest | |||
15 | 15 | ||
16 | EXTRA_OECONF = "--disable-openssl" | 16 | EXTRA_OECONF = "--disable-openssl" |
17 | 17 | ||
18 | do_configure_prepend() { | 18 | do_configure:prepend() { |
19 | if [ ! -e ${S}/acinclude.m4 -a -e ${S}/aclocal.m4 ]; then | 19 | if [ ! -e ${S}/acinclude.m4 -a -e ${S}/aclocal.m4 ]; then |
20 | cp ${S}/aclocal.m4 ${S}/acinclude.m4 | 20 | cp ${S}/aclocal.m4 ${S}/acinclude.m4 |
21 | fi | 21 | fi |
diff --git a/recipes-support/nettle/nettle_2.7.1.bb b/recipes-support/nettle/nettle_2.7.1.bb index 2006146..7ff03dd 100644 --- a/recipes-support/nettle/nettle_2.7.1.bb +++ b/recipes-support/nettle/nettle_2.7.1.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require nettle.inc | 1 | require nettle.inc |
2 | 2 | ||
3 | LICENSE = "LGPLv2.1+ & GPLv2" | 3 | LICENSE = "LGPLv2.1+ & GPLv2" |
4 | LICENSE_${PN} = "LGPLv2.1+" | 4 | LICENSE:${PN} = "LGPLv2.1+" |
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ | 6 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ |
7 | file://serpent-decrypt.c;beginline=53;endline=67;md5=bcfd4745d53ca57f82907089898e390d \ | 7 | file://serpent-decrypt.c;beginline=53;endline=67;md5=bcfd4745d53ca57f82907089898e390d \ |
diff --git a/recipes-support/shared-mime-info/shared-mime-info.inc b/recipes-support/shared-mime-info/shared-mime-info.inc index 2614d3a..06d0422 100644 --- a/recipes-support/shared-mime-info/shared-mime-info.inc +++ b/recipes-support/shared-mime-info/shared-mime-info.inc | |||
@@ -13,14 +13,14 @@ inherit autotools pkgconfig gettext mime | |||
13 | 13 | ||
14 | EXTRA_OECONF = "--disable-update-mimedb" | 14 | EXTRA_OECONF = "--disable-update-mimedb" |
15 | 15 | ||
16 | FILES_${PN} += "${datadir}/mime" | 16 | FILES:${PN} += "${datadir}/mime" |
17 | FILES_${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc" | 17 | FILES:${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc" |
18 | 18 | ||
19 | # freedesktop.org.xml is only required when updating the mime database, | 19 | # freedesktop.org.xml is only required when updating the mime database, |
20 | # package it separately | 20 | # package it separately |
21 | PACKAGES =+ "shared-mime-info-data" | 21 | PACKAGES =+ "shared-mime-info-data" |
22 | FILES_shared-mime-info-data = "${datadir}/mime/packages/freedesktop.org.xml" | 22 | FILES:shared-mime-info-data = "${datadir}/mime/packages/freedesktop.org.xml" |
23 | RDEPENDS_shared-mime-info-data = "shared-mime-info" | 23 | RDEPENDS:shared-mime-info-data = "shared-mime-info" |
24 | 24 | ||
25 | do_install () { | 25 | do_install () { |
26 | autotools_do_install | 26 | autotools_do_install |
@@ -28,7 +28,7 @@ do_install () { | |||
28 | update-mime-database ${D}${datadir}/mime | 28 | update-mime-database ${D}${datadir}/mime |
29 | } | 29 | } |
30 | 30 | ||
31 | do_install_class-native () { | 31 | do_install:class-native () { |
32 | autotools_do_install | 32 | autotools_do_install |
33 | 33 | ||
34 | ${B}/update-mime-database ${D}${datadir}/mime | 34 | ${B}/update-mime-database ${D}${datadir}/mime |