diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-02-07 20:45:59 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-08 13:20:02 +0000 |
commit | 0e48ca10aa44c118ff1f97bf0394c04819c6dea4 (patch) | |
tree | ed97fb480f15f67847bad57e40a4110bf8601a60 | |
parent | 9afefb02b0f46e54fd102383e8cd344dc54d2771 (diff) | |
download | poky-0e48ca10aa44c118ff1f97bf0394c04819c6dea4.tar.gz |
chkconfig: remove the recipe
chkconfig is one of the options for virtual/update-alternatives,
however opkg-utils have been used as the default for a very long time,
while chkconfig isn't anymore tested in any way, and is stuck
at a very old version due to newer versions requiring selinux.
[YOCTO #11264]
(From OE-Core rev: 61efc1e287326f52810a439ccde996f45ef89733)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 files changed, 0 insertions, 151 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index a80e85a2f6..c68e9edf63 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc | |||
@@ -94,8 +94,6 @@ RECIPE_MAINTAINER_pn-cairo = "Anuj Mittal <anuj.mittal@intel.com>" | |||
94 | RECIPE_MAINTAINER_pn-cantarell-fonts = "Alexander Kanavin <alex.kanavin@gmail.com>" | 94 | RECIPE_MAINTAINER_pn-cantarell-fonts = "Alexander Kanavin <alex.kanavin@gmail.com>" |
95 | RECIPE_MAINTAINER_pn-ccache = "Robert Yang <liezhi.yang@windriver.com>" | 95 | RECIPE_MAINTAINER_pn-ccache = "Robert Yang <liezhi.yang@windriver.com>" |
96 | RECIPE_MAINTAINER_pn-cdrtools-native = "Yi Zhao <yi.zhao@windriver.com>" | 96 | RECIPE_MAINTAINER_pn-cdrtools-native = "Yi Zhao <yi.zhao@windriver.com>" |
97 | RECIPE_MAINTAINER_pn-chkconfig = "Yi Zhao <yi.zhao@windriver.com>" | ||
98 | RECIPE_MAINTAINER_pn-chkconfig-alternatives-native = "Yi Zhao <yi.zhao@windriver.com>" | ||
99 | RECIPE_MAINTAINER_pn-chrpath = "Yi Zhao <yi.zhao@windriver.com>" | 97 | RECIPE_MAINTAINER_pn-chrpath = "Yi Zhao <yi.zhao@windriver.com>" |
100 | RECIPE_MAINTAINER_pn-clutter-1.0 = "Ross Burton <ross.burton@intel.com>" | 98 | RECIPE_MAINTAINER_pn-clutter-1.0 = "Ross Burton <ross.burton@intel.com>" |
101 | RECIPE_MAINTAINER_pn-clutter-gst-3.0 = "Ross Burton <ross.burton@intel.com>" | 99 | RECIPE_MAINTAINER_pn-clutter-gst-3.0 = "Ross Burton <ross.burton@intel.com>" |
diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index ea6d567301..9a70b189a4 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | |||
@@ -108,7 +108,6 @@ RDEPENDS_packagegroup-self-hosted-debug = " \ | |||
108 | 108 | ||
109 | RDEPENDS_packagegroup-self-hosted-extended = "\ | 109 | RDEPENDS_packagegroup-self-hosted-extended = "\ |
110 | bzip2 \ | 110 | bzip2 \ |
111 | chkconfig \ | ||
112 | chrpath \ | 111 | chrpath \ |
113 | cpio \ | 112 | cpio \ |
114 | curl \ | 113 | curl \ |
diff --git a/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb b/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb deleted file mode 100644 index 87fa8eb605..0000000000 --- a/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | require recipes-extended/chkconfig/chkconfig_1.3.58.bb | ||
2 | |||
3 | SUMMARY = "${SUMMARY_chkconfig-alternatives}" | ||
4 | DESCRIPTION = "${DESCRIPTION_chkconfig-alternatives}" | ||
5 | DEPENDS = "" | ||
6 | PROVIDES += "virtual/update-alternatives-native" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
8 | |||
9 | # The sysroot branch is 1.3.59 + some git commits from master + --sysroot | ||
10 | # support for alternatives. | ||
11 | SRC_URI = "git://github.com/kergoth/chkconfig;branch=sysroot" | ||
12 | S = "${WORKDIR}/git" | ||
13 | UPSTREAM_CHECK_GITTAGREGEX = "chkconfig-(?P<pver>(\d+(\.\d+)+))" | ||
14 | |||
15 | SRCREV = "cd437ecbd8986c894442f8fce1e0061e20f04dee" | ||
16 | PV = "1.3.59+${SRCPV}" | ||
17 | |||
18 | inherit native | ||
19 | |||
20 | # We want our native recipes to build using the target paths rather than paths | ||
21 | # into the sysroot, as we may use them to construct the rootfs. As such, we | ||
22 | # only adjust the paths to match the metadata for the target, not native. | ||
23 | obey_variables () { | ||
24 | sed -i 's,ALTERNATIVES_ROOT,OPKG_OFFLINE_ROOT,' ${S}/alternatives.c | ||
25 | } | ||
26 | |||
27 | do_compile () { | ||
28 | oe_runmake alternatives | ||
29 | } | ||
30 | |||
31 | do_install () { | ||
32 | install -d ${D}${sysconfdir}/alternatives \ | ||
33 | ${D}${localstatedir}/lib/alternatives | ||
34 | |||
35 | install -D -m 0755 alternatives ${D}${bindir}/alternatives | ||
36 | install -D -m 0644 alternatives.8 ${D}${mandir}/man8/alternatives.8 | ||
37 | |||
38 | ln -s alternatives ${D}${bindir}/update-alternatives | ||
39 | ln -s alternatives.8 ${D}${mandir}/man8/update-alternatives.8 | ||
40 | } | ||
41 | |||
42 | do_install_append_linuxstdbase() { | ||
43 | rm -rf ${D}${libdir}/lsb | ||
44 | } | ||
diff --git a/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch b/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch deleted file mode 100644 index 96d1938791..0000000000 --- a/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | caddr_t is a legacy BSD type which was rejected by the POSIX standard. | ||
2 | Use void * instead. | ||
3 | |||
4 | sys/unitstd.h is not needed and moreover its not available on all C library | ||
5 | implementations e.g. musl | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | Index: chkconfig-1.3.58/alternatives.c | ||
10 | =================================================================== | ||
11 | --- chkconfig-1.3.58.orig/alternatives.c | ||
12 | +++ chkconfig-1.3.58/alternatives.c | ||
13 | @@ -22,7 +22,6 @@ | ||
14 | #include <stdio.h> | ||
15 | #include <string.h> | ||
16 | #include <sys/stat.h> | ||
17 | -#include <sys/unistd.h> | ||
18 | #include <unistd.h> | ||
19 | |||
20 | #define FLAGS_TEST (1 << 0) | ||
21 | Index: chkconfig-1.3.58/leveldb.c | ||
22 | =================================================================== | ||
23 | --- chkconfig-1.3.58.orig/leveldb.c | ||
24 | +++ chkconfig-1.3.58/leveldb.c | ||
25 | @@ -442,7 +442,7 @@ int parseServiceInfo(int fd, char * name | ||
26 | fstat(fd, &sb); | ||
27 | |||
28 | bufstart = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0); | ||
29 | - if (bufstart == ((caddr_t) -1)) { | ||
30 | + if (bufstart == ((void*) -1)) { | ||
31 | close(fd); | ||
32 | return -1; | ||
33 | } | ||
diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb deleted file mode 100644 index d21dd69704..0000000000 --- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb +++ /dev/null | |||
@@ -1,71 +0,0 @@ | |||
1 | SUMMARY = "A system tool for maintaining the /etc/rc*.d hierarchy" | ||
2 | DESCRIPTION = "Chkconfig is a basic system utility. It updates and queries runlevel \ | ||
3 | information for system services. Chkconfig manipulates the numerous \ | ||
4 | symbolic links in /etc/rc.d, to relieve system administrators of some \ | ||
5 | of the drudgery of manually editing the symbolic links." | ||
6 | |||
7 | RECIPE_NO_UPDATE_REASON = "Version 1.5 requires selinux" | ||
8 | |||
9 | HOMEPAGE = "https://github.com/fedora-sysv" | ||
10 | |||
11 | LICENSE = "GPLv2" | ||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" | ||
13 | |||
14 | DEPENDS = "libnewt popt" | ||
15 | PROVIDES += "virtual/update-alternatives" | ||
16 | |||
17 | PR = "r7" | ||
18 | |||
19 | S = "${WORKDIR}/${BPN}-${BPN}-${PV}" | ||
20 | |||
21 | SRC_URI = "git://github.com/fedora-sysv/chkconfig.git \ | ||
22 | file://replace_caddr_t.patch \ | ||
23 | " | ||
24 | |||
25 | SRCREV = "3e0b3909ff6328d232b27b9c32f1a9309c6cd0a4" | ||
26 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" | ||
27 | |||
28 | S = "${WORKDIR}/git" | ||
29 | |||
30 | inherit gettext | ||
31 | |||
32 | # Makefile uses RPM_OPT_FLAGS to construct CFLAGS | ||
33 | # | ||
34 | EXTRA_OEMAKE = "\ | ||
35 | 'RPM_OPT_FLAGS=${CFLAGS}' \ | ||
36 | 'LDFLAGS=${LDFLAGS}' \ | ||
37 | 'BINDIR=${base_sbindir}' \ | ||
38 | 'SBINDIR=${sbindir}' \ | ||
39 | 'MANDIR=${mandir}' \ | ||
40 | 'ALTDIR=${localstatedir}/lib/alternatives' \ | ||
41 | 'ALTDATADIR=${sysconfdir}/alternatives' \ | ||
42 | " | ||
43 | |||
44 | do_unpack[postfuncs] += "obey_variables" | ||
45 | do_unpack[vardeps] += "obey_variables" | ||
46 | obey_variables () { | ||
47 | sed -i -e 's,/etc,${sysconfdir},; s,/lib/systemd,${base_libdir}/systemd,' ${S}/leveldb.h | ||
48 | sed -i -e 's,/etc/alternatives,${sysconfdir}/alternatives,' \ | ||
49 | -e 's,/var/lib/alternatives,${localstatedir}/lib/alternatives,' \ | ||
50 | -e 's,/usr/share/locale,${datadir}/locale,' ${S}/alternatives.c | ||
51 | } | ||
52 | |||
53 | do_install() { | ||
54 | oe_runmake 'DESTDIR=${D}' 'INSTALLNLSDIR=${D}${datadir}/locale' \ | ||
55 | 'BINDIR=${sbindir}' install | ||
56 | install -d ${D}${sysconfdir}/chkconfig.d | ||
57 | } | ||
58 | |||
59 | PACKAGES =+ "${PN}-alternatives ${PN}-alternatives-doc" | ||
60 | SUMMARY_${PN}-alternatives = "Maintain symbolic links determining default commands" | ||
61 | DESCRIPTION_${PN}-alternatives = "alternatives creates, removes, maintains and displays \ | ||
62 | information about the symbolic links comprising the alternatives system." | ||
63 | SUMMARY_${PN}-alternatives-doc = "${SUMMARY_${PN}-alternatives} - Documentation files" | ||
64 | DESCRIPTION_${PN}-alternatives-doc = "${DESCRIPTION_${PN}-alternatives} \ | ||
65 | This package contains documentation." | ||
66 | RPROVIDES_${PN}-alternatives += "update-alternatives" | ||
67 | RCONFLICTS_${PN}-alternatives = "update-alternatives-opkg update-alternatives-dpkg" | ||
68 | FILES_${PN}-alternatives = "${sbindir}/alternatives ${sbindir}/update-alternatives \ | ||
69 | ${sysconfdir}/alternatives ${localstatedir}/lib/alternatives" | ||
70 | FILES_${PN}-alternatives-doc = "${mandir}/man8/alternatives.8 \ | ||
71 | ${mandir}/man8/update-alternatives.8" | ||