vim: Remove as this is now in oe-core
PATCH 1/2 vim: Remove as this is now in oe-core
Now that we have migrated this recipe to oe-core we need to drop it from here.
Signed-off-by Tom Rini <[email protected]>
---
NOTE: Do not apply this until the series which imports vim into oe-core itself has been applied. This is being posted now so that I don't forget about it.
--- ...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-oe/recipes-support/vim/vim-tiny_8.1.0347.bb | 15 --- meta-oe/recipes-support/vim/vim_8.1.0347.bb | 121 --------------------- 5 files changed, 263 deletions(-) delete mode 100644 meta-oe/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch delete mode 100644 meta-oe/recipes-support/vim/files/disable_acl_header_check.patch delete mode 100644 meta-oe/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch delete mode 100644 meta-oe/recipes-support/vim/vim-tiny_8.1.0347.bb delete mode 100644 meta-oe/recipes-support/vim/vim_8.1.0347.bb
meta-oe/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch deleted +0 -46
@@ -1,46 +0,0 @@ -From 133ab27cdb17ca20ef6b0304cf30621d2bcbe757 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <[email protected]> -Date: Thu, 31 Jan 2019 21:32:26 -0800 -Subject: [PATCH] src/Makefile: improve reproducibility - -Clear all_cflags, all_lflags, compiled_user -and compiled_sys to avoid introducing build -info to improve reproducibility as below: - -WARNING: vim-8.1.0347-r0 do_package_qa: QA Issue: File /work/core2-64-wrs-linux/vim/8.1.0347-r0/packages-split/vim/usr/bin/vim.vim in package contained reference to tmpdir [buildpaths] - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Mingli Yu <[email protected]> ---- - src/Makefile | 14 ++++---------- - 1 file changed, 4 insertions(+), 10 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index f2fafa4dc..7148d4bd9 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -2845,16 +2845,10 @@ auto/pathdef.c: Makefile auto/config.mk - -@echo '#include "vim.h"' >> $@ - -@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' | $(QUOTESED) >> $@ - -@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' | $(QUOTESED) >> $@ -- -@echo 'char_u *all_cflags = (char_u *)"$(CC) -c -I$(srcdir) $(ALL_CFLAGS)";' | $(QUOTESED) >> $@ -- -@echo 'char_u *all_lflags = (char_u *)"$(CC) $(ALL_LIB_DIRS) $(LDFLAGS) -o $(VIMTARGET) $(ALL_LIBS) ";' | $(QUOTESED) >> $@ -- -@echo 'char_u *compiled_user = (char_u *)"' | tr -d $(NL) >> $@ -- -@if test -n "$(COMPILEDBY)"; then \ -- echo "$(COMPILEDBY)" | tr -d $(NL) >> $@; \ -- else ((logname) 2>/dev/null || whoami) | tr -d $(NL) >> $@; fi -- -@echo '";' >> $@ -- -@echo 'char_u *compiled_sys = (char_u *)"' | tr -d $(NL) >> $@ -- -@if test -z "$(COMPILEDBY)"; then hostname | tr -d $(NL) >> $@; fi -- -@echo '";' >> $@ -+ -@echo 'char_u *all_cflags = (char_u *)"";' | $(QUOTESED) >> $@ -+ -@echo 'char_u *all_lflags = (char_u *)"";' | $(QUOTESED) >> $@ -+ -@echo 'char_u *compiled_user = (char_u *)"";' >> $@ -+ -@echo 'char_u *compiled_sys = (char_u *)"";' >> $@ - -@sh $(srcdir)/pathdef.sh - - GUI_GTK_RES_INPUTS = \ --- -2.17.1 -
meta-oe/recipes-support/vim/files/disable_acl_header_check.patch deleted +0 -39
@@ -1,39 +0,0 @@ -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-oe/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch deleted +0 -42
42 lines not on this page · raw message
meta-oe/recipes-support/vim/vim-tiny_8.1.0347.bb deleted +0 -15
@@ -1,15 +0,0 @@ -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-oe/recipes-support/vim/vim_8.1.0347.bb deleted +0 -121
121 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 2/2 inetutils: Remove as this is now in oe-core
Now that we have migrated this recipe to oe-core we need to drop it from here.
Signed-off-by Tom Rini <[email protected]>
---
NOTE: Do not apply this until the series which imports vim into oe-core itself has been applied. This is being posted now so that I don't forget about it.
--- .../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 --------------------- 13 files changed, 542 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch delete mode 100644 meta-networking/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch delete mode 100644 meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch delete mode 100644 meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch delete mode 100644 meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch delete mode 100644 meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch delete mode 100644 meta-networking/recipes-connectivity/inetutils/inetutils/rexec.xinetd.inetutils delete mode 100644 meta-networking/recipes-connectivity/inetutils/inetutils/rlogin.xinetd.inetutils delete mode 100644 meta-networking/recipes-connectivity/inetutils/inetutils/rsh.xinetd.inetutils delete mode 100644 meta-networking/recipes-connectivity/inetutils/inetutils/telnet.xinetd.inetutils delete mode 100644 meta-networking/recipes-connectivity/inetutils/inetutils/tftpd.xinetd.inetutils delete mode 100644 meta-networking/recipes-connectivity/inetutils/inetutils/version.patch delete mode 100644 meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb
meta-networking/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch deleted +0 -31
@@ -1,31 +0,0 @@ -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-networking/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch deleted +0 -83
83 lines not on this page · raw message
meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch deleted +0 -29
@@ -1,29 +0,0 @@ -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-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch deleted +0 -14
@@ -1,14 +0,0 @@ -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-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch deleted +0 -26
@@ -1,26 +0,0 @@ -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-networking/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch deleted +0 -40
@@ -1,40 +0,0 @@ -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-networking/recipes-connectivity/inetutils/inetutils/rexec.xinetd.inetutils deleted +0 -20
@@ -1,20 +0,0 @@ -# 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-networking/recipes-connectivity/inetutils/inetutils/rlogin.xinetd.inetutils deleted +0 -23
@@ -1,23 +0,0 @@ -# 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-networking/recipes-connectivity/inetutils/inetutils/rsh.xinetd.inetutils deleted +0 -21
@@ -1,21 +0,0 @@ -# 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-networking/recipes-connectivity/inetutils/inetutils/telnet.xinetd.inetutils deleted +0 -13
@@ -1,13 +0,0 @@ -# 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-networking/recipes-connectivity/inetutils/inetutils/tftpd.xinetd.inetutils deleted +0 -19
@@ -1,19 +0,0 @@ -# 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-networking/recipes-connectivity/inetutils/inetutils/version.patch deleted +0 -17
@@ -1,17 +0,0 @@ -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-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb deleted +0 -206
206 lines not on this page · raw message
Signature · 1 line
2.7.4