diff options
Diffstat (limited to 'abs/extra/sapphire/sapphire.patch')
| -rw-r--r-- | abs/extra/sapphire/sapphire.patch | 86 |
1 files changed, 79 insertions, 7 deletions
diff --git a/abs/extra/sapphire/sapphire.patch b/abs/extra/sapphire/sapphire.patch index 93e4047..0305d91 100644 --- a/abs/extra/sapphire/sapphire.patch +++ b/abs/extra/sapphire/sapphire.patch @@ -1,6 +1,6 @@ -diff -ruaN sapphire-3.4.orig//Makefile sapphire-3.4/Makefile ---- sapphire-3.4.orig//Makefile 2012-04-23 02:33:11.000000000 +0000 -+++ sapphire-3.4/Makefile 2012-04-23 05:23:07.000000000 +0000 +diff -ruaN sapphire-4.2.orig//Makefile sapphire-4.2/Makefile +--- sapphire-4.2.orig//Makefile 2012-05-06 02:51:36.000000000 +0000 ++++ sapphire-4.2/Makefile 2012-05-14 02:12:57.000000000 +0000 @@ -5,7 +5,7 @@ MODNAME=sapphire MODSOURCE=$(MODNAME).c @@ -10,7 +10,7 @@ diff -ruaN sapphire-3.4.orig//Makefile sapphire-3.4/Makefile KEYMAP_SCRIPT=sapphire_keymap.sh EXTRACT_KEYDEFS=extract_keydefs.sh INPUT_H=/usr/include/linux/input.h -@@ -39,13 +39,13 @@ +@@ -39,12 +39,12 @@ modinstall: $(MODNAME).ko $(KEYMAP_SCRIPT) $(MAKE) -C $(KDIR)/build M=`pwd` modules_install @@ -19,25 +19,97 @@ diff -ruaN sapphire-3.4.orig//Makefile sapphire-3.4/Makefile - rmmod $(MODNAME) 2>/dev/null ;\ - rmmod $(CONFLICTS) 2>/dev/null ;\ - modprobe -v $(MODNAME) ;\ -- [ -e /etc/sapphire.keymap ] && ./$(KEYMAP_SCRIPT) /etc/sapphire.keymap ;\ - fi +# depmod $(KVER) +# @if [ "$(KVER)" = "$$(uname -r)" ]; then \ +# rmmod $(MODNAME) 2>/dev/null ;\ +# rmmod $(CONFLICTS) 2>/dev/null ;\ +# modprobe -v $(MODNAME) ;\ -+# [ -e /etc/sapphire.keymap ] && ./$(KEYMAP_SCRIPT) /etc/sapphire.keymap ;\ +# fi clean: $(MAKE) -C $(KDIR)/build M=`pwd` clean -@@ -62,7 +62,7 @@ +@@ -61,8 +61,8 @@ depmod install: $(MODNAME).ko clean_modparms modinstall $(BLACKLIST) $(KEYMAP_SCRIPT) - install -m 0755 $(KEYMAP_SCRIPT) /usr/local/bin/ +- [ -e /etc/sapphire.keymap ] && ./$(KEYMAP_SCRIPT) /etc/sapphire.keymap || exit 0 - sync +# install -m 0755 $(KEYMAP_SCRIPT) /usr/local/bin/ ++# [ -e /etc/sapphire.keymap ] && ./$(KEYMAP_SCRIPT) /etc/sapphire.keymap || exit 0 +# sync all: install +diff -ruaN sapphire-4.2.orig//Makefile~ sapphire-4.2/Makefile~ +--- sapphire-4.2.orig//Makefile~ 1970-01-01 00:00:00.000000000 +0000 ++++ sapphire-4.2/Makefile~ 2012-05-06 02:51:36.000000000 +0000 +@@ -0,0 +1,68 @@ ++# ++# Makefile and (un-)Installer for Sapphire remote control driver, ++# by Mark Lord 2012. ++# ++MODNAME=sapphire ++MODSOURCE=$(MODNAME).c ++CONFLICTS=hid_topseed ++BLACKLIST=/etc/modprobe.d/blacklist-$(CONFLICTS).conf ++KEYMAP_SCRIPT=sapphire_keymap.sh ++EXTRACT_KEYDEFS=extract_keydefs.sh ++INPUT_H=/usr/include/linux/input.h ++ ++## MODPARMS is not used any more, but we have to nuke old copies to prevent issues: ++MODPARMS=/etc/modprobe.d/$(MODNAME).conf ++ ++KVER ?= `uname -r` ++KDIR = /lib/modules/$(KVER) ++obj-m += $(MODNAME).o ++ ++#EXTRA_CFLAGS += -Werror ++ ++default: kmod $(KEYMAP_SCRIPT) ++ ++kmod: ++ $(MAKE) -C $(KDIR)/build M=`pwd` modules ++ ++$(MODNAME).ko: $(MODSOURCE) $(MODNAME).h ++ $(MAKE) kmod ++ ++$(KEYMAP_SCRIPT): $(EXTRACT_KEYDEFS) $(KEYMAP_SCRIPT).part1 $(KEYMAP_SCRIPT).part3 $(MODNAME).h $(INPUT_H) ++ chmod 0755 $(EXTRACT_KEYDEFS) ++ ./$(EXTRACT_KEYDEFS) $(INPUT_H) $(MODNAME).h | cat $(KEYMAP_SCRIPT).part1 - $(KEYMAP_SCRIPT).part3 > $(KEYMAP_SCRIPT) ++ chmod 0755 $(KEYMAP_SCRIPT) ++ ++$(BLACKLIST): ++ @echo "Creating $(BLACKLIST)" ++ @echo "## $(CONFLICTS) Conflicts with $(MODNAME) driver" > $(BLACKLIST) ++ @echo "blacklist $(CONFLICTS)" >> $(BLACKLIST) ++ ++modinstall: $(MODNAME).ko $(KEYMAP_SCRIPT) ++ $(MAKE) -C $(KDIR)/build M=`pwd` modules_install ++ depmod $(KVER) ++ @if [ "$(KVER)" = "$$(uname -r)" ]; then \ ++ rmmod $(MODNAME) 2>/dev/null ;\ ++ rmmod $(CONFLICTS) 2>/dev/null ;\ ++ modprobe -v $(MODNAME) ;\ ++ fi ++ ++clean: ++ $(MAKE) -C $(KDIR)/build M=`pwd` clean ++ -rm -f $(KEYMAP_SCRIPT) ++ ++clean_modparms: ++ @if [ -e $(MODPARAMS) ]; then rm -f $(MODPARMS) ; fi ; exit 0 ++ ++uninstall: clean clean_modparms ++ -rmmod $(MODNAME) ++ -rm -f $(BLACKLIST) ++ -rm -f /usr/local/bin/$(KEYMAP_SCRIPT) ++ -rm -f $(KDIR)/extra/$(MODNAME).ko ++ depmod ++ ++install: $(MODNAME).ko clean_modparms modinstall $(BLACKLIST) $(KEYMAP_SCRIPT) ++ install -m 0755 $(KEYMAP_SCRIPT) /usr/local/bin/ ++ [ -e /etc/sapphire.keymap ] && ./$(KEYMAP_SCRIPT) /etc/sapphire.keymap || exit 0 ++ sync ++ ++all: install |