From: Romain Naour Date: Sat, 27 Dec 2014 21:58:26 +0000 (+0100) Subject: package/dvb-apps: rename patches to follow the new name convention X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d8b275b5dbc4ec51ed49a19f544696814898455e;p=buildroot.git package/dvb-apps: rename patches to follow the new name convention Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- diff --git a/package/dvb-apps/0001-Fix-generate-keynames.patch b/package/dvb-apps/0001-Fix-generate-keynames.patch new file mode 100644 index 0000000000..498607d97d --- /dev/null +++ b/package/dvb-apps/0001-Fix-generate-keynames.patch @@ -0,0 +1,30 @@ +Fix generate-keynames.sh script for cross-compilation + +generate-keynames.sh reads /usr/include/linux to find the keyname +symbols. However, when cross-compiling, the include path points +somewhere else. Allow the user to pass CROSS_ROOT to point to the +root of the cross-compilation environment. + +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +--- +diff -rup dvb-apps-83c746462ccb.orig/util/av7110_loadkeys/generate-keynames.sh dvb-apps-83c746462ccb/util/av7110_loadkeys/generate-keynames.sh +--- dvb-apps-83c746462ccb.orig/util/av7110_loadkeys/generate-keynames.sh 2012-12-06 10:38:07.000000000 +0100 ++++ dvb-apps-83c746462ccb/util/av7110_loadkeys/generate-keynames.sh 2013-08-29 21:47:09.717991439 +0200 +@@ -18,7 +18,7 @@ echo "};" >> $1 + echo >> $1 + 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 ${CROSS_ROOT}/usr/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 +@@ -26,7 +26,7 @@ done + echo "};" >> $1 + 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 ${CROSS_ROOT}/usr/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 diff --git a/package/dvb-apps/0002-Fix-compiler-warning-flags.patch b/package/dvb-apps/0002-Fix-compiler-warning-flags.patch new file mode 100644 index 0000000000..9da0408a20 --- /dev/null +++ b/package/dvb-apps/0002-Fix-compiler-warning-flags.patch @@ -0,0 +1,25 @@ +When building for avr32, the build fails as follows. + + cc1: error: unrecognized command line option "-Wno-packed-bitfield-compat" + +An example of an autobuild failure arising from this is the following. + + http://autobuild.buildroot.net/results/92e/92e472004812a3616f62d766a9ea07a997a66e89/ + +Clearly, not all toolchains provide a gcc that understands +the -Wno-packed-bitfield-compat flag; remove usage of this flag. + +Signed-off-by: Simon Dawson + +diff -Nurp a/util/scan/Makefile b/util/scan/Makefile +--- a/util/scan/Makefile 2013-11-24 17:04:10.000000000 +0000 ++++ b/util/scan/Makefile 2013-12-13 09:37:11.967975173 +0000 +@@ -14,7 +14,7 @@ inst_bin = $(binaries) + + removing = atsc_psip_section.c atsc_psip_section.h + +-CPPFLAGS += -Wno-packed-bitfield-compat -D__KERNEL_STRICT_NAMES ++CPPFLAGS += -D__KERNEL_STRICT_NAMES + + .PHONY: all + diff --git a/package/dvb-apps/0003-support-static-only-build.patch b/package/dvb-apps/0003-support-static-only-build.patch new file mode 100644 index 0000000000..236f1a32f6 --- /dev/null +++ b/package/dvb-apps/0003-support-static-only-build.patch @@ -0,0 +1,20 @@ +Make.rules: don't build .so libraries when static=1 + +Signed-off-by: Thomas Petazzoni + +Index: b/Make.rules +=================================================================== +--- a/Make.rules ++++ b/Make.rules +@@ -9,7 +9,11 @@ + CFLAGS_LIB ?= -fPIC + CFLAGS += $(CFLAGS_LIB) + ++ifeq ($(static),1) ++libraries = $(lib_name).a ++else + libraries = $(lib_name).so $(lib_name).a ++endif + + .PHONY: library + diff --git a/package/dvb-apps/dvb-apps-0001-Fix-generate-keynames.patch b/package/dvb-apps/dvb-apps-0001-Fix-generate-keynames.patch deleted file mode 100644 index 498607d97d..0000000000 --- a/package/dvb-apps/dvb-apps-0001-Fix-generate-keynames.patch +++ /dev/null @@ -1,30 +0,0 @@ -Fix generate-keynames.sh script for cross-compilation - -generate-keynames.sh reads /usr/include/linux to find the keyname -symbols. However, when cross-compiling, the include path points -somewhere else. Allow the user to pass CROSS_ROOT to point to the -root of the cross-compilation environment. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- -diff -rup dvb-apps-83c746462ccb.orig/util/av7110_loadkeys/generate-keynames.sh dvb-apps-83c746462ccb/util/av7110_loadkeys/generate-keynames.sh ---- dvb-apps-83c746462ccb.orig/util/av7110_loadkeys/generate-keynames.sh 2012-12-06 10:38:07.000000000 +0100 -+++ dvb-apps-83c746462ccb/util/av7110_loadkeys/generate-keynames.sh 2013-08-29 21:47:09.717991439 +0200 -@@ -18,7 +18,7 @@ echo "};" >> $1 - echo >> $1 - 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 ${CROSS_ROOT}/usr/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 -@@ -26,7 +26,7 @@ done - echo "};" >> $1 - 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 ${CROSS_ROOT}/usr/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 diff --git a/package/dvb-apps/dvb-apps-0002-Fix-compiler-warning-flags.patch b/package/dvb-apps/dvb-apps-0002-Fix-compiler-warning-flags.patch deleted file mode 100644 index 9da0408a20..0000000000 --- a/package/dvb-apps/dvb-apps-0002-Fix-compiler-warning-flags.patch +++ /dev/null @@ -1,25 +0,0 @@ -When building for avr32, the build fails as follows. - - cc1: error: unrecognized command line option "-Wno-packed-bitfield-compat" - -An example of an autobuild failure arising from this is the following. - - http://autobuild.buildroot.net/results/92e/92e472004812a3616f62d766a9ea07a997a66e89/ - -Clearly, not all toolchains provide a gcc that understands -the -Wno-packed-bitfield-compat flag; remove usage of this flag. - -Signed-off-by: Simon Dawson - -diff -Nurp a/util/scan/Makefile b/util/scan/Makefile ---- a/util/scan/Makefile 2013-11-24 17:04:10.000000000 +0000 -+++ b/util/scan/Makefile 2013-12-13 09:37:11.967975173 +0000 -@@ -14,7 +14,7 @@ inst_bin = $(binaries) - - removing = atsc_psip_section.c atsc_psip_section.h - --CPPFLAGS += -Wno-packed-bitfield-compat -D__KERNEL_STRICT_NAMES -+CPPFLAGS += -D__KERNEL_STRICT_NAMES - - .PHONY: all - diff --git a/package/dvb-apps/dvb-apps-0003-support-static-only-build.patch b/package/dvb-apps/dvb-apps-0003-support-static-only-build.patch deleted file mode 100644 index 236f1a32f6..0000000000 --- a/package/dvb-apps/dvb-apps-0003-support-static-only-build.patch +++ /dev/null @@ -1,20 +0,0 @@ -Make.rules: don't build .so libraries when static=1 - -Signed-off-by: Thomas Petazzoni - -Index: b/Make.rules -=================================================================== ---- a/Make.rules -+++ b/Make.rules -@@ -9,7 +9,11 @@ - CFLAGS_LIB ?= -fPIC - CFLAGS += $(CFLAGS_LIB) - -+ifeq ($(static),1) -+libraries = $(lib_name).a -+else - libraries = $(lib_name).so $(lib_name).a -+endif - - .PHONY: library -