summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2018-01-04 03:13:46 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-05-28 11:08:16 +0100
commite775f2499cdc025ccae5f1e75068cff391df5ed4 (patch)
treea9b10c120b4bb8608663ef835615306c856dc5fc /perl-install
parent8a984df00275a607c2c23b4c59f6a34608b3aed2 (diff)
downloaddrakx-e775f2499cdc025ccae5f1e75068cff391df5ed4.tar
drakx-e775f2499cdc025ccae5f1e75068cff391df5ed4.tar.gz
drakx-e775f2499cdc025ccae5f1e75068cff391df5ed4.tar.bz2
drakx-e775f2499cdc025ccae5f1e75068cff391df5ed4.tar.xz
drakx-e775f2499cdc025ccae5f1e75068cff391df5ed4.zip
Fix perl escaping causing commands to not get linked
Noticed in the build log: Unescaped left brace in regex is illegal here in regex; marked by <-- HERE in m/sub (\w+?)_?(\(\))? { <-- HERE .*/ at -e line 1. (cherry picked from commit d24876d991bbcfb83fd523896dba85e2df1fce46)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/Makefile2
-rw-r--r--perl-install/install/NEWS1
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install/Makefile b/perl-install/install/Makefile
index d509c35c4..aea57f78d 100644
--- a/perl-install/install/Makefile
+++ b/perl-install/install/Makefile
@@ -38,7 +38,7 @@ install_pms:
[ -d $(DEST) ] || ../../tools/mdkinst_stage2_tool --uncompress $(STAGE2_DEST)
# commands implemented in perl:
- for i in `perl -ne 's/sub (\w+?)_?(\(\))? {.*/$$1/ and print' commands.pm` sync; do if [ ! -x $(DEST)/usr/bin/$$i ]; then ln -sf commands $(DEST)/usr/bin/$$i; fi; done
+ for i in `perl -ne 's/sub (\w+?)_?(\(\))? \{.*/$$1/ and print' commands.pm` sync; do if [ ! -x $(DEST)/usr/bin/$$i ]; then ln -sf commands $(DEST)/usr/bin/$$i; fi; done
# install & clean perl modules:
install -d $(DESTREP4PMS)
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 6f72a4dc9..24a359459 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- fix perl escaping causing commands to not get linked
- do not include some hwdb files from uneeded pkgs
- bootloader:
o better read back config