I discovered there is a minor conflict with the current version of the
iproute2 libdir patch when applied to version 2.6.31.
It is easily fixed. Update attached.
--
Eric
Submitted By: Eric Herman < eric at freesa dot org>
Date: 2009-02-08
Upstream Status: Unknown
Origin: Joe Ciccone
Description: This patch gives the ability to change the libdir.
Updated for Iproute2-2.6.28 by Jim Gifford
Discovered tc directory is text files moved to /usr/share
Updated for Iproute2-2.6.31 by Eric Herman
diff -Naur iproute2-2.6.31-orig/Makefile iproute2-2.6.31-clfs/Makefile
--- iproute2-2.6.31-orig/Makefile 2009-12-26 18:26:44.000000000 +0000
+++ iproute2-2.6.31-clfs/Makefile 2010-02-27 13:28:46.000000000 +0000
@@ -5,6 +5,7 @@
CONFDIR=/etc/iproute2
DOCDIR=/share/doc/iproute2
MANDIR=/share/man
+SHAREDIR=/usr/share
ARPDDIR=/var/lib/arpd
# Path to db_185.h include
diff -Naur iproute2-2.6.31-orig/include/iptables.h iproute2-2.6.31-clfs/include/iptables.h
--- iproute2-2.6.31-orig/include/iptables.h 2009-12-26 18:26:44.000000000 +0000
+++ iproute2-2.6.31-clfs/include/iptables.h 2010-02-27 13:27:41.000000000 +0000
@@ -4,8 +4,12 @@
#include "iptables_common.h"
#include "libiptc/libiptc.h"
+#ifndef LIBDIR
+#define LIBDIR "/lib"
+#endif
+
#ifndef IPT_LIB_DIR
-#define IPT_LIB_DIR "/usr/local/lib/iptables"
+#define IPT_LIB_DIR LIBDIR "/iptables"
#endif
#ifndef IPPROTO_SCTP
diff -Naur iproute2-2.6.31-orig/netem/Makefile iproute2-2.6.31-clfs/netem/Makefile
--- iproute2-2.6.31-orig/netem/Makefile 2009-12-26 18:26:44.000000000 +0000
+++ iproute2-2.6.31-clfs/netem/Makefile 2010-02-27 13:27:41.000000000 +0000
@@ -20,9 +20,9 @@
$(HOSTCC) $(CCOPTS) -I../include -o $@ [email protected] -lm
install: all
- mkdir -p $(DESTDIR)/lib/tc
+ mkdir -p $(DESTDIR)$(SHAREDIR)/tc
for i in $(DISTDATA); \
- do install -m 755 $$i $(DESTDIR)/lib/tc; \
+ do install -m 755 $$i $(DESTDIR)$(SHAREDIR)/tc; \
done
clean:
diff -Naur iproute2-2.6.31-orig/tc/Makefile iproute2-2.6.31-clfs/tc/Makefile
--- iproute2-2.6.31-orig/tc/Makefile 2009-12-26 18:26:44.000000000 +0000
+++ iproute2-2.6.31-clfs/tc/Makefile 2010-02-27 13:27:41.000000000 +0000
@@ -98,10 +98,10 @@
$(AR) rcs $@ $(TCLIB)
install: all
- mkdir -p $(DESTDIR)$(LIBDIR)/tc
+ mkdir -p $(DESTDIR)$(SHAREDIR)/tc
install -m 0755 tc $(DESTDIR)$(SBINDIR)
for i in $(TCSO); \
- do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
+ do install -m 755 $$i $(DESTDIR)$(SHAREDIR)/tc; \
done
clean:
diff -Naur iproute2-2.6.31-orig/tc/tc_util.c iproute2-2.6.31-clfs/tc/tc_util.c
--- iproute2-2.6.31-orig/tc/tc_util.c 2009-12-26 18:26:44.000000000 +0000
+++ iproute2-2.6.31-clfs/tc/tc_util.c 2010-02-27 13:27:41.000000000 +0000
@@ -24,8 +24,8 @@
#include "utils.h"
#include "tc_util.h"
-#ifndef LIBDIR
-#define LIBDIR "/usr/lib/"
+#ifndef SHAREDIR
+#define SHAREDIR "/usr/share"
#endif
const char *get_tc_lib(void)
@@ -34,7 +34,7 @@
lib_dir = getenv("TC_LIB_DIR");
if (!lib_dir)
- lib_dir = LIBDIR "/tc/";
+ lib_dir = SHAREDIR "/tc";
return lib_dir;
}
_______________________________________________
Clfs-dev mailing list
[email protected]
http://lists.cross-lfs.org/listinfo.cgi/clfs-dev-cross-lfs.org
