Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (9ffded2426de9fd17815a58fefac95a054cdf5a9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (9ffded2426de9fd17815a58fefac95a054cdf5a9)
  • Date: Fri, 30 Mar 2018 21:48:57 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

net/ifupdown/0003-remove-dpkg-architecture-invokations-from-perl-scrip.patch
| 39 ++++++++++
net/ifupdown/HISTORY
| 2
net/ifupdown/PRE_BUILD
| 7 +
3 files changed, 46 insertions(+), 2 deletions(-)

New commits:
commit 9ffded2426de9fd17815a58fefac95a054cdf5a9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

net/ifupdown: remove references to dpkg-architecture

diff --git
a/net/ifupdown/0003-remove-dpkg-architecture-invokations-from-perl-scrip.patch

b/net/ifupdown/0003-remove-dpkg-architecture-invokations-from-perl-scrip.patch
new file mode 100644
index 0000000..3666e4f
--- /dev/null
+++
b/net/ifupdown/0003-remove-dpkg-architecture-invokations-from-perl-scrip.patch
@@ -0,0 +1,39 @@
+From 302af57feb0eab4556fd6a74207fb4f25059c382 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Fri, 30 Mar 2018 23:44:34 +0200
+Subject: [PATCH] remove dpkg-architecture invokations from perl scripts
+
+---
+ defn2c.pl | 2 +-
+ defn2man.pl | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/defn2c.pl b/defn2c.pl
+index fa7a02e..0524732 100755
+--- a/defn2c.pl
++++ b/defn2c.pl
+@@ -2,7 +2,7 @@
+
+ use strict;
+
+-my $DEB_HOST_ARCH_OS = `dpkg-architecture -qDEB_HOST_ARCH_OS`;
++my $DEB_HOST_ARCH_OS = "linux";
+
+ $DEB_HOST_ARCH_OS =~ s/\n//;
+
+diff --git a/defn2man.pl b/defn2man.pl
+index 6ddcfdd..015e280 100755
+--- a/defn2man.pl
++++ b/defn2man.pl
+@@ -2,7 +2,7 @@
+
+ use strict;
+
+-my $DEB_HOST_ARCH_OS = `dpkg-architecture -qDEB_HOST_ARCH_OS`;
++my $DEB_HOST_ARCH_OS = "linux";
+
+ $DEB_HOST_ARCH_OS =~ s/\n//;
+
+--
+2.16.3
+
diff --git a/net/ifupdown/HISTORY b/net/ifupdown/HISTORY
index f90532d..c0c9c29 100644
--- a/net/ifupdown/HISTORY
+++ b/net/ifupdown/HISTORY
@@ -1,6 +1,8 @@
2018-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.8.31
* 0001-do-not-use-dpkg-architecture.patch, 0002-sbin-ip.patch: refresh
+ * 0003-remove-dpkg-architecture-invokations-from-perl-scrip.patch,
+ PRE_BUILD: remove references to dpkg-architecture from perl scripts

2017-05-26 Vlad Glagolev <stealth AT sourcemage.org>
* INSTALL: added missing dir installation
diff --git a/net/ifupdown/PRE_BUILD b/net/ifupdown/PRE_BUILD
index 7a73510..eeecc96 100755
--- a/net/ifupdown/PRE_BUILD
+++ b/net/ifupdown/PRE_BUILD
@@ -1,6 +1,9 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
+
message "${MESSAGE_COLOR}Patching out dpkg-architecture...${DEFAULT_COLOR}"
&&
-patch -p1 < ${SPELL_DIRECTORY}/0001-do-not-use-dpkg-architecture.patch &&
+patch -p1 < "${SPELL_DIRECTORY}/0001-do-not-use-dpkg-architecture.patch" &&
message "${MESSAGE_COLOR}Patching /bin/ip to /sbin/ip...${DEFAULT_COLOR}" &&
-patch -p1 < ${SPELL_DIRECTORY}/0002-sbin-ip.patch
+patch -p1 < "${SPELL_DIRECTORY}/0002-sbin-ip.patch"
&&
+message "${MESSAGE_COLOR}Patching out dpkg-architecture from perl
scripts...${DEFAULT_COLOR}" &&
+patch -p1 <
"${SPELL_DIRECTORY}/0003-remove-dpkg-architecture-invokations-from-perl-scrip.patch"



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (9ffded2426de9fd17815a58fefac95a054cdf5a9), Florian Franzmann, 03/30/2018

Archive powered by MHonArc 2.6.24.

Top of Page