summaryrefslogtreecommitdiffstats
path: root/recipes-core
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-29 23:59:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-30 00:02:10 +0100
commit80747190ccce6628ce8815cf856f6ab867a00b5d (patch)
tree07be151fe85a5cf4207b8606fbe566e339e105e5 /recipes-core
parent27eafbb395fd4f607249b2e57085012e40283926 (diff)
downloadmeta-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-core')
-rw-r--r--recipes-core/coreutils/coreutils_6.9.bb2
-rw-r--r--recipes-core/gettext/gettext_0.16.1.bb28
-rw-r--r--recipes-core/readline/readline_5.2.bb4
3 files changed, 17 insertions, 17 deletions
diff --git a/recipes-core/coreutils/coreutils_6.9.bb b/recipes-core/coreutils/coreutils_6.9.bb
index 69e5489..8f24556 100644
--- a/recipes-core/coreutils/coreutils_6.9.bb
+++ b/recipes-core/coreutils/coreutils_6.9.bb
@@ -92,7 +92,7 @@ inherit update-alternatives
92 92
93ALTERNATIVE_PRIORITY = "100" 93ALTERNATIVE_PRIORITY = "100"
94 94
95ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs}" 95ALTERNATIVE:${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs}"
96 96
97ALTERNATIVE_PRIORITY[uptime] = "10" 97ALTERNATIVE_PRIORITY[uptime] = "10"
98ALTERNATIVE_PRIORITY[hostname] = "10" 98ALTERNATIVE_PRIORITY[hostname] = "10"
diff --git a/recipes-core/gettext/gettext_0.16.1.bb b/recipes-core/gettext/gettext_0.16.1.bb
index 1907ea5..76c2a01 100644
--- a/recipes-core/gettext/gettext_0.16.1.bb
+++ b/recipes-core/gettext/gettext_0.16.1.bb
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9ea3144f04c41cd2eada5d3f472e6ea5"
7 7
8PR = "r6" 8PR = "r6"
9DEPENDS = "virtual/libiconv" 9DEPENDS = "virtual/libiconv"
10DEPENDS_class-native = "" 10DEPENDS:class-native = ""
11PROVIDES = "virtual/libintl virtual/gettext" 11PROVIDES = "virtual/libintl virtual/gettext"
12PROVIDES_class-native = "virtual/gettext-native" 12PROVIDES:class-native = "virtual/gettext-native"
13 13
14SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ 14SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
15 file://gettext-vpath.patch \ 15 file://gettext-vpath.patch \
@@ -37,7 +37,7 @@ EXTRA_OECONF += "--without-lispdir \
37 --disable-openmp \ 37 --disable-openmp \
38 --without-emacs \ 38 --without-emacs \
39 " 39 "
40EXTRA_OECONF_append_libc-musl = "\ 40EXTRA_OECONF:append:libc-musl = "\
41 gt_cv_func_gnugettext1_libc=yes \ 41 gt_cv_func_gnugettext1_libc=yes \
42 gt_cv_func_gnugettext2_libc=yes \ 42 gt_cv_func_gnugettext2_libc=yes \
43 " 43 "
@@ -46,11 +46,11 @@ acpaths = '-I ${S}/autoconf-lib-link/m4/ \
46 -I ${S}/gettext-runtime/m4 \ 46 -I ${S}/gettext-runtime/m4 \
47 -I ${S}/gettext-tools/m4' 47 -I ${S}/gettext-tools/m4'
48 48
49do_configure_prepend() { 49do_configure:prepend() {
50 rm -f ${S}/config/m4/libtool.m4 50 rm -f ${S}/config/m4/libtool.m4
51} 51}
52 52
53do_install_append_libc-musl () { 53do_install:append:libc-musl () {
54 rm -f ${D}${libdir}/charset.alias 54 rm -f ${D}${libdir}/charset.alias
55} 55}
56 56
@@ -65,24 +65,24 @@ do_install_append_libc-musl () {
65# 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk 65# 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk
66 66
67PACKAGES =+ "libgettextlib libgettextsrc" 67PACKAGES =+ "libgettextlib libgettextsrc"
68FILES_libgettextlib = "${libdir}/libgettextlib-*.so*" 68FILES:libgettextlib = "${libdir}/libgettextlib-*.so*"
69FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*" 69FILES:libgettextsrc = "${libdir}/libgettextsrc-*.so*"
70 70
71PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-staticdev gettext-runtime-doc" 71PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-staticdev gettext-runtime-doc"
72 72
73FILES_${PN} += "${libdir}/${BPN}/*" 73FILES:${PN} += "${libdir}/${BPN}/*"
74 74
75FILES_gettext-runtime = "${bindir}/gettext \ 75FILES:gettext-runtime = "${bindir}/gettext \
76 ${bindir}/ngettext \ 76 ${bindir}/ngettext \
77 ${bindir}/envsubst \ 77 ${bindir}/envsubst \
78 ${bindir}/gettext.sh \ 78 ${bindir}/gettext.sh \
79 ${libdir}/libasprintf${SODEV} \ 79 ${libdir}/libasprintf${SODEV} \
80 ${libdir}/GNU.Gettext.dll \ 80 ${libdir}/GNU.Gettext.dll \
81 " 81 "
82FILES_gettext-runtime-staticdev += "${libdir}/libasprintf.a" 82FILES:gettext-runtime-staticdev += "${libdir}/libasprintf.a"
83FILES_gettext-runtime-dev += "${includedir}/autosprintf.h \ 83FILES:gettext-runtime-dev += "${includedir}/autosprintf.h \
84 ${libdir}/libasprintf${SOLIBDEV}" 84 ${libdir}/libasprintf${SOLIBDEV}"
85FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \ 85FILES:gettext-runtime-doc = "${mandir}/man1/gettext.* \
86 ${mandir}/man1/ngettext.* \ 86 ${mandir}/man1/ngettext.* \
87 ${mandir}/man1/envsubst.* \ 87 ${mandir}/man1/envsubst.* \
88 ${mandir}/man1/.* \ 88 ${mandir}/man1/.* \
@@ -97,11 +97,11 @@ FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \
97 ${infodir}/autosprintf.info \ 97 ${infodir}/autosprintf.info \
98 " 98 "
99 99
100do_install_append() { 100do_install:append() {
101 rm -f ${D}${libdir}/preloadable_libintl.so 101 rm -f ${D}${libdir}/preloadable_libintl.so
102} 102}
103 103
104do_install_append_class-native () { 104do_install:append:class-native () {
105 rm ${D}${datadir}/aclocal/* 105 rm ${D}${datadir}/aclocal/*
106 rm ${D}${datadir}/gettext/config.rpath 106 rm ${D}${datadir}/gettext/config.rpath
107 rm ${D}${datadir}/gettext/po/Makefile.in.in 107 rm ${D}${datadir}/gettext/po/Makefile.in.in
diff --git a/recipes-core/readline/readline_5.2.bb b/recipes-core/readline/readline_5.2.bb
index c1007a2..aa2799e 100644
--- a/recipes-core/readline/readline_5.2.bb
+++ b/recipes-core/readline/readline_5.2.bb
@@ -69,13 +69,13 @@ EXTRA_AUTORECONF += "--exclude=autoheader"
69 69
70LEAD_SONAME = "libreadline.so" 70LEAD_SONAME = "libreadline.so"
71 71
72do_configure_prepend () { 72do_configure:prepend () {
73 if [ ! -e ${S}/acinclude.m4 ]; then 73 if [ ! -e ${S}/acinclude.m4 ]; then
74 cat ${S}/aclocal.m4 > ${S}/acinclude.m4 74 cat ${S}/aclocal.m4 > ${S}/acinclude.m4
75 fi 75 fi
76} 76}
77 77
78do_install_append () { 78do_install:append () {
79 # Make install doesn't properly install these 79 # Make install doesn't properly install these
80 oe_libinstall -so -C shlib libhistory ${D}${libdir} 80 oe_libinstall -so -C shlib libhistory ${D}${libdir}
81 oe_libinstall -so -C shlib libreadline ${D}${libdir} 81 oe_libinstall -so -C shlib libreadline ${D}${libdir}