[OE-core] [PATCH 3/3] chkconfig: remove the recipe
Khem Raj
raj.khem at gmail.com
Sat Feb 8 23:00:56 UTC 2020
On Sat, Feb 8, 2020 at 12:41 PM akuster808 <akuster808 at gmail.com> wrote:
>
>
> On 2/8/20 11:01 AM, Khem Raj wrote:
> > On Fri, Feb 7, 2020 at 11:47 AM Alexander Kanavin
> > <alex.kanavin at gmail.com> wrote:
> >> 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.
> >>
> > there are recipes in other layers depending on it. e.g. see
> >
> > 09:40:46 ERROR: Nothing RPROVIDES 'chkconfig' (but
> >
> /mnt/jenkins/workspace/Yocto-world-clang/sources/meta-openembedded/meta-oe/recipes-graphics/tigervnc/
> tigervnc_1.10.1.bb
> > RDEPENDS on or otherwise requires it)
> > 09:40:48 ERROR: Nothing RPROVIDES 'tigervnc-dev' (but
> >
> /mnt/jenkins/workspace/Yocto-world-clang/sources/meta-openembedded/meta-oe/recipes-graphics/tigervnc/
> tigervnc_1.10.1.bb
> > RDEPENDS on or otherwise requires it)
> > 09:40:48 No eligible RPROVIDERs exist for 'tigervnc-dev'
>
> Should it move to meta-oe then?
I would prefer to remove the dep instead
>
> >
> >
> >> [YOCTO #11264]
> >>
> >> Signed-off-by: Alexander Kanavin <alex.kanavin at gmail.com>
> >> ---
> >> meta/conf/distro/include/maintainers.inc | 2 -
> >> .../packagegroups/packagegroup-self-hosted.bb | 1 -
> >> .../chkconfig-alternatives-native_1.3.59.bb | 44 ------------
> >> .../chkconfig/chkconfig/replace_caddr_t.patch | 33 ---------
> >> .../chkconfig/chkconfig_1.3.58.bb | 71 -------------------
> >> 5 files changed, 151 deletions(-)
> >> delete mode 100644 meta/recipes-extended/chkconfig/
> chkconfig-alternatives-native_1.3.59.bb
> >> delete mode 100644
> meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch
> >> delete mode 100644 meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
> >>
> >> 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 at intel.com>"
> >> RECIPE_MAINTAINER_pn-cantarell-fonts = "Alexander Kanavin <
> alex.kanavin at gmail.com>"
> >> RECIPE_MAINTAINER_pn-ccache = "Robert Yang <liezhi.yang at windriver.com
> >"
> >> RECIPE_MAINTAINER_pn-cdrtools-native = "Yi Zhao <yi.zhao at windriver.com
> >"
> >> -RECIPE_MAINTAINER_pn-chkconfig = "Yi Zhao <yi.zhao at windriver.com>"
> >> -RECIPE_MAINTAINER_pn-chkconfig-alternatives-native = "Yi Zhao <
> yi.zhao at windriver.com>"
> >> RECIPE_MAINTAINER_pn-chrpath = "Yi Zhao <yi.zhao at windriver.com>"
> >> RECIPE_MAINTAINER_pn-clutter-1.0 = "Ross Burton <ross.burton at intel.com
> >"
> >> RECIPE_MAINTAINER_pn-clutter-gst-3.0 = "Ross Burton <
> ross.burton at 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 = " \
> >>
> >> RDEPENDS_packagegroup-self-hosted-extended = "\
> >> bzip2 \
> >> - chkconfig \
> >> chrpath \
> >> cpio \
> >> 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 @@
> >> -require recipes-extended/chkconfig/chkconfig_1.3.58.bb
> >> -
> >> -SUMMARY = "${SUMMARY_chkconfig-alternatives}"
> >> -DESCRIPTION = "${DESCRIPTION_chkconfig-alternatives}"
> >> -DEPENDS = ""
> >> -PROVIDES += "virtual/update-alternatives-native"
> >> -LIC_FILES_CHKSUM =
> "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> >> -
> >> -# The sysroot branch is 1.3.59 + some git commits from master +
> --sysroot
> >> -# support for alternatives.
> >> -SRC_URI = "git://github.com/kergoth/chkconfig;branch=sysroot"
> >> -S = "${WORKDIR}/git"
> >> -UPSTREAM_CHECK_GITTAGREGEX = "chkconfig-(?P<pver>(\d+(\.\d+)+))"
> >> -
> >> -SRCREV = "cd437ecbd8986c894442f8fce1e0061e20f04dee"
> >> -PV = "1.3.59+${SRCPV}"
> >> -
> >> -inherit native
> >> -
> >> -# We want our native recipes to build using the target paths rather
> than paths
> >> -# into the sysroot, as we may use them to construct the rootfs. As
> such, we
> >> -# only adjust the paths to match the metadata for the target, not
> native.
> >> -obey_variables () {
> >> - sed -i 's,ALTERNATIVES_ROOT,OPKG_OFFLINE_ROOT,'
> ${S}/alternatives.c
> >> -}
> >> -
> >> -do_compile () {
> >> - oe_runmake alternatives
> >> -}
> >> -
> >> -do_install () {
> >> - install -d ${D}${sysconfdir}/alternatives \
> >> - ${D}${localstatedir}/lib/alternatives
> >> -
> >> - install -D -m 0755 alternatives ${D}${bindir}/alternatives
> >> - install -D -m 0644 alternatives.8
> ${D}${mandir}/man8/alternatives.8
> >> -
> >> - ln -s alternatives ${D}${bindir}/update-alternatives
> >> - ln -s alternatives.8 ${D}${mandir}/man8/update-alternatives.8
> >> -}
> >> -
> >> -do_install_append_linuxstdbase() {
> >> - rm -rf ${D}${libdir}/lsb
> >> -}
> >> 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 @@
> >> -caddr_t is a legacy BSD type which was rejected by the POSIX standard.
> >> -Use void * instead.
> >> -
> >> -sys/unitstd.h is not needed and moreover its not available on all C
> library
> >> -implementations e.g. musl
> >> -
> >> -Upstream-Status: Pending
> >> -Signed-off-by: Khem Raj <raj.khem at gmail.com>
> >> -Index: chkconfig-1.3.58/alternatives.c
> >> -===================================================================
> >> ---- chkconfig-1.3.58.orig/alternatives.c
> >> -+++ chkconfig-1.3.58/alternatives.c
> >> -@@ -22,7 +22,6 @@
> >> - #include <stdio.h>
> >> - #include <string.h>
> >> - #include <sys/stat.h>
> >> --#include <sys/unistd.h>
> >> - #include <unistd.h>
> >> -
> >> - #define FLAGS_TEST (1 << 0)
> >> -Index: chkconfig-1.3.58/leveldb.c
> >> -===================================================================
> >> ---- chkconfig-1.3.58.orig/leveldb.c
> >> -+++ chkconfig-1.3.58/leveldb.c
> >> -@@ -442,7 +442,7 @@ int parseServiceInfo(int fd, char * name
> >> - fstat(fd, &sb);
> >> -
> >> - bufstart = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
> >> -- if (bufstart == ((caddr_t) -1)) {
> >> -+ if (bufstart == ((void*) -1)) {
> >> - close(fd);
> >> - return -1;
> >> - }
> >> 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 @@
> >> -SUMMARY = "A system tool for maintaining the /etc/rc*.d hierarchy"
> >> -DESCRIPTION = "Chkconfig is a basic system utility. It updates and
> queries runlevel \
> >> -information for system services. Chkconfig manipulates the numerous \
> >> -symbolic links in /etc/rc.d, to relieve system administrators of some \
> >> -of the drudgery of manually editing the symbolic links."
> >> -
> >> -RECIPE_NO_UPDATE_REASON = "Version 1.5 requires selinux"
> >> -
> >> -HOMEPAGE = "https://github.com/fedora-sysv"
> >> -
> >> -LICENSE = "GPLv2"
> >> -LIC_FILES_CHKSUM =
> "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018"
> >> -
> >> -DEPENDS = "libnewt popt"
> >> -PROVIDES += "virtual/update-alternatives"
> >> -
> >> -PR = "r7"
> >> -
> >> -S = "${WORKDIR}/${BPN}-${BPN}-${PV}"
> >> -
> >> -SRC_URI = "git://github.com/fedora-sysv/chkconfig.git \
> >> - file://replace_caddr_t.patch \
> >> - "
> >> -
> >> -SRCREV = "3e0b3909ff6328d232b27b9c32f1a9309c6cd0a4"
> >> -UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
> >> -
> >> -S = "${WORKDIR}/git"
> >> -
> >> -inherit gettext
> >> -
> >> -# Makefile uses RPM_OPT_FLAGS to construct CFLAGS
> >> -#
> >> -EXTRA_OEMAKE = "\
> >> - 'RPM_OPT_FLAGS=${CFLAGS}' \
> >> - 'LDFLAGS=${LDFLAGS}' \
> >> - 'BINDIR=${base_sbindir}' \
> >> - 'SBINDIR=${sbindir}' \
> >> - 'MANDIR=${mandir}' \
> >> - 'ALTDIR=${localstatedir}/lib/alternatives' \
> >> - 'ALTDATADIR=${sysconfdir}/alternatives' \
> >> -"
> >> -
> >> -do_unpack[postfuncs] += "obey_variables"
> >> -do_unpack[vardeps] += "obey_variables"
> >> -obey_variables () {
> >> - sed -i -e 's,/etc,${sysconfdir},;
> s,/lib/systemd,${base_libdir}/systemd,' ${S}/leveldb.h
> >> - sed -i -e 's,/etc/alternatives,${sysconfdir}/alternatives,' \
> >> - -e
> 's,/var/lib/alternatives,${localstatedir}/lib/alternatives,' \
> >> - -e 's,/usr/share/locale,${datadir}/locale,'
> ${S}/alternatives.c
> >> -}
> >> -
> >> -do_install() {
> >> - oe_runmake 'DESTDIR=${D}' 'INSTALLNLSDIR=${D}${datadir}/locale'
> \
> >> - 'BINDIR=${sbindir}' install
> >> - install -d ${D}${sysconfdir}/chkconfig.d
> >> -}
> >> -
> >> -PACKAGES =+ "${PN}-alternatives ${PN}-alternatives-doc"
> >> -SUMMARY_${PN}-alternatives = "Maintain symbolic links determining
> default commands"
> >> -DESCRIPTION_${PN}-alternatives = "alternatives creates, removes,
> maintains and displays \
> >> -information about the symbolic links comprising the alternatives
> system."
> >> -SUMMARY_${PN}-alternatives-doc = "${SUMMARY_${PN}-alternatives} -
> Documentation files"
> >> -DESCRIPTION_${PN}-alternatives-doc =
> "${DESCRIPTION_${PN}-alternatives} \
> >> -This package contains documentation."
> >> -RPROVIDES_${PN}-alternatives += "update-alternatives"
> >> -RCONFLICTS_${PN}-alternatives = "update-alternatives-opkg
> update-alternatives-dpkg"
> >> -FILES_${PN}-alternatives = "${sbindir}/alternatives
> ${sbindir}/update-alternatives \
> >> - ${sysconfdir}/alternatives
> ${localstatedir}/lib/alternatives"
> >> -FILES_${PN}-alternatives-doc = "${mandir}/man8/alternatives.8 \
> >> - ${mandir}/man8/update-alternatives.8"
> >> --
> >> 2.25.0
> >>
> >> --
> >> _______________________________________________
> >> Openembedded-core mailing list
> >> Openembedded-core at lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20200208/c539fc29/attachment-0001.html>
More information about the Openembedded-core
mailing list