[Lunar-commits] <moonbase-core> iproute2: Fix non fatal make install error

Stefan Wold ratler at lunar-linux.org
Sat Jan 5 22:34:03 CET 2013


commit 04b2b34d1fce41d92d8d60cb9a67d50fd76cff98
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Sat, 05 Jan 2013 13:34:03 -0800
URL: https://github.com/lunar-linux/moonbase-core/commit/04b2b34d1fce41d92d8d60cb9a67d50fd76cff98

iproute2: Fix non fatal make install error

Due to a misstake in the Makefile, 3 manpages are installed twice
and that make install unhappy and then throw a non fatal error.
However this error is enough for the ISO build to catch it as a
failure.
---
  net/iproute2/BUILD   | +4/-4     
  net/iproute2/DETAILS | +3/-0     
  2 files changed, 7 insertions(+), 4 deletions(-)

--- a/net/iproute2/BUILD
+++ b/net/iproute2/BUILD
@@ -1,15 +1,15 @@
 (
 
-  patch_it $SOURCE_CACHE/$SOURCE2 1 &&
+  patch_it $SOURCE2 1 &&
+  patch_it $SOURCE3 1 &&
 
   if ! in_depends $MODULE db; then
     sedit 's/arpd//' misc/Makefile
   fi &&
 
-  chmod +x configure &&
   ./configure &&
-  KERNEL_INCLUDE=/usr/include/ make SBINDIR=/usr/sbin &&
+  KERNEL_INCLUDE=/usr/include/ make &&
   prepare_install &&
-  make SBINDIR=/usr/sbin install
+  make install
 
 ) > $C_FIFO 2>&1
--- a/net/iproute2/DETAILS
+++ b/net/iproute2/DETAILS
@@ -2,10 +2,13 @@
          VERSION=3.6.0
           SOURCE=$MODULE-$VERSION.tar.xz
          SOURCE2=$MODULE-fhs.patch.bz2
+         SOURCE3=$MODULE-3.6.0-fix_install_manpage_error.patch
       SOURCE_URL=http://www.kernel.org/pub/linux/utils/net/$MODULE
      SOURCE2_URL=$PATCH_URL
+     SOURCE3_URL=$PATCH_URL
       SOURCE_VFY=sha1:6fa16fd2158d0f289ef454cad46555ead1c33c2d
      SOURCE2_VFY=sha1:b39063237e7a2c68fcfb731fe5bf5b3177e1b2dc
+     SOURCE3_VFY=sha1:82d82d0023a4d67a25af2f3bf137caa28eeac119
         WEB_SITE=http://www.linuxfoundation.org/collaborate/workgroups/networking/$MODULE
          ENTERED=20021106
          UPDATED=20121017




More information about the Lunar-commits mailing list