* [PATCH 1/3] core-image-sato-sdk-ptest: do not pull in ptest-pkgs
@ 2020-02-07 19:45 Alexander Kanavin
2020-02-07 19:45 ` [PATCH 2/3] xserver-xorg: upgrade 1.20.6 -> 1.20.7 Alexander Kanavin
2020-02-07 19:45 ` [PATCH 3/3] chkconfig: remove the recipe Alexander Kanavin
0 siblings, 2 replies; 6+ messages in thread
From: Alexander Kanavin @ 2020-02-07 19:45 UTC (permalink / raw)
To: openembedded-core
The lists of ptests are defined via PTESTS_FAST and PTESTS_SLOW;
specifying 'ptests-pkgs' also pulls in additional ptests that
are specifically excluded from those lists due to causing issues with
ptesting. (particularly bash-ptest is one such item)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/recipes-sato/images/core-image-sato-sdk-ptest.bb | 2 --
1 file changed, 2 deletions(-)
diff --git a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb
index 85b5adbc69..58c257c49f 100644
--- a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb
+++ b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb
@@ -3,8 +3,6 @@ require conf/distro/include/ptest-packagelists.inc
DESCRIPTION += "Also includes ptest packages."
-IMAGE_FEATURES += "ptest-pkgs"
-
PROVIDES += "core-image-sato-ptest"
# Also include ptests which may not otherwise be included in a sato image
--
2.25.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] xserver-xorg: upgrade 1.20.6 -> 1.20.7
2020-02-07 19:45 [PATCH 1/3] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
@ 2020-02-07 19:45 ` Alexander Kanavin
2020-02-07 19:45 ` [PATCH 3/3] chkconfig: remove the recipe Alexander Kanavin
1 sibling, 0 replies; 6+ messages in thread
From: Alexander Kanavin @ 2020-02-07 19:45 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...e_display.c-add-missing-mi.h-include.patch | 23 +++++++++++++++++++
...-xorg_1.20.6.bb => xserver-xorg_1.20.7.bb} | 13 ++++++-----
2 files changed, 30 insertions(+), 6 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.6.bb => xserver-xorg_1.20.7.bb} (71%)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch
new file mode 100644
index 0000000000..4b8e43f1e4
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch
@@ -0,0 +1,23 @@
+From 84338444179cab7ede1252a11b66e3b8f657e6a4 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Fri, 7 Feb 2020 20:36:45 +0100
+Subject: [PATCH] drmmode_display.c: add missing mi.h include
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ hw/xfree86/drivers/modesetting/drmmode_display.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
+index e18cc37..3445cce 100644
+--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
++++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
+@@ -46,6 +46,7 @@
+ #include "xf86Crtc.h"
+ #include "drmmode_display.h"
+ #include "present.h"
++#include "mi.h"
+
+ #include <cursorstr.h>
+
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb
similarity index 71%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb
index a1cd490394..998b98a76c 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb
@@ -1,12 +1,13 @@
require xserver-xorg.inc
SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
- file://pkgconfig.patch \
- file://0001-test-xtest-Initialize-array-with-braces.patch \
- file://sdksyms-no-build-path.patch \
- "
-SRC_URI[md5sum] = "a98170084f2c8fed480d2ff601f8a14b"
-SRC_URI[sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1"
+ file://pkgconfig.patch \
+ file://0001-test-xtest-Initialize-array-with-braces.patch \
+ file://sdksyms-no-build-path.patch \
+ file://0001-drmmode_display.c-add-missing-mi.h-include.patch \
+ "
+SRC_URI[md5sum] = "d2e96355ad47244c675bce38db2b48a9"
+SRC_URI[sha256sum] = "bd5986f010f34f5b3d6bc99fe395ecb1e0dead15a26807e0c832701809a06ea1"
CFLAGS += "-fcommon"
--
2.25.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] chkconfig: remove the recipe
2020-02-07 19:45 [PATCH 1/3] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
2020-02-07 19:45 ` [PATCH 2/3] xserver-xorg: upgrade 1.20.6 -> 1.20.7 Alexander Kanavin
@ 2020-02-07 19:45 ` Alexander Kanavin
2020-02-08 19:01 ` Khem Raj
1 sibling, 1 reply; 6+ messages in thread
From: Alexander Kanavin @ 2020-02-07 19:45 UTC (permalink / raw)
To: openembedded-core
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]
Signed-off-by: Alexander Kanavin <alex.kanavin@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@intel.com>"
RECIPE_MAINTAINER_pn-cantarell-fonts = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER_pn-ccache = "Robert Yang <liezhi.yang@windriver.com>"
RECIPE_MAINTAINER_pn-cdrtools-native = "Yi Zhao <yi.zhao@windriver.com>"
-RECIPE_MAINTAINER_pn-chkconfig = "Yi Zhao <yi.zhao@windriver.com>"
-RECIPE_MAINTAINER_pn-chkconfig-alternatives-native = "Yi Zhao <yi.zhao@windriver.com>"
RECIPE_MAINTAINER_pn-chrpath = "Yi Zhao <yi.zhao@windriver.com>"
RECIPE_MAINTAINER_pn-clutter-1.0 = "Ross Burton <ross.burton@intel.com>"
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 = " \
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@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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] chkconfig: remove the recipe
2020-02-07 19:45 ` [PATCH 3/3] chkconfig: remove the recipe Alexander Kanavin
@ 2020-02-08 19:01 ` Khem Raj
2020-02-08 20:41 ` akuster808
0 siblings, 1 reply; 6+ messages in thread
From: Khem Raj @ 2020-02-08 19:01 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: Patches and discussions about the oe-core layer
On Fri, Feb 7, 2020 at 11:47 AM Alexander Kanavin
<alex.kanavin@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'
> [YOCTO #11264]
>
> Signed-off-by: Alexander Kanavin <alex.kanavin@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@intel.com>"
> RECIPE_MAINTAINER_pn-cantarell-fonts = "Alexander Kanavin <alex.kanavin@gmail.com>"
> RECIPE_MAINTAINER_pn-ccache = "Robert Yang <liezhi.yang@windriver.com>"
> RECIPE_MAINTAINER_pn-cdrtools-native = "Yi Zhao <yi.zhao@windriver.com>"
> -RECIPE_MAINTAINER_pn-chkconfig = "Yi Zhao <yi.zhao@windriver.com>"
> -RECIPE_MAINTAINER_pn-chkconfig-alternatives-native = "Yi Zhao <yi.zhao@windriver.com>"
> RECIPE_MAINTAINER_pn-chrpath = "Yi Zhao <yi.zhao@windriver.com>"
> RECIPE_MAINTAINER_pn-clutter-1.0 = "Ross Burton <ross.burton@intel.com>"
> 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 = " \
>
> 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@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@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] chkconfig: remove the recipe
2020-02-08 19:01 ` Khem Raj
@ 2020-02-08 20:41 ` akuster808
2020-02-08 23:00 ` Khem Raj
0 siblings, 1 reply; 6+ messages in thread
From: akuster808 @ 2020-02-08 20:41 UTC (permalink / raw)
To: Khem Raj, Alexander Kanavin
Cc: Patches and discussions about the oe-core layer
On 2/8/20 11:01 AM, Khem Raj wrote:
> On Fri, Feb 7, 2020 at 11:47 AM Alexander Kanavin
> <alex.kanavin@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?
>
>
>> [YOCTO #11264]
>>
>> Signed-off-by: Alexander Kanavin <alex.kanavin@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@intel.com>"
>> RECIPE_MAINTAINER_pn-cantarell-fonts = "Alexander Kanavin <alex.kanavin@gmail.com>"
>> RECIPE_MAINTAINER_pn-ccache = "Robert Yang <liezhi.yang@windriver.com>"
>> RECIPE_MAINTAINER_pn-cdrtools-native = "Yi Zhao <yi.zhao@windriver.com>"
>> -RECIPE_MAINTAINER_pn-chkconfig = "Yi Zhao <yi.zhao@windriver.com>"
>> -RECIPE_MAINTAINER_pn-chkconfig-alternatives-native = "Yi Zhao <yi.zhao@windriver.com>"
>> RECIPE_MAINTAINER_pn-chrpath = "Yi Zhao <yi.zhao@windriver.com>"
>> RECIPE_MAINTAINER_pn-clutter-1.0 = "Ross Burton <ross.burton@intel.com>"
>> 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 = " \
>>
>> 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@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@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] chkconfig: remove the recipe
2020-02-08 20:41 ` akuster808
@ 2020-02-08 23:00 ` Khem Raj
0 siblings, 0 replies; 6+ messages in thread
From: Khem Raj @ 2020-02-08 23:00 UTC (permalink / raw)
To: akuster808; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 11246 bytes --]
On Sat, Feb 8, 2020 at 12:41 PM akuster808 <akuster808@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@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@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@intel.com>"
> >> RECIPE_MAINTAINER_pn-cantarell-fonts = "Alexander Kanavin <
> alex.kanavin@gmail.com>"
> >> RECIPE_MAINTAINER_pn-ccache = "Robert Yang <liezhi.yang@windriver.com
> >"
> >> RECIPE_MAINTAINER_pn-cdrtools-native = "Yi Zhao <yi.zhao@windriver.com
> >"
> >> -RECIPE_MAINTAINER_pn-chkconfig = "Yi Zhao <yi.zhao@windriver.com>"
> >> -RECIPE_MAINTAINER_pn-chkconfig-alternatives-native = "Yi Zhao <
> yi.zhao@windriver.com>"
> >> RECIPE_MAINTAINER_pn-chrpath = "Yi Zhao <yi.zhao@windriver.com>"
> >> RECIPE_MAINTAINER_pn-clutter-1.0 = "Ross Burton <ross.burton@intel.com
> >"
> >> 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 = " \
> >>
> >> 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@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@lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
[-- Attachment #2: Type: text/html, Size: 16919 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-02-08 23:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-07 19:45 [PATCH 1/3] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
2020-02-07 19:45 ` [PATCH 2/3] xserver-xorg: upgrade 1.20.6 -> 1.20.7 Alexander Kanavin
2020-02-07 19:45 ` [PATCH 3/3] chkconfig: remove the recipe Alexander Kanavin
2020-02-08 19:01 ` Khem Raj
2020-02-08 20:41 ` akuster808
2020-02-08 23:00 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.