summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--updater-ng/patches/0001-configure.ac-fix-check-for-busybox-when-cross-compil.patch31
-rw-r--r--updater-ng/patches/0002-configure.ac-check-for-plain-Lua-first-instead-of-lu.patch29
-rw-r--r--updater-ng/patches/0003-utils-xxdi.pl-remove-dependency-on-File-Slurp.patch47
3 files changed, 0 insertions, 107 deletions
diff --git a/updater-ng/patches/0001-configure.ac-fix-check-for-busybox-when-cross-compil.patch b/updater-ng/patches/0001-configure.ac-fix-check-for-busybox-when-cross-compil.patch
deleted file mode 100644
index 1577c42..0000000
--- a/updater-ng/patches/0001-configure.ac-fix-check-for-busybox-when-cross-compil.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1048eccde0342f5aa3133623f9cafbfa92eaf039 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
-Date: Thu, 21 May 2020 21:13:37 +0200
-Subject: [PATCH 1/3] configure.ac: fix check for busybox when cross compiling
-
-AC_CHECK_FILE works only if cross compilation is not performed. The
-reason is that it tries to check for existence of file on native system.
-
-We want check if argument is file so implement check doing exactly that
-with plain test.
----
- configure.ac | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index e384eae3..aec813cb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -18,7 +18,8 @@ AM_CONDITIONAL([BUSYBOX_EMBED], [test -n "$with_embed_busybox"])
- AC_SUBST([BUSYBOX_EMBED], [$with_embed_busybox])
- AS_IF([test -n "$with_embed_busybox"],
- [
-- AC_CHECK_FILE([$with_embed_busybox],,[AC_MSG_ERROR([Invalid argument for --with-embed-busybox])])
-+ AS_IF([test -f "$with_embed_busybox"],,
-+ [AC_MSG_ERROR([Invalid argument for --with-embed-busybox])])
- AC_DEFINE_UNQUOTED([BUSYBOX_EMBED], [$with_embed_busybox], [Embded Busybox])
- ])
-
---
-2.26.2
-
diff --git a/updater-ng/patches/0002-configure.ac-check-for-plain-Lua-first-instead-of-lu.patch b/updater-ng/patches/0002-configure.ac-check-for-plain-Lua-first-instead-of-lu.patch
deleted file mode 100644
index 0ca5c20..0000000
--- a/updater-ng/patches/0002-configure.ac-check-for-plain-Lua-first-instead-of-lu.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6b57800e3b8836eefb39cb9f315faf6b35a8df3f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
-Date: Sun, 31 May 2020 11:31:46 +0200
-Subject: [PATCH 2/3] configure.ac: check for plain Lua first instead of lua5.1
-
-Checking for lua with version 5.1 is required for systems with single
-version of Lua while lua5.1 is required for those providing multiple
-versions.
----
- configure.ac | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index aec813cb..7421534a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,7 +23,8 @@ AS_IF([test -n "$with_embed_busybox"],
- AC_DEFINE_UNQUOTED([BUSYBOX_EMBED], [$with_embed_busybox], [Embded Busybox])
- ])
-
--PKG_CHECK_MODULES([LUA], [lua5.1])
-+PKG_CHECK_MODULES([LUA], [lua >= 5.1 lua < 5.2],,
-+ [PKG_CHECK_MODULES([LUA], [lua5.1])])
- PKG_CHECK_MODULES([LIBEVENT], [libevent >= 2.0])
- PKG_CHECK_MODULES([LIBARCHIVE], [libarchive])
- PKG_CHECK_MODULES([LIBCURL], [libcurl])
---
-2.26.2
-
diff --git a/updater-ng/patches/0003-utils-xxdi.pl-remove-dependency-on-File-Slurp.patch b/updater-ng/patches/0003-utils-xxdi.pl-remove-dependency-on-File-Slurp.patch
deleted file mode 100644
index a655511..0000000
--- a/updater-ng/patches/0003-utils-xxdi.pl-remove-dependency-on-File-Slurp.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 6e670a7a5f01be45ac7e1c98ab841deb7a6233fd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
-Date: Mon, 1 Jun 2020 09:58:28 +0200
-Subject: [PATCH 3/3] utils/xxdi.pl: remove dependency on File::Slurp
-
----
- configure.ac | 1 -
- utils/xxdi.pl | 7 +++++--
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7421534a..06a51365 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -38,7 +38,6 @@ AC_LINK_IFELSE(
-
- AC_PATH_PROG([PERL], [perl])
- AS_IF([test -z "$PERL"], [AC_MSG_ERROR([Missing perl interpreter])])
--AX_PROG_PERL_MODULES([File::Slurp], , AC_MSG_ERROR(Perl modules File::Slurp is required))
- AC_PATH_PROG([XXDI], [xxdi.pl],, [$ac_abs_confdir/utils])
- AS_IF([test -z "$XXDI"], [AC_MSG_ERROR([Not able to locate xxdi.pl])])
-
-diff --git a/utils/xxdi.pl b/utils/xxdi.pl
-index 465e47a8..0e386922 100755
---- a/utils/xxdi.pl
-+++ b/utils/xxdi.pl
-@@ -14,12 +14,15 @@
-
- use strict;
- use warnings;
--use File::Slurp qw(slurp);
-
- die "Usage: xddi.pl VARIABLE_NAME INPUT OUTPUT" unless @ARGV == 3;
-
- my $var_name = $ARGV[0];
--my $indata = slurp($ARGV[1]);
-+my $indata = do {
-+ local $/;
-+ open my $f, "<", $ARGV[1] or die "Could not open input $ARGV[1]: $!\n";
-+ <$f>;
-+};
- my $len_data = length($indata);
- my $num_digits_per_line = 12;
-
---
-2.26.2
-