From 52c22b890725c238012ecd42c85f3d82d56a10af Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 22 Jan 2021 00:07:58 +0100 Subject: [PATCH] - dvb-apps: change 0001-Fix-generate-keynames.patch --- make/target-tools.mk | 5 +++-- patches/dvb-apps/0001-Fix-generate-keynames.patch | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/make/target-tools.mk b/make/target-tools.mk index c1ce7591..fd42400c 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -1895,9 +1895,10 @@ DVB-APPS_DIR = dvb-apps.$(DVB-APPS_VER) DVB-APPS_SOURCE = dvb-apps.$(DVB-APPS_VER) DVB-APPS_SITE = https://github.com/openpli-arm -DVB-APPS_DEPS = libiconv +DVB-APPS_DEPS = kernel libiconv DVB-APPS_MAKE_OPTS = \ + KERNEL_HEADERS=$(BUILD_DIR)/$(KERNEL_HEADERS) \ enable_shared=no \ PERL5LIB=$(PKG_BUILD_DIR)/util/scan \ @@ -1908,7 +1909,7 @@ dvb-apps: $(DVB-APPS_DEPS) | $(TARGET_DIR) $(CHDIR)/$(DVB-APPS_DIR); \ $(APPLY_PATCHES); \ $(MAKE_ENV) LDLIBS="-liconv" \ - $(MAKE) $(DVB-APPS_MAKE_OPTS) TARGET_DIR=$(TARGET_DIR); \ + $(MAKE) $(DVB-APPS_MAKE_OPTS); \ $(MAKE) $(DVB-APPS_MAKE_OPTS) install DESTDIR=$(TARGET_DIR) $(REMOVE)/$(DVB-APPS_DIR) $(TOUCH) diff --git a/patches/dvb-apps/0001-Fix-generate-keynames.patch b/patches/dvb-apps/0001-Fix-generate-keynames.patch index 59958f88..562b7f42 100644 --- a/patches/dvb-apps/0001-Fix-generate-keynames.patch +++ b/patches/dvb-apps/0001-Fix-generate-keynames.patch @@ -7,7 +7,7 @@ index 65a2273..34ae964 100644 # get DVB API version -VERSION_FILE := "/usr/include/linux/dvb/version.h" -+VERSION_FILE := "$(TARGET_DIR)/usr/include/linux/dvb/version.h" ++VERSION_FILE := "$(KERNEL_HEADERS)/include/linux/dvb/version.h" DVB_API_MAJOR := $(word 3, $(shell grep -m1 "DVB_API_VERSION" $(VERSION_FILE)) ) DVB_API_MINOR := $(word 3, $(shell grep -m1 "DVB_API_VERSION_MINOR" $(VERSION_FILE)) ) @@ -20,7 +20,7 @@ index 49d2b71..3633bc7 100644 echo >> $1 echo "static struct input_key_name key_name [] = {" >> $1 -for x in $(cat /usr/include/linux/input.h input_fake.h | \ -+for x in $(cat ${TARGET_DIR}/usr/include/linux/input.h input_fake.h | \ ++for x in $(cat ${KERNEL_HEADERS}/include/linux/input.h input_fake.h | \ egrep "#define[ \t]+KEY_" | grep -v KEY_MAX | \ cut -f 1 | cut -f 2 -d " " | sort -u) ; do echo " { \"$(echo $x | cut -b 5-)\", $x }," >> $1 @@ -29,7 +29,7 @@ index 49d2b71..3633bc7 100644 echo >> $1 echo "static struct input_key_name btn_name [] = {" >> $1 -for x in $(cat /usr/include/linux/input.h input_fake.h | \ -+for x in $(cat ${TARGET_DIR}/usr/include/linux/input.h input_fake.h | \ ++for x in $(cat ${KERNEL_HEADERS}/include/linux/input.h input_fake.h | \ egrep "#define[ \t]+BTN_" | \ cut -f 1 | cut -f 2 -d " " | sort -u) ; do echo " { \"$(echo $x | cut -b 5-)\", $x }," >> $1