vim: Import version 8.1.0347
PATCH v3 1/4 vim: Import version 8.1.0347
In order to have a stand-alone editor in oe-core, bring in vim from meta-openembedded/meta-oe. This imports the recipes as of git commit:
commit 41f3f8165bde3eb4f8bcf6dddbaca0d3b760c70b
Author: Mark Hatle <[email protected]> Date: Thu Feb 28 09:39:19 2019 +0800
vim: remove xfce vim bbappend
Changing the behavior of a recipe by including a layer is not allowed by the yocto-check-layer script.
--
Changes in v3:
- Catch vim-tiny too (thanks Richard!)
Changes in v2:
- List self as maintainer
--- meta/conf/distro/include/maintainers.inc | 2 + meta/files/common-licenses/vim | 81 +++++++++++++ ...0001-src-Makefile-improve-reproducibility.patch | 46 ++++++++ .../vim/files/disable_acl_header_check.patch | 39 +++++++ .../vim-add-knob-whether-elf.h-are-checked.patch | 42 +++++++ meta/recipes-support/vim/vim-tiny_8.1.0347.bb | 15 +++ meta/recipes-support/vim/vim_8.1.0347.bb | 129 +++++++++++++++++++++ 7 files changed, 354 insertions(+) create mode 100644 meta/files/common-licenses/vim create mode 100644 meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch create mode 100644 meta/recipes-support/vim/files/disable_acl_header_check.patch create mode 100644 meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch create mode 100644 meta/recipes-support/vim/vim-tiny_8.1.0347.bb create mode 100644 meta/recipes-support/vim/vim_8.1.0347.bb
meta/conf/distro/include/maintainers.inc +2 -0
@@ -702,6 +702,8 @@ RECIPE_MAINTAINER_pn-util-macros = "Armin Kuster <[email protected]>" RECIPE_MAINTAINER_pn-v86d = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-vala = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-valgrind = "Alexander Kanavin <[email protected]>" +RECIPE_MAINTAINER_pn-vim = "Tom Rini <[email protected]>" +RECIPE_MAINTAINER_pn-vim-tiny = "Tom Rini <[email protected]>" RECIPE_MAINTAINER_pn-virglrenderer = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-volatile-binds = "Chen Qi <[email protected]>" RECIPE_MAINTAINER_pn-vte = "Anuj Mittal <[email protected]>"
meta/files/common-licenses/vim new file +81 -0
81 lines not on this page · raw message
meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch new file +46 -0
46 lines not on this page · raw message
meta/recipes-support/vim/files/disable_acl_header_check.patch new file +39 -0
@@ -0,0 +1,39 @@ +From 5ed25c076a1fb1889a3c50dddf29f21850b59a13 Mon Sep 17 00:00:00 2001 +From: Wenzong Fan <[email protected]> +Date: Tue, 26 Jun 2018 17:29:09 +0800 +Subject: [PATCH] disable acl header check + +Don't check 'sys/acl.h' if acl support disabled for vim/vim-tiny. + +Upstream-Status: pending + +Signed-off-by: Wenzong Fan <[email protected]> +Signed-off-by: Changqing Li <[email protected]> +--- + src/configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/configure.ac b/src/configure.ac +index 107c170..0ee86ad 100644 +--- a/src/configure.ac ++++ b/src/configure.ac +@@ -3220,7 +3220,7 @@ AC_CHECK_HEADERS(stdint.h stdlib.h string.h \ + sys/systeminfo.h locale.h sys/stream.h termios.h \ + libc.h sys/statfs.h poll.h sys/poll.h pwd.h \ + utime.h sys/param.h libintl.h libgen.h \ +- util/debug.h util/msg18n.h frame.h sys/acl.h \ ++ util/debug.h util/msg18n.h frame.h \ + sys/access.h sys/sysinfo.h wchar.h wctype.h) + + dnl sys/ptem.h depends on sys/stream.h on Solaris +@@ -3848,6 +3848,7 @@ AC_ARG_ENABLE(acl, + , [enable_acl="yes"]) + if test "$enable_acl" = "yes"; then + AC_MSG_RESULT(no) ++ AC_CHECK_HEADERS(sys/acl.h) + AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"], + AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl" + AC_CHECK_LIB(attr, fgetxattr, LIBS="$LIBS -lattr",,)],,),) +-- +2.7.4 +
meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch new file +42 -0
42 lines not on this page · raw message
meta/recipes-support/vim/vim-tiny_8.1.0347.bb new file +15 -0
@@ -0,0 +1,15 @@ +require vim_${PV}.bb + +SUMMARY += " (with tiny features)" + +PROVIDES_remove = "xxd" +ALTERNATIVE_${PN}_remove = "xxd" + +PACKAGECONFIG += "tiny" + +do_install() { + install -D -m 0755 ${S}/vim ${D}/${bindir}/vim.tiny +} + +ALTERNATIVE_PRIORITY = "90" +ALTERNATIVE_TARGET = "${bindir}/vim.tiny"
meta/recipes-support/vim/vim_8.1.0347.bb new file +129 -0
129 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v3 2/4 inetutils: Import version 1.9.4
In order to have more robust stand-alone network tools in oe-core, bring in inetutils from meta-openembedded/meta-networking. This imports the recipes as of git commit:
commit 408204073e6bdcd8ac586e05d5b75213417673f2
Author: Martin Jansa <[email protected]> Date: Thu Aug 16 20:39:15 2018 +0000
inetutils: fix build with glibc-2.28
---
Changes in v2:
- Fix wording (thanks André!)
- Add self as maintainer
--- meta/conf/distro/include/maintainers.inc | 1 + .../0001-rcp-fix-to-work-with-large-files.patch | 31 ++++ .../inetutils/inetutils/fix-disable-ipv6.patch | 83 +++++++++ ...tf-parse-pull-in-features.h-for-__GLIBC__.patch | 29 +++ .../inetutils/inetutils-1.8-0003-wchar.patch | 14 ++ .../inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch | 26 +++ ...ls-only-check-pam_appl.h-when-pam-enabled.patch | 40 ++++ .../inetutils/inetutils/rexec.xinetd.inetutils | 20 ++ .../inetutils/inetutils/rlogin.xinetd.inetutils | 23 +++ .../inetutils/inetutils/rsh.xinetd.inetutils | 21 +++ .../inetutils/inetutils/telnet.xinetd.inetutils | 13 ++ .../inetutils/inetutils/tftpd.xinetd.inetutils | 19 ++ .../inetutils/inetutils/version.patch | 17 ++ .../inetutils/inetutils_1.9.4.bb | 206 +++++++++++++++++++++ 14 files changed, 543 insertions(+) create mode 100644 meta/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch create mode 100644 meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch create mode 100644 meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch create mode 100644 meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch create mode 100644 meta/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch create mode 100644 meta/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch create mode 100644 meta/recipes-connectivity/inetutils/inetutils/rexec.xinetd.inetutils create mode 100644 meta/recipes-connectivity/inetutils/inetutils/rlogin.xinetd.inetutils create mode 100644 meta/recipes-connectivity/inetutils/inetutils/rsh.xinetd.inetutils create mode 100644 meta/recipes-connectivity/inetutils/inetutils/telnet.xinetd.inetutils create mode 100644 meta/recipes-connectivity/inetutils/inetutils/tftpd.xinetd.inetutils create mode 100644 meta/recipes-connectivity/inetutils/inetutils/version.patch create mode 100644 meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb
meta/conf/distro/include/maintainers.inc +1 -0
@@ -269,6 +269,7 @@ RECIPE_MAINTAINER_pn-i2c-tools = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER_pn-icecc-create-env = "Joshua Watt <[email protected]>" RECIPE_MAINTAINER_pn-icu = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-ifupdown = "Anuj Mittal <[email protected]>" +RECIPE_MAINTAINER_pn-inetutils = "Tom Rini <[email protected]>" RECIPE_MAINTAINER_pn-init-ifupdown = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER_pn-initramfs-boot = "Otavio Salvador <[email protected]>" RECIPE_MAINTAINER_pn-initramfs-framework = "Otavio Salvador <[email protected]>"
meta/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch new file +31 -0
@@ -0,0 +1,31 @@ +Upstream-Status: Pending + +Subject: rcp: fix to work with large files + +When we copy file by rcp command, if the file > 2GB, it will fail. +The cause is that it used incorrect data type on file size in sink() of rcp. + +Signed-off-by: Chen Qi <[email protected]> +--- + src/rcp.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/rcp.c b/src/rcp.c +index 21f55b6..bafa35f 100644 +--- a/src/rcp.c ++++ b/src/rcp.c +@@ -876,9 +876,9 @@ sink (int argc, char *argv[]) + enum + { YES, NO, DISPLAYED } wrerr; + BUF *bp; +- off_t i, j; ++ off_t i, j, size; + int amt, count, exists, first, mask, mode, ofd, omode; +- int setimes, size, targisdir, wrerrno; ++ int setimes, targisdir, wrerrno; + char ch, *cp, *np, *targ, *vect[1], buf[BUFSIZ]; + const char *why; + +-- +1.9.1 +
meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch new file +83 -0
83 lines not on this page · raw message
meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 552a7d64ad4a7188a9b7cd89933ae7caf7ebfe90 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier at gentoo.org> +Date: Thu, 18 Nov 2010 16:59:14 -0500 +Subject: [PATCH gnulib] printf-parse: pull in features.h for __GLIBC__ + +Upstream-Status: Pending + +Signed-off-by: Mike Frysinger <vapier at gentoo.org> +--- + lib/printf-parse.h | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/lib/printf-parse.h b/lib/printf-parse.h +index 67a4a2a..3bd6152 100644 +--- a/lib/printf-parse.h ++++ b/lib/printf-parse.h +@@ -25,6 +25,9 @@ + + #include "printf-args.h" + ++#ifdef HAVE_FEATURES_H ++# include <features.h> /* for __GLIBC__ */ ++#endif + + /* Flags */ + #define FLAG_GROUP 1 /* ' flag */ +-- +1.7.3.2 +
meta/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch new file +14 -0
@@ -0,0 +1,14 @@ +Upstream-Status: Pending + +--- inetutils-1.8/lib/wchar.in.h ++++ inetutils-1.8/lib/wchar.in.h +@@ -70,6 +70,9 @@ + /* The include_next requires a split double-inclusion guard. */ + #if @HAVE_WCHAR_H@ + # @INCLUDE_NEXT@ @NEXT_WCHAR_H@ ++#else ++# include <stddef.h> ++# define MB_CUR_MAX 1 + #endif + + #undef _GL_ALREADY_INCLUDING_WCHAR_H
meta/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch new file +26 -0
@@ -0,0 +1,26 @@ +inetutils: define PATH_PROCNET_DEV if not already defined + +this prevents the following compilation error : +system/linux.c:401:15: error: 'PATH_PROCNET_DEV' undeclared (first use in this function) + +this patch comes from : + http://repository.timesys.com/buildsources/i/inetutils/inetutils-1.9/ + +Upstream-Status: Inappropriate [not author] + +Signed-of-by: Eric Bénard <[email protected]> +--- +diff -Naur inetutils-1.9.orig/ifconfig/system/linux.c inetutils-1.9/ifconfig/system/linux.c +--- inetutils-1.9.orig/ifconfig/system/linux.c 2012-01-04 16:31:36.000000000 -0500 ++++ inetutils-1.9/ifconfig/system/linux.c 2012-01-04 16:40:53.000000000 -0500 +@@ -49,6 +49,10 @@ + #include "../ifconfig.h" + + ++#ifndef PATH_PROCNET_DEV ++ #define PATH_PROCNET_DEV "/proc/net/dev" ++#endif ++ + /* ARPHRD stuff. */ + + static void
meta/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch new file +40 -0
@@ -0,0 +1,40 @@ +Only check security/pam_appl.h which is provided by package libpam when pam is +enabled. + +Upstream-Status: Pending + +Signed-off-by: Kai Kang <[email protected]> +--- +diff --git a/configure.ac b/configure.ac +index b35e672..e78a751 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -195,6 +195,19 @@ fi + + # See if we have libpam.a. Investigate PAM versus Linux-PAM. + if test "$with_pam" = yes ; then ++ AC_CHECK_HEADERS([security/pam_appl.h], [], [], [ ++#include <sys/types.h> ++#ifdef HAVE_NETINET_IN_SYSTM_H ++# include <netinet/in_systm.h> ++#endif ++#include <netinet/in.h> ++#ifdef HAVE_NETINET_IP_H ++# include <netinet/ip.h> ++#endif ++#ifdef HAVE_SYS_PARAM_H ++# include <sys/param.h> ++#endif ++]) + AC_CHECK_LIB(dl, dlopen, LIBDL=-ldl) + AC_CHECK_LIB(pam, pam_authenticate, LIBPAM=-lpam) + if test "$ac_cv_lib_pam_pam_authenticate" = yes ; then +@@ -587,7 +600,7 @@ AC_HEADER_DIRENT + AC_CHECK_HEADERS([arpa/nameser.h errno.h fcntl.h features.h \ + glob.h memory.h netinet/ether.h netinet/in_systm.h \ + netinet/ip.h netinet/ip_icmp.h netinet/ip_var.h \ +- security/pam_appl.h shadow.h \ ++ shadow.h \ + stdarg.h stdlib.h string.h stropts.h sys/tty.h \ + sys/utsname.h sys/ptyvar.h sys/msgbuf.h sys/filio.h \ + sys/ioctl_compat.h sys/cdefs.h sys/stream.h sys/mkdev.h \
meta/recipes-connectivity/inetutils/inetutils/rexec.xinetd.inetutils new file +20 -0
@@ -0,0 +1,20 @@ +# default: off +# description: +# Rexecd is the server for the rexec program. The server provides remote +# execution facilities with authentication based on user names and +# passwords. +# +service exec +{ + socket_type = stream + protocol = tcp + flags = NAMEINARGS + wait = no + user = root + group = root + log_on_success += USERID + log_on_failure += USERID + server = @SBINDIR@/tcpd + server_args = @SBINDIR@/in.rexecd + disable = yes +}
meta/recipes-connectivity/inetutils/inetutils/rlogin.xinetd.inetutils new file +23 -0
@@ -0,0 +1,23 @@ +# default: off +# description: +# Rlogind is a server for the rlogin program. The server provides remote +# execution with authentication based on privileged port numbers from trusted +# host +# +service login +{ + socket_type = stream + protocol = tcp + flags = NAMEINARGS + wait = no + user = root + group = root + log_on_success += USERID + log_on_failure += USERID + server = @SBINDIR@/tcpd + server_args = @SBINDIR@/in.rlogind -a + disable = yes +} + + +
meta/recipes-connectivity/inetutils/inetutils/rsh.xinetd.inetutils new file +21 -0
@@ -0,0 +1,21 @@ +# default: off +# description: +# The rshd server is a server for the rcmd(3) routine and, +# consequently, for the rsh(1) program. The server provides +# remote execution facilities with authentication based on +# privileged port numbers from trusted hosts. +# +service shell +{ + socket_type = stream + protocol = tcp + flags = NAMEINARGS + wait = no + user = root + group = root + log_on_success += USERID + log_on_failure += USERID + server = @SBINDIR@/tcpd + server_args = @SBINDIR@/in.rshd -aL + disable = yes +}
meta/recipes-connectivity/inetutils/inetutils/telnet.xinetd.inetutils new file +13 -0
@@ -0,0 +1,13 @@ +# default: on +# description: The telnet server serves telnet sessions; it uses \ +# unencrypted username/password pairs for authentication. +service telnet +{ + disable = no + flags = REUSE + socket_type = stream + wait = no + user = root + server = @SBINDIR@/in.telnetd + log_on_failure += USERID +}
meta/recipes-connectivity/inetutils/inetutils/tftpd.xinetd.inetutils new file +19 -0
@@ -0,0 +1,19 @@ +# default: off +# description: +# Tftpd is a server which supports the Internet Trivial File Transfer +# Pro-tocol (RFC 783). The TFTP server operates at the port indicated +# in the tftp service description; see services(5). +# +service tftp +{ + disable = yes + socket_type = dgram + protocol = udp + flags = IPv6 + wait = yes + user = root + group = root + server = @SBINDIR@/in.tftpd + server_args = /tftpboot +} +
meta/recipes-connectivity/inetutils/inetutils/version.patch new file +17 -0
@@ -0,0 +1,17 @@ +Upstream-Status: Pending + +remove m4_esyscmd function + +Signed-off-by: Chunrong Guo <[email protected]> +--- inetutils-1.9.1/configure.ac 2012-01-06 22:05:05.000000000 +0800 ++++ inetutils-1.9.1/configure.ac 2012-11-12 14:01:11.732957019 +0800 +@@ -20,8 +20,7 @@ + + AC_PREREQ(2.59) + +-AC_INIT([GNU inetutils], +- m4_esyscmd([build-aux/git-version-gen .tarball-version 's/inetutils-/v/;s/_/./g']), ++AC_INIT([GNU inetutils],[1.9.4], + [[email protected]]) + + AC_CONFIG_SRCDIR([src/inetd.c])
meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb new file +206 -0
206 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v3 3/4 packagegroup-core-base-utils: Introduce new base-utils packagegroup
In reply to Tom RiniThis packagegroup is intended to provide all of the functionality found in other VIRTUAL-RUNTIME_base-utils providers through full packages rather than an all-on-one package. Document how to make use of this in local.conf.sample.extended. Introduce VIRTUAL-RUNTIME-vim and default this to vim-tiny to allow for a differently features vim to be used instead.
---
Changes in v2:
- Add a few more inetutils packages
- List kbd, add a few more packages specifically for non-systemd systems, thanks Mark!
--- meta/conf/local.conf.sample.extended | 8 +++ .../packagegroups/packagegroup-core-base-utils.bb | 58 ++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 meta/recipes-extended/packagegroups/packagegroup-core-base-utils.bb
meta/conf/local.conf.sample.extended +8 -0
@@ -384,3 +384,11 @@ #VIRTUAL-RUNTIME_login_manager = "shadow-base" #VIRTUAL-RUNTIME_init_manager = "systemd" #VIRTUAL-RUNTIME_initscripts = "systemd-compat-units" + +# +# Use a full set of packages instead of busybox for base utils +# +#PREFERRED_PROVIDER_base-utils = "packagegroup-core-base-utils" +#VIRTUAL-RUNTIME_base-utils = "packagegroup-core-base-utils" +#VIRTUAL-RUNTIME_base-utils-hwclock = "util-linux-hwclock" +#VIRTUAL-RUNTIME_base-utils-syslog = "syslog"
meta/recipes-extended/packagegroups/packagegroup-core-base-utils.bb new file +58 -0
58 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v3 4/4 imagefeatures: Add test to blacklist building busybox
In reply to Tom RiniNow that we have a packagegroup that can be used to replace the overall functionality of busybox as base-utils, add a test that we can continue to build a fairly complex image without busybox being available. This also doubles as documentation-by-test of how to do this.
--- meta/lib/oeqa/selftest/cases/imagefeatures.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
meta/lib/oeqa/selftest/cases/imagefeatures.py +26 -0
@@ -236,3 +236,29 @@ USERADD_GID_TABLES += "files/static-group" """ self.write_config(config) bitbake("core-image-base") + + def test_no_busybox_base_utils(self): + config = """ +# Enable x11 +DISTRO_FEATURES_append += "x11" + +# Switch to systemd +DISTRO_FEATURES += "systemd" +VIRTUAL-RUNTIME_init_manager = "systemd" +VIRTUAL-RUNTIME_initscripts = "" +VIRTUAL-RUNTIME_syslog = "" +VIRTUAL-RUNTIME_login_manager = "shadow-base" +DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit" + +# Replace busybox +PREFERRED_PROVIDER_virtual/base-utils = "packagegroup-core-base-utils" +VIRTUAL-RUNTIME_base-utils = "packagegroup-core-base-utils" +VIRTUAL-RUNTIME_base-utils-hwclock = "util-linux-hwclock" +VIRTUAL-RUNTIME_base-utils-syslog = "" + +# Blacklist busybox +PNBLACKLIST[busybox] = "Don't build this" +""" + self.write_config(config) + + bitbake("--graphviz core-image-sato")
Signature · 1 line
2.7.4