From 1354416259e46dcc0ca023b566adeba5fb415721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 10 Jun 2020 11:05:27 +0200 Subject: updater-ng: drop all patches pushed to master now --- ...s-xxdi.pl-remove-dependency-on-File-Slurp.patch | 47 ---------------------- 1 file changed, 47 deletions(-) delete mode 100644 updater-ng/patches/0003-utils-xxdi.pl-remove-dependency-on-File-Slurp.patch (limited to 'updater-ng/patches/0003-utils-xxdi.pl-remove-dependency-on-File-Slurp.patch') 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?= -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 - -- cgit v1.2.3