diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
| commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
| tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-core/sysvinit | |
| parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
| download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz | |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/sysvinit')
| -rw-r--r-- | meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | 10 | ||||
| -rw-r--r-- | meta/recipes-core/sysvinit/sysvinit_2.99.bb | 22 |
2 files changed, 16 insertions, 16 deletions
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb index d95d1a63f5..bfcf51c35a 100644 --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | |||
| @@ -53,14 +53,14 @@ EOF | |||
| 53 | fi | 53 | fi |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | pkg_postinst_${PN} () { | 56 | pkg_postinst:${PN} () { |
| 57 | # run this on host and on target | 57 | # run this on host and on target |
| 58 | if [ "${SERIAL_CONSOLES_CHECK}" = "" ]; then | 58 | if [ "${SERIAL_CONSOLES_CHECK}" = "" ]; then |
| 59 | exit 0 | 59 | exit 0 |
| 60 | fi | 60 | fi |
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | pkg_postinst_ontarget_${PN} () { | 63 | pkg_postinst_ontarget:${PN} () { |
| 64 | # run this on the target | 64 | # run this on the target |
| 65 | if [ -e /proc/consoles ]; then | 65 | if [ -e /proc/consoles ]; then |
| 66 | tmp="${SERIAL_CONSOLES_CHECK}" | 66 | tmp="${SERIAL_CONSOLES_CHECK}" |
| @@ -84,10 +84,10 @@ fi | |||
| 84 | # Set PACKAGE_ARCH appropriately. | 84 | # Set PACKAGE_ARCH appropriately. |
| 85 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 85 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
| 86 | 86 | ||
| 87 | FILES_${PN} = "${sysconfdir}/inittab ${base_bindir}/start_getty" | 87 | FILES:${PN} = "${sysconfdir}/inittab ${base_bindir}/start_getty" |
| 88 | CONFFILES_${PN} = "${sysconfdir}/inittab" | 88 | CONFFILES:${PN} = "${sysconfdir}/inittab" |
| 89 | 89 | ||
| 90 | USE_VT ?= "1" | 90 | USE_VT ?= "1" |
| 91 | SYSVINIT_ENABLED_GETTYS ?= "1" | 91 | SYSVINIT_ENABLED_GETTYS ?= "1" |
| 92 | 92 | ||
| 93 | RCONFLICTS_${PN} = "busybox-inittab" | 93 | RCONFLICTS:${PN} = "busybox-inittab" |
diff --git a/meta/recipes-core/sysvinit/sysvinit_2.99.bb b/meta/recipes-core/sysvinit/sysvinit_2.99.bb index e39f22a8bb..9ba9652f94 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.99.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.99.bb | |||
| @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ | |||
| 7 | file://COPYRIGHT;endline=15;md5=a1d3b3526501d3546d530bbe6ab6cdbe \ | 7 | file://COPYRIGHT;endline=15;md5=a1d3b3526501d3546d530bbe6ab6cdbe \ |
| 8 | " | 8 | " |
| 9 | 9 | ||
| 10 | RDEPENDS_${PN} = "${PN}-inittab" | 10 | RDEPENDS:${PN} = "${PN}-inittab" |
| 11 | 11 | ||
| 12 | SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \ | 12 | SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \ |
| 13 | file://install.patch \ | 13 | file://install.patch \ |
| @@ -26,14 +26,14 @@ SRC_URI[sha256sum] = "b05c3677bb698afe64c997968b00c49b2a9bd320ce963523230ee7ea41 | |||
| 26 | S = "${WORKDIR}/sysvinit-${PV}" | 26 | S = "${WORKDIR}/sysvinit-${PV}" |
| 27 | 27 | ||
| 28 | inherit update-alternatives features_check | 28 | inherit update-alternatives features_check |
| 29 | DEPENDS_append = " update-rc.d-native base-passwd virtual/crypt" | 29 | DEPENDS:append = " update-rc.d-native base-passwd virtual/crypt" |
| 30 | do_package_setscene[depends] = "${MLPREFIX}base-passwd:do_populate_sysroot" | 30 | do_package_setscene[depends] = "${MLPREFIX}base-passwd:do_populate_sysroot" |
| 31 | 31 | ||
| 32 | PACKAGECONFIG[psplash-text-updates] = ",," | 32 | PACKAGECONFIG[psplash-text-updates] = ",," |
| 33 | 33 | ||
| 34 | REQUIRED_DISTRO_FEATURES = "sysvinit" | 34 | REQUIRED_DISTRO_FEATURES = "sysvinit" |
| 35 | 35 | ||
| 36 | ALTERNATIVE_${PN} = "init mountpoint halt reboot runlevel shutdown poweroff last lastb mesg utmpdump wall" | 36 | ALTERNATIVE:${PN} = "init mountpoint halt reboot runlevel shutdown poweroff last lastb mesg utmpdump wall" |
| 37 | 37 | ||
| 38 | ALTERNATIVE_PRIORITY = "200" | 38 | ALTERNATIVE_PRIORITY = "200" |
| 39 | 39 | ||
| @@ -49,13 +49,13 @@ ALTERNATIVE_LINK_NAME[runlevel] = "${base_sbindir}/runlevel" | |||
| 49 | ALTERNATIVE_LINK_NAME[shutdown] = "${base_sbindir}/shutdown" | 49 | ALTERNATIVE_LINK_NAME[shutdown] = "${base_sbindir}/shutdown" |
| 50 | ALTERNATIVE_LINK_NAME[poweroff] = "${base_sbindir}/poweroff" | 50 | ALTERNATIVE_LINK_NAME[poweroff] = "${base_sbindir}/poweroff" |
| 51 | 51 | ||
| 52 | ALTERNATIVE_${PN}-pidof = "pidof" | 52 | ALTERNATIVE:${PN}-pidof = "pidof" |
| 53 | ALTERNATIVE_LINK_NAME[pidof] = "${base_bindir}/pidof" | 53 | ALTERNATIVE_LINK_NAME[pidof] = "${base_bindir}/pidof" |
| 54 | 54 | ||
| 55 | ALTERNATIVE_${PN}-sulogin = "sulogin" | 55 | ALTERNATIVE:${PN}-sulogin = "sulogin" |
| 56 | ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" | 56 | ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" |
| 57 | 57 | ||
| 58 | ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 sulogin.8 utmpdump.1" | 58 | ALTERNATIVE:${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 sulogin.8 utmpdump.1" |
| 59 | 59 | ||
| 60 | ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" | 60 | ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" |
| 61 | ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" | 61 | ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" |
| @@ -66,13 +66,13 @@ ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" | |||
| 66 | ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" | 66 | ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" |
| 67 | 67 | ||
| 68 | PACKAGES =+ "sysvinit-pidof sysvinit-sulogin" | 68 | PACKAGES =+ "sysvinit-pidof sysvinit-sulogin" |
| 69 | FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*" | 69 | FILES:${PN} += "${base_sbindir}/* ${base_bindir}/*" |
| 70 | FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5" | 70 | FILES:sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5" |
| 71 | FILES_sysvinit-sulogin = "${base_sbindir}/sulogin.sysvinit" | 71 | FILES:sysvinit-sulogin = "${base_sbindir}/sulogin.sysvinit" |
| 72 | 72 | ||
| 73 | RDEPENDS_${PN} += "sysvinit-pidof initd-functions base-passwd" | 73 | RDEPENDS:${PN} += "sysvinit-pidof initd-functions base-passwd" |
| 74 | 74 | ||
| 75 | CFLAGS_prepend = "-D_GNU_SOURCE " | 75 | CFLAGS:prepend = "-D_GNU_SOURCE " |
| 76 | export LCRYPT = "-lcrypt" | 76 | export LCRYPT = "-lcrypt" |
| 77 | EXTRA_OEMAKE += "'base_bindir=${base_bindir}' \ | 77 | EXTRA_OEMAKE += "'base_bindir=${base_bindir}' \ |
| 78 | 'base_sbindir=${base_sbindir}' \ | 78 | 'base_sbindir=${base_sbindir}' \ |
