Date: Wednesday, April 20, 2016 @ 15:14:30 Author: ronald Revision: 265531
archrelease: copy trunk to testing-i686, testing-x86_64 Added: iproute2/repos/testing-i686/PKGBUILD (from rev 265530, iproute2/trunk/PKGBUILD) iproute2/repos/testing-i686/iproute2-fhs.patch (from rev 265530, iproute2/trunk/iproute2-fhs.patch) iproute2/repos/testing-x86_64/PKGBUILD (from rev 265530, iproute2/trunk/PKGBUILD) iproute2/repos/testing-x86_64/iproute2-fhs.patch (from rev 265530, iproute2/trunk/iproute2-fhs.patch) Deleted: iproute2/repos/testing-i686/PKGBUILD iproute2/repos/testing-i686/iproute2-fhs.patch iproute2/repos/testing-x86_64/PKGBUILD iproute2/repos/testing-x86_64/iproute2-fhs.patch -----------------------------------+ /PKGBUILD | 120 ++++++++++++++++++++++++ /iproute2-fhs.patch | 174 ++++++++++++++++++++++++++++++++++++ testing-i686/PKGBUILD | 60 ------------ testing-i686/iproute2-fhs.patch | 87 ------------------ testing-x86_64/PKGBUILD | 60 ------------ testing-x86_64/iproute2-fhs.patch | 87 ------------------ 6 files changed, 294 insertions(+), 294 deletions(-) Deleted: testing-i686/PKGBUILD =================================================================== --- testing-i686/PKGBUILD 2016-04-20 13:14:21 UTC (rev 265530) +++ testing-i686/PKGBUILD 2016-04-20 13:14:30 UTC (rev 265531) @@ -1,60 +0,0 @@ -# $Id$ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Judd Vinet <jvi...@zeroflux.org> - -pkgname=iproute2 -pkgver=4.4.0 -pkgrel=2 -pkgdesc="IP Routing Utilities" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" -depends=('glibc' 'iptables') -makedepends=('linux-atm') -optdepends=('linux-atm: ATM support') -groups=('base') -provides=('iproute') -conflicts=('iproute') -replaces=('iproute') -options=('staticlibs' '!makeflags') -backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \ - 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') -validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger -source=("http://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign} - iproute2-fhs.patch) -sha1sums=('68372be70c5c0503196d03913f4b1e201956d1b6' - 'SKIP' - '2dc6d8f1a2495a0d51eaa303dcc78ecc0c477935') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # set correct fhs structure - patch -Np1 -i "${srcdir}/iproute2-fhs.patch" - - # do not treat warnings as errors - sed -i 's/-Werror//' Makefile - -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - # libnetlink isn't installed, install it FS#19385 - install -Dm644 include/libnetlink.h "${pkgdir}/usr/include/libnetlink.h" - install -Dm644 lib/libnetlink.a "${pkgdir}/usr/lib/libnetlink.a" - - # move binaries - cd "${pkgdir}" - mv sbin usr/bin - -} Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 265530, iproute2/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2016-04-20 13:14:30 UTC (rev 265531) @@ -0,0 +1,60 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Judd Vinet <jvi...@zeroflux.org> + +pkgname=iproute2 +pkgver=4.5.0 +pkgrel=1 +pkgdesc="IP Routing Utilities" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" +depends=('glibc' 'iptables') +makedepends=('linux-atm') +optdepends=('linux-atm: ATM support') +groups=('base') +provides=('iproute') +conflicts=('iproute') +replaces=('iproute') +options=('staticlibs' '!makeflags') +backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \ + 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') +validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger +source=("http://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign} + iproute2-fhs.patch) +sha1sums=('f6271aaf9b24b9c465622bea8a29a883034d8d49' + 'SKIP' + '2dc6d8f1a2495a0d51eaa303dcc78ecc0c477935') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # set correct fhs structure + patch -Np1 -i "${srcdir}/iproute2-fhs.patch" + + # do not treat warnings as errors + sed -i 's/-Werror//' Makefile + +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + # libnetlink isn't installed, install it FS#19385 + install -Dm644 include/libnetlink.h "${pkgdir}/usr/include/libnetlink.h" + install -Dm644 lib/libnetlink.a "${pkgdir}/usr/lib/libnetlink.a" + + # move binaries + cd "${pkgdir}" + mv sbin usr/bin + +} Deleted: testing-i686/iproute2-fhs.patch =================================================================== --- testing-i686/iproute2-fhs.patch 2016-04-20 13:14:21 UTC (rev 265530) +++ testing-i686/iproute2-fhs.patch 2016-04-20 13:14:30 UTC (rev 265531) @@ -1,87 +0,0 @@ -diff --git a/Makefile b/Makefile -index 67176be..6549447 100644 ---- a/Makefile -+++ b/Makefile -@@ -13,7 +13,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include - - SHARED_LIBS = y - --DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -+DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DDATADIR=\"$(DATADIR)\" - ifneq ($(SHARED_LIBS),y) - DEFINES+= -DNO_SHARED_LIBS - endif -diff --git a/netem/Makefile b/netem/Makefile -index e52e125..5b4d283 100644 ---- a/netem/Makefile -+++ b/netem/Makefile -@@ -20,9 +20,9 @@ stats: stats.c - $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm - - install: all -- mkdir -p $(DESTDIR)$(LIBDIR)/tc -+ mkdir -p $(DESTDIR)$(DATADIR)/tc - for i in $(DISTDATA); \ -- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \ -+ do install -m 644 $$i $(DESTDIR)$(DATADIR)/tc; \ - done - - clean: -diff --git a/tc/q_netem.c b/tc/q_netem.c -index cd990a0..7d4e71f 100644 ---- a/tc/q_netem.c -+++ b/tc/q_netem.c -@@ -113,7 +113,7 @@ static int get_distribution(const char *type, __s16 *data, int maxdata) - char *line = NULL; - char name[128]; - -- snprintf(name, sizeof(name), "%s/%s.dist", get_tc_lib(), type); -+ snprintf(name, sizeof(name), "%s/%s.dist", get_tc_datadir(), type); - if ((f = fopen(name, "r")) == NULL) { - fprintf(stderr, "No distribution data for %s (%s: %s)\n", - type, name, strerror(errno)); -diff --git a/tc/tc_util.c b/tc/tc_util.c -index aa6de24..22bb6d5 100644 ---- a/tc/tc_util.c -+++ b/tc/tc_util.c -@@ -32,6 +32,10 @@ - #define LIBDIR "/usr/lib" - #endif - -+#ifndef DATADIR -+#define DATADIR "/usr/share" -+#endif -+ - static struct db_names *cls_names = NULL; - - #define NAMES_DB "/etc/iproute2/tc_cls" -@@ -73,6 +77,17 @@ const char *get_tc_lib(void) - return lib_dir; - } - -+const char *get_tc_datadir(void) -+{ -+ const char *data_dir; -+ -+ data_dir = getenv("TC_DATA_DIR"); -+ if (!data_dir) -+ data_dir = DATADIR "/tc/"; -+ -+ return data_dir; -+} -+ - int get_qdisc_handle(__u32 *h, const char *str) - { - __u32 maj; -diff --git a/tc/tc_util.h b/tc/tc_util.h -index 61e60b1..6d448de 100644 ---- a/tc/tc_util.h -+++ b/tc/tc_util.h -@@ -55,6 +55,7 @@ struct exec_util { - }; - - extern const char *get_tc_lib(void); -+extern const char *get_tc_datadir(void); - - extern struct qdisc_util *get_qdisc_kind(const char *str); - extern struct filter_util *get_filter_kind(const char *str); Copied: iproute2/repos/testing-i686/iproute2-fhs.patch (from rev 265530, iproute2/trunk/iproute2-fhs.patch) =================================================================== --- testing-i686/iproute2-fhs.patch (rev 0) +++ testing-i686/iproute2-fhs.patch 2016-04-20 13:14:30 UTC (rev 265531) @@ -0,0 +1,87 @@ +diff --git a/Makefile b/Makefile +index 67176be..6549447 100644 +--- a/Makefile ++++ b/Makefile +@@ -13,7 +13,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include + + SHARED_LIBS = y + +-DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" ++DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DDATADIR=\"$(DATADIR)\" + ifneq ($(SHARED_LIBS),y) + DEFINES+= -DNO_SHARED_LIBS + endif +diff --git a/netem/Makefile b/netem/Makefile +index e52e125..5b4d283 100644 +--- a/netem/Makefile ++++ b/netem/Makefile +@@ -20,9 +20,9 @@ stats: stats.c + $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm + + install: all +- mkdir -p $(DESTDIR)$(LIBDIR)/tc ++ mkdir -p $(DESTDIR)$(DATADIR)/tc + for i in $(DISTDATA); \ +- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \ ++ do install -m 644 $$i $(DESTDIR)$(DATADIR)/tc; \ + done + + clean: +diff --git a/tc/q_netem.c b/tc/q_netem.c +index cd990a0..7d4e71f 100644 +--- a/tc/q_netem.c ++++ b/tc/q_netem.c +@@ -113,7 +113,7 @@ static int get_distribution(const char *type, __s16 *data, int maxdata) + char *line = NULL; + char name[128]; + +- snprintf(name, sizeof(name), "%s/%s.dist", get_tc_lib(), type); ++ snprintf(name, sizeof(name), "%s/%s.dist", get_tc_datadir(), type); + if ((f = fopen(name, "r")) == NULL) { + fprintf(stderr, "No distribution data for %s (%s: %s)\n", + type, name, strerror(errno)); +diff --git a/tc/tc_util.c b/tc/tc_util.c +index aa6de24..22bb6d5 100644 +--- a/tc/tc_util.c ++++ b/tc/tc_util.c +@@ -32,6 +32,10 @@ + #define LIBDIR "/usr/lib" + #endif + ++#ifndef DATADIR ++#define DATADIR "/usr/share" ++#endif ++ + static struct db_names *cls_names = NULL; + + #define NAMES_DB "/etc/iproute2/tc_cls" +@@ -73,6 +77,17 @@ const char *get_tc_lib(void) + return lib_dir; + } + ++const char *get_tc_datadir(void) ++{ ++ const char *data_dir; ++ ++ data_dir = getenv("TC_DATA_DIR"); ++ if (!data_dir) ++ data_dir = DATADIR "/tc/"; ++ ++ return data_dir; ++} ++ + int get_qdisc_handle(__u32 *h, const char *str) + { + __u32 maj; +diff --git a/tc/tc_util.h b/tc/tc_util.h +index 61e60b1..6d448de 100644 +--- a/tc/tc_util.h ++++ b/tc/tc_util.h +@@ -55,6 +55,7 @@ struct exec_util { + }; + + extern const char *get_tc_lib(void); ++extern const char *get_tc_datadir(void); + + extern struct qdisc_util *get_qdisc_kind(const char *str); + extern struct filter_util *get_filter_kind(const char *str); Deleted: testing-x86_64/PKGBUILD =================================================================== --- testing-x86_64/PKGBUILD 2016-04-20 13:14:21 UTC (rev 265530) +++ testing-x86_64/PKGBUILD 2016-04-20 13:14:30 UTC (rev 265531) @@ -1,60 +0,0 @@ -# $Id$ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Judd Vinet <jvi...@zeroflux.org> - -pkgname=iproute2 -pkgver=4.4.0 -pkgrel=2 -pkgdesc="IP Routing Utilities" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" -depends=('glibc' 'iptables') -makedepends=('linux-atm') -optdepends=('linux-atm: ATM support') -groups=('base') -provides=('iproute') -conflicts=('iproute') -replaces=('iproute') -options=('staticlibs' '!makeflags') -backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \ - 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') -validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger -source=("http://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign} - iproute2-fhs.patch) -sha1sums=('68372be70c5c0503196d03913f4b1e201956d1b6' - 'SKIP' - '2dc6d8f1a2495a0d51eaa303dcc78ecc0c477935') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # set correct fhs structure - patch -Np1 -i "${srcdir}/iproute2-fhs.patch" - - # do not treat warnings as errors - sed -i 's/-Werror//' Makefile - -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - # libnetlink isn't installed, install it FS#19385 - install -Dm644 include/libnetlink.h "${pkgdir}/usr/include/libnetlink.h" - install -Dm644 lib/libnetlink.a "${pkgdir}/usr/lib/libnetlink.a" - - # move binaries - cd "${pkgdir}" - mv sbin usr/bin - -} Copied: iproute2/repos/testing-x86_64/PKGBUILD (from rev 265530, iproute2/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2016-04-20 13:14:30 UTC (rev 265531) @@ -0,0 +1,60 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Judd Vinet <jvi...@zeroflux.org> + +pkgname=iproute2 +pkgver=4.5.0 +pkgrel=1 +pkgdesc="IP Routing Utilities" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" +depends=('glibc' 'iptables') +makedepends=('linux-atm') +optdepends=('linux-atm: ATM support') +groups=('base') +provides=('iproute') +conflicts=('iproute') +replaces=('iproute') +options=('staticlibs' '!makeflags') +backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \ + 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') +validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger +source=("http://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign} + iproute2-fhs.patch) +sha1sums=('f6271aaf9b24b9c465622bea8a29a883034d8d49' + 'SKIP' + '2dc6d8f1a2495a0d51eaa303dcc78ecc0c477935') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # set correct fhs structure + patch -Np1 -i "${srcdir}/iproute2-fhs.patch" + + # do not treat warnings as errors + sed -i 's/-Werror//' Makefile + +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + # libnetlink isn't installed, install it FS#19385 + install -Dm644 include/libnetlink.h "${pkgdir}/usr/include/libnetlink.h" + install -Dm644 lib/libnetlink.a "${pkgdir}/usr/lib/libnetlink.a" + + # move binaries + cd "${pkgdir}" + mv sbin usr/bin + +} Deleted: testing-x86_64/iproute2-fhs.patch =================================================================== --- testing-x86_64/iproute2-fhs.patch 2016-04-20 13:14:21 UTC (rev 265530) +++ testing-x86_64/iproute2-fhs.patch 2016-04-20 13:14:30 UTC (rev 265531) @@ -1,87 +0,0 @@ -diff --git a/Makefile b/Makefile -index 67176be..6549447 100644 ---- a/Makefile -+++ b/Makefile -@@ -13,7 +13,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include - - SHARED_LIBS = y - --DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -+DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DDATADIR=\"$(DATADIR)\" - ifneq ($(SHARED_LIBS),y) - DEFINES+= -DNO_SHARED_LIBS - endif -diff --git a/netem/Makefile b/netem/Makefile -index e52e125..5b4d283 100644 ---- a/netem/Makefile -+++ b/netem/Makefile -@@ -20,9 +20,9 @@ stats: stats.c - $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm - - install: all -- mkdir -p $(DESTDIR)$(LIBDIR)/tc -+ mkdir -p $(DESTDIR)$(DATADIR)/tc - for i in $(DISTDATA); \ -- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \ -+ do install -m 644 $$i $(DESTDIR)$(DATADIR)/tc; \ - done - - clean: -diff --git a/tc/q_netem.c b/tc/q_netem.c -index cd990a0..7d4e71f 100644 ---- a/tc/q_netem.c -+++ b/tc/q_netem.c -@@ -113,7 +113,7 @@ static int get_distribution(const char *type, __s16 *data, int maxdata) - char *line = NULL; - char name[128]; - -- snprintf(name, sizeof(name), "%s/%s.dist", get_tc_lib(), type); -+ snprintf(name, sizeof(name), "%s/%s.dist", get_tc_datadir(), type); - if ((f = fopen(name, "r")) == NULL) { - fprintf(stderr, "No distribution data for %s (%s: %s)\n", - type, name, strerror(errno)); -diff --git a/tc/tc_util.c b/tc/tc_util.c -index aa6de24..22bb6d5 100644 ---- a/tc/tc_util.c -+++ b/tc/tc_util.c -@@ -32,6 +32,10 @@ - #define LIBDIR "/usr/lib" - #endif - -+#ifndef DATADIR -+#define DATADIR "/usr/share" -+#endif -+ - static struct db_names *cls_names = NULL; - - #define NAMES_DB "/etc/iproute2/tc_cls" -@@ -73,6 +77,17 @@ const char *get_tc_lib(void) - return lib_dir; - } - -+const char *get_tc_datadir(void) -+{ -+ const char *data_dir; -+ -+ data_dir = getenv("TC_DATA_DIR"); -+ if (!data_dir) -+ data_dir = DATADIR "/tc/"; -+ -+ return data_dir; -+} -+ - int get_qdisc_handle(__u32 *h, const char *str) - { - __u32 maj; -diff --git a/tc/tc_util.h b/tc/tc_util.h -index 61e60b1..6d448de 100644 ---- a/tc/tc_util.h -+++ b/tc/tc_util.h -@@ -55,6 +55,7 @@ struct exec_util { - }; - - extern const char *get_tc_lib(void); -+extern const char *get_tc_datadir(void); - - extern struct qdisc_util *get_qdisc_kind(const char *str); - extern struct filter_util *get_filter_kind(const char *str); Copied: iproute2/repos/testing-x86_64/iproute2-fhs.patch (from rev 265530, iproute2/trunk/iproute2-fhs.patch) =================================================================== --- testing-x86_64/iproute2-fhs.patch (rev 0) +++ testing-x86_64/iproute2-fhs.patch 2016-04-20 13:14:30 UTC (rev 265531) @@ -0,0 +1,87 @@ +diff --git a/Makefile b/Makefile +index 67176be..6549447 100644 +--- a/Makefile ++++ b/Makefile +@@ -13,7 +13,7 @@ DBM_INCLUDE:=$(DESTDIR)/usr/include + + SHARED_LIBS = y + +-DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" ++DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DDATADIR=\"$(DATADIR)\" + ifneq ($(SHARED_LIBS),y) + DEFINES+= -DNO_SHARED_LIBS + endif +diff --git a/netem/Makefile b/netem/Makefile +index e52e125..5b4d283 100644 +--- a/netem/Makefile ++++ b/netem/Makefile +@@ -20,9 +20,9 @@ stats: stats.c + $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm + + install: all +- mkdir -p $(DESTDIR)$(LIBDIR)/tc ++ mkdir -p $(DESTDIR)$(DATADIR)/tc + for i in $(DISTDATA); \ +- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \ ++ do install -m 644 $$i $(DESTDIR)$(DATADIR)/tc; \ + done + + clean: +diff --git a/tc/q_netem.c b/tc/q_netem.c +index cd990a0..7d4e71f 100644 +--- a/tc/q_netem.c ++++ b/tc/q_netem.c +@@ -113,7 +113,7 @@ static int get_distribution(const char *type, __s16 *data, int maxdata) + char *line = NULL; + char name[128]; + +- snprintf(name, sizeof(name), "%s/%s.dist", get_tc_lib(), type); ++ snprintf(name, sizeof(name), "%s/%s.dist", get_tc_datadir(), type); + if ((f = fopen(name, "r")) == NULL) { + fprintf(stderr, "No distribution data for %s (%s: %s)\n", + type, name, strerror(errno)); +diff --git a/tc/tc_util.c b/tc/tc_util.c +index aa6de24..22bb6d5 100644 +--- a/tc/tc_util.c ++++ b/tc/tc_util.c +@@ -32,6 +32,10 @@ + #define LIBDIR "/usr/lib" + #endif + ++#ifndef DATADIR ++#define DATADIR "/usr/share" ++#endif ++ + static struct db_names *cls_names = NULL; + + #define NAMES_DB "/etc/iproute2/tc_cls" +@@ -73,6 +77,17 @@ const char *get_tc_lib(void) + return lib_dir; + } + ++const char *get_tc_datadir(void) ++{ ++ const char *data_dir; ++ ++ data_dir = getenv("TC_DATA_DIR"); ++ if (!data_dir) ++ data_dir = DATADIR "/tc/"; ++ ++ return data_dir; ++} ++ + int get_qdisc_handle(__u32 *h, const char *str) + { + __u32 maj; +diff --git a/tc/tc_util.h b/tc/tc_util.h +index 61e60b1..6d448de 100644 +--- a/tc/tc_util.h ++++ b/tc/tc_util.h +@@ -55,6 +55,7 @@ struct exec_util { + }; + + extern const char *get_tc_lib(void); ++extern const char *get_tc_datadir(void); + + extern struct qdisc_util *get_qdisc_kind(const char *str); + extern struct filter_util *get_filter_kind(const char *str);