From 47040d246daceff23739e44f4cbb38ebbf3bb593 Mon Sep 17 00:00:00 2001 From: ElonH Date: Fri, 10 Apr 2020 23:05:45 +0800 Subject: [PATCH] qos-gargoyle: fixed in SDK In iproute2, some of object, header, source files are used in qos-gargoyle. qos-gargoyle will find these files in build_dir. But if CONFIG_AUTOREMOVE is enable in SDK, an error "Header not found." will be raised. So one way is that copying these files to staging_dir. --- package/ctcgfw/qos-gargoyle/src/Makefile | 3 ++- package/network/utils/iproute2/Makefile | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package/ctcgfw/qos-gargoyle/src/Makefile b/package/ctcgfw/qos-gargoyle/src/Makefile index 674fc942d7..88aca6022d 100644 --- a/package/ctcgfw/qos-gargoyle/src/Makefile +++ b/package/ctcgfw/qos-gargoyle/src/Makefile @@ -1,6 +1,7 @@ BINDIR = /usr/sbin #TCDIR:=$(BUILD_DIR)/iproute2*/ip* -TCDIR:=$(shell if [ -e "${BUILD_DIR}/iproute2-full" ] ; then echo "${BUILD_DIR}/iproute2-full"/ip* ; else echo "${BUILD_DIR}/iproute2-tiny"/ip* ; fi ; ) +#TCDIR:=$(shell if [ -e "${BUILD_DIR}/iproute2-full" ] ; then echo "${BUILD_DIR}/iproute2-full"/ip* ; else echo "${BUILD_DIR}/iproute2-tiny"/ip* ; fi ; ) +TCDIR:=$(STAGING_DIR)/usr/lib/iproute2 #The ncurses library only needed if we remove the ONLYBG switch #below. Mostly for debug #LDLIBS += -lncurses diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index bbccd1a2f6..1af5edda03 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -145,6 +145,10 @@ define Build/InstallDev $(CP) $(PKG_BUILD_DIR)/include/{libgenl,libnetlink}.h $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/lib/libnetlink.a $(1)/usr/lib/ + # Hack for qos-gargoyle + $(INSTALL_DIR) $(1)/usr/lib/iproute2/{tc,lib,include} + $(CP) $(PKG_BUILD_DIR)/{tc,include,lib} $(1)/usr/lib/iproute2 + # Hack end endef define Package/ip-tiny/install