topaLE
/
ni-buildsystem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

- dvb-apps: change 0001-Fix-generate-keynames.patch

master
vanhofen 4 years ago
parent
e4ac395b3e
commit
52c22b8907
2 changed files with 6 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      make/target-tools.mk
  2. 6
      patches/dvb-apps/0001-Fix-generate-keynames.patch

5
make/target-tools.mk
View File

@ -1895,9 +1895,10 @@ DVB-APPS_DIR = dvb-apps.$(DVB-APPS_VER)
DVB-APPS_SOURCE = dvb-apps.$(DVB-APPS_VER) DVB-APPS_SOURCE = dvb-apps.$(DVB-APPS_VER)
DVB-APPS_SITE = https://github.com/openpli-arm DVB-APPS_SITE = https://github.com/openpli-arm
DVB-APPS_DEPS = libiconv DVB-APPS_DEPS = kernel libiconv
DVB-APPS_MAKE_OPTS = \ DVB-APPS_MAKE_OPTS = \
KERNEL_HEADERS=$(BUILD_DIR)/$(KERNEL_HEADERS) \
enable_shared=no \ enable_shared=no \
PERL5LIB=$(PKG_BUILD_DIR)/util/scan \ PERL5LIB=$(PKG_BUILD_DIR)/util/scan \
@ -1908,7 +1909,7 @@ dvb-apps: $(DVB-APPS_DEPS) | $(TARGET_DIR)
$(CHDIR)/$(DVB-APPS_DIR); \ $(CHDIR)/$(DVB-APPS_DIR); \
$(APPLY_PATCHES); \ $(APPLY_PATCHES); \
$(MAKE_ENV) LDLIBS="-liconv" \ $(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) $(MAKE) $(DVB-APPS_MAKE_OPTS) install DESTDIR=$(TARGET_DIR)
$(REMOVE)/$(DVB-APPS_DIR) $(REMOVE)/$(DVB-APPS_DIR)
$(TOUCH) $(TOUCH)

6
patches/dvb-apps/0001-Fix-generate-keynames.patch
View File

@ -7,7 +7,7 @@ index 65a2273..34ae964 100644
# get DVB API version # get DVB API version
-VERSION_FILE := "/usr/include/linux/dvb/version.h" -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_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)) ) 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 >> $1
echo "static struct input_key_name key_name [] = {" >> $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 /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 | \ egrep "#define[ \t]+KEY_" | grep -v KEY_MAX | \
cut -f 1 | cut -f 2 -d " " | sort -u) ; do cut -f 1 | cut -f 2 -d " " | sort -u) ; do
echo " { \"$(echo $x | cut -b 5-)\", $x }," >> $1 echo " { \"$(echo $x | cut -b 5-)\", $x }," >> $1
@ -29,7 +29,7 @@ index 49d2b71..3633bc7 100644
echo >> $1 echo >> $1
echo "static struct input_key_name btn_name [] = {" >> $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 /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_" | \ egrep "#define[ \t]+BTN_" | \
cut -f 1 | cut -f 2 -d " " | sort -u) ; do cut -f 1 | cut -f 2 -d " " | sort -u) ; do
echo " { \"$(echo $x | cut -b 5-)\", $x }," >> $1 echo " { \"$(echo $x | cut -b 5-)\", $x }," >> $1

Write Preview
Loading…
Cancel
Save