diff options
| author | James Meyer <james.meyer@operamail.com> | 2012-04-23 21:12:08 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2012-04-23 21:12:08 (GMT) |
| commit | 4bc7351abd5eae587f2f01dc349329ac29fd8b17 (patch) | |
| tree | b3c8eec80ccb1e73e9a15ebf7be3f79a44083e50 /abs/extra/sapphire/sapphire.patch | |
| parent | df3c3c139d7eedad4ab8be383c66a5518322157c (diff) | |
| parent | 8c0d396181e43158de3f54c479456ca7ed052248 (diff) | |
| download | linhes_pkgbuild-4bc7351abd5eae587f2f01dc349329ac29fd8b17.zip linhes_pkgbuild-4bc7351abd5eae587f2f01dc349329ac29fd8b17.tar.gz linhes_pkgbuild-4bc7351abd5eae587f2f01dc349329ac29fd8b17.tar.bz2 | |
Merge branch 'testing' of git@linhes.org:linhes_pkgbuild into testing
Diffstat (limited to 'abs/extra/sapphire/sapphire.patch')
| -rw-r--r-- | abs/extra/sapphire/sapphire.patch | 45 |
1 files changed, 32 insertions, 13 deletions
diff --git a/abs/extra/sapphire/sapphire.patch b/abs/extra/sapphire/sapphire.patch index ddd0653..93e4047 100644 --- a/abs/extra/sapphire/sapphire.patch +++ b/abs/extra/sapphire/sapphire.patch @@ -1,24 +1,43 @@ -diff -ruaN sapphire-3.2.orig//Makefile sapphire-3.2/Makefile ---- sapphire-3.2.orig//Makefile 2012-04-12 18:00:50.000000000 +0000 -+++ sapphire-3.2/Makefile 2012-04-22 08:42:19.000000000 +0000 -@@ -4,7 +4,7 @@ - # +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 +@@ -5,7 +5,7 @@ MODNAME=sapphire + MODSOURCE=$(MODNAME).c CONFLICTS=hid_topseed -BLACKLIST=/etc/modprobe.d/blacklist-$(CONFLICTS).conf +BLACKLIST=$(DESTDIR)/etc/modprobe.d/blacklist-$(CONFLICTS).conf + KEYMAP_SCRIPT=sapphire_keymap.sh + EXTRACT_KEYDEFS=extract_keydefs.sh + INPUT_H=/usr/include/linux/input.h +@@ -39,13 +39,13 @@ - ## MODPARMS is not used any more, but we have to nuke old copies to prevent issues: - MODPARMS=/etc/modprobe.d/$(MODNAME).conf -@@ -49,8 +49,8 @@ + 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) ;\ +- [ -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 @@ depmod - install: $(MODNAME).ko clean_modparms modloader $(BLACKLIST) -- cp sapphire_keymap.sh /usr/local/bin/ -- chmod a+rx /usr/local/bin/sapphire_keymap.sh + install: $(MODNAME).ko clean_modparms modinstall $(BLACKLIST) $(KEYMAP_SCRIPT) +- install -m 0755 $(KEYMAP_SCRIPT) /usr/local/bin/ - sync -+# cp sapphire_keymap.sh /usr/local/bin/ -+# chmod a+rx /usr/local/bin/sapphire_keymap.sh ++# install -m 0755 $(KEYMAP_SCRIPT) /usr/local/bin/ +# sync all: install |