diff options
Diffstat (limited to 'abs')
-rw-r--r-- | abs/core/LinHES-config/PKGBUILD | 6 | ||||
-rwxr-xr-x | abs/core/LinHES-config/install_proxy.sh | 13 | ||||
-rwxr-xr-x | abs/core/LinHES-config/mv_advanced.py | 15 | ||||
-rwxr-xr-x | abs/core/LinHES-system/LinHES-run | 7 | ||||
-rwxr-xr-x | abs/core/LinHES-system/LinHES-session | 53 | ||||
-rw-r--r-- | abs/core/LinHES-system/PKGBUILD | 6 | ||||
-rw-r--r-- | abs/core/fluxbox/PKGBUILD | 5 | ||||
-rw-r--r-- | abs/core/fluxbox/fluxbox.install | 11 | ||||
-rw-r--r-- | abs/core/fluxbox/keys | 17 | ||||
-rw-r--r-- | abs/core/mythinstall/PKGBUILD | 2 | ||||
-rw-r--r-- | abs/core/mythtv/stable-0.25/git_src/git_hash | 2 | ||||
-rw-r--r-- | abs/core/mythtv/stable-0.25/git_src/git_hash_web | 2 | ||||
-rw-r--r-- | abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD | 2 | ||||
-rw-r--r-- | abs/core/mythtv/stable-0.25/mythtv/PKGBUILD | 6 | ||||
-rw-r--r-- | abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml | 4 | ||||
-rw-r--r-- | abs/core/mythtv/stable-0.25/mythtv/myth_settings.patch | 8 | ||||
-rw-r--r-- | abs/core/mythtv/stable-0.25/mythweb/PKGBUILD | 2 | ||||
-rw-r--r-- | abs/extra/sapphire/PKGBUILD | 6 | ||||
-rw-r--r-- | abs/extra/sapphire/sapphire.patch | 86 |
19 files changed, 171 insertions, 82 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index d30fc63..e872bcf 100644 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.3 -pkgrel=76 +pkgrel=78 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config ) pkgdesc="Install and configure your system" depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' @@ -109,7 +109,7 @@ md5sums=('18af4fe481e1fc2ae02050026eb5cd27' '16b98fcb3753ef6cfc35075c326d30e4' 'e36da536dd651ef182e7642337889e77' '985891a43f7c4c983eb2a362162f1a0f' - '3f5693c76c7e483dd3c2184bc2546c82' + '13172731c8b08d669336da31cece5775' '5a31addfbdc1154b05997f972a32fa33' 'c20f73d4da5d7e15e1f3eb85c7dcb49a' '68199e861c2933ccbb84735b9b440157' @@ -127,7 +127,7 @@ md5sums=('18af4fe481e1fc2ae02050026eb5cd27' '9151c74fcaf18ec4cf5e757cfdbc7017' '3d1e4a119f38cff0498bf8a67e94e4b3' '71fd2d0d448fc2fcd15415a1beed7109' - 'b83072f08725f1216a4d31e02d60c5e5' + '61ccbf573ee196e3edf53a512820b431' 'e1715bbbabd42e7419755b09f60734aa' 'b845de3e05c1734cce4b9ac5e8f1baaf' '6801f87992b44118a12b6dfe6ea68127' diff --git a/abs/core/LinHES-config/install_proxy.sh b/abs/core/LinHES-config/install_proxy.sh index 2449874..c2a450d 100755 --- a/abs/core/LinHES-config/install_proxy.sh +++ b/abs/core/LinHES-config/install_proxy.sh @@ -137,14 +137,18 @@ case $1 in #if host is found, then check to see if it's online #if hoip matchs my ip assume it's ok echo "network check my hostname $hostname" - hout=`host $hostname|head -n1` + echo "Check of hostname with host: $hout" + host $hostname status=$? + + hout=`host $hostname|head -n1` hoip=`echo $hout|awk '{print $4}'` if [ $hoip = found: ] then status=1 fi + if [ $hoip = "out;" ] then #;; connection timed out; no servers could be reached @@ -152,8 +156,11 @@ case $1 in status=1 fi - unkownhost=`host unkown.linhes.org |head -n1 ` - unkownhostip=`echo $unkownhost |awk '{print $4}'` + if [ $status = 0 ] + then + unkownhost=`host unkown.linhes.org |head -n1 ` + unkownhostip=`echo $unkownhost |awk '{print $4}'` + fi #found host, now grab the ip if [ $status = 0 ] diff --git a/abs/core/LinHES-config/mv_advanced.py b/abs/core/LinHES-config/mv_advanced.py index 7608604..fdcd1e2 100755 --- a/abs/core/LinHES-config/mv_advanced.py +++ b/abs/core/LinHES-config/mv_advanced.py @@ -34,7 +34,7 @@ def setup_pacman(create_link): else: logging.info(" Pacman link will not be created") return -def setup_ncid_client(runclient): +def setup_ncid_client(runclient,runserver): logging.debug(" Configuring ncid client") if runclient == "1" : mv_common.pacinstall("ncid") @@ -385,14 +385,13 @@ def setup_advanced(systemconfig,data_config): create_link = True setup_pacman(create_link) - setup_ncid_client(systemconfig.get("ncidclient")) - setup_ncid_daemon(systemconfig.get("Runncidd")) - #setup_ncid_client(systemconfig.get("dbhost"), - #systemconfig.get("TEMPLATES")+"/ncid.conf.template") - #setup_ncid_daemon(systemconfig.get("nciddSerialPort"), - #systemconfig.get("TEMPLATES")+"/ncidd.conf.template", - #systemconfig.get("Runncidd")) + + if (( systemconfig.get("SystemType") == "Standalone" ) or (systemconfig.get("SystemType") == "Master_backend" )) : + setup_ncid_daemon(systemconfig.get("Runncidd")) + + setup_ncid_client(systemconfig.get("ncidclient"),systemconfig.get("Runncidd")) + setup_splash(systemconfig.get("Usebootsplash")) if data_config.SYSTEMTYPE == "MythVantage": diff --git a/abs/core/LinHES-system/LinHES-run b/abs/core/LinHES-system/LinHES-run index 64fb2bc..0de0feb 100755 --- a/abs/core/LinHES-system/LinHES-run +++ b/abs/core/LinHES-system/LinHES-run @@ -1,4 +1,11 @@ #!/bin/sh +exit 0 +################################################################ +# WARNING THIS FILE IS DEPRECATED +# any changes to this file must also be made to LinHES-session +# +# +############################################################### function msg(){ echo -e "$1" | osd_cat --pos=middle --align=center --offset=200 --delay=5 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font & } diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session index f01e569..918406d 100755 --- a/abs/core/LinHES-system/LinHES-session +++ b/abs/core/LinHES-system/LinHES-session @@ -345,35 +345,34 @@ function set_background() if [ x$WM = "x" ] then - fluxbox > /var/log/fluxbox.log 2>&1 - -else - #if using mythvantage style, start the WM right away - # this is done so that starting mythtv can loop. - $WM & - pid=$! - mouse_move - keylaunch - set_background - unclutter - load_nvidia_settings - run_tilda - start_screensaver - show_help_tip - notify_scan & - update_apple_trailers - - first_configure - start_myth - - # wait for the windowmanger - #This will make the session wait on the WM to exit. - if [ x$STARTUP_STYLE != xmythvantage ] - then - wait $pid - fi +# fluxbox > /var/log/fluxbox.log 2>&1 + WM=fluxbox +fi +#if using mythvantage style, start the WM right away +# this is done so that starting mythtv can loop. +$WM & +pid=$! +mouse_move +keylaunch +set_background +unclutter +load_nvidia_settings +run_tilda +start_screensaver +show_help_tip +notify_scan & +update_apple_trailers +first_configure +start_myth + +# wait for the windowmanger +#This will make the session wait on the WM to exit. +if [ x$STARTUP_STYLE != xmythvantage ] +then + wait $pid fi + diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index 3a0c60f..6881e3c 100644 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=2 -pkgrel=50 +pkgrel=52 arch=('i686') MVDIR=$startdir/pkg/usr/LH BINDIR=$startdir/pkg/usr/bin @@ -52,13 +52,13 @@ build() { mkdir $startdir/pkg/etc/logrotate.d cp $startdir/myth_mtc.lr $startdir/pkg/etc/logrotate.d } -md5sums=('e62397288e9b3b41c5ca2a73500db865' +md5sums=('d1a5963c5a440a608031c6d750232633' '5881bdb43d578ec3a79d1f77ea58a3db' 'a875ee97f86e46f34a741c2bc455f894' '76b2637cac0452b3acdbeeb4e8a5474b' 'd1f27cb422010077c841376526fe46ea' '2ef9f945e034119f77d9b6beb17e4fa5' - 'c2c7b3d2d885fb4bdc393a69efba6f01' + '4b4585ccba30595cf958d202997c57f7' 'cbe4cba14fa9d01a62e2196edc1bd98b' 'dc3eef2a624754e16805d72bbe488b67' 'dc0be354ce77ba2b89868fc29b942c43' diff --git a/abs/core/fluxbox/PKGBUILD b/abs/core/fluxbox/PKGBUILD index 01f8f14..4757d26 100644 --- a/abs/core/fluxbox/PKGBUILD +++ b/abs/core/fluxbox/PKGBUILD @@ -3,7 +3,7 @@ pkgname=fluxbox pkgver=1.3.1 -pkgrel=5 +pkgrel=6 pkgdesc="A lightweight and highly-configurable window manager" arch=('i686' 'x86_64') url="http://www.fluxbox.org" @@ -14,6 +14,7 @@ optdepends=('xorg-xmessage: for using the fbsetbg and fluxbox-generate_menu util options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ fluxbox.desktop keys fluxbox_fullscreen_focus.patch) +install=fluxbox.install build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -35,5 +36,5 @@ package() { } md5sums=('0eaa940a69c0a876a520bb85d67b8bec' 'eeae9c88a2526ac0bd8afcd9ce97f9ed' - '501a4d423db5493fa2f2e5eb30d72e6f' + 'c6d548dbefd76bad117db23bdf927bcd' '7d2fff845c9f951e925b9adcd1053242') diff --git a/abs/core/fluxbox/fluxbox.install b/abs/core/fluxbox/fluxbox.install new file mode 100644 index 0000000..643dffb --- /dev/null +++ b/abs/core/fluxbox/fluxbox.install @@ -0,0 +1,11 @@ +post_upgrade() { + if [ -e /home/mythtv/.fluxbox/keys ] + then + mv -f /home/mythtv/.fluxbox/keys /home/mythtv/.fluxbox/keys.backup-linhes + echo "#########################################" + echo "Created backup copy of .fluxbox/keys" + echo "fluxbox keys is no longer used for linhes specific shortcuts" + echo "if there were custom user keys, they will need to be restored" + echo "#########################################" + fi +} diff --git a/abs/core/fluxbox/keys b/abs/core/fluxbox/keys index 79abb52..0871a48 100644 --- a/abs/core/fluxbox/keys +++ b/abs/core/fluxbox/keys @@ -28,14 +28,13 @@ Mod1 F9 :Workspace 9 Mod1 F10 :Workspace 10 Mod1 F11 :Workspace 11 Mod1 F12 :Workspace 12 -Mod1 x :ExecCommand tvterm.sh -Mod1 s :ExecCommand mythtv-setup -#Mod1 m :ExecCommand mythfrontend --logfile /var/log/mythtv/mythfrontend.log -Mod1 m :ExecCommand /usr/LH/bin/mythfrontend-start -Mod1 1 :ExecCommand sudo sv start mythbackend -Mod1 2 :ExecCommand sudo sv stop mythbackend -Mod1 3 :ExecCommand sudo sv restart mythbackend -Mod1 h :ExecCommand MythVantage -H -Mod1 Control u :ExecCommand /usr/LH/bin/unclutter-toggle.sh +#Mod1 x :ExecCommand tvterm.sh +#Mod1 s :ExecCommand mythtv-setup +#Mod1 m :ExecCommand /usr/LH/bin/mythfrontend-start +#Mod1 1 :ExecCommand sudo sv start mythbackend +#Mod1 2 :ExecCommand sudo sv stop mythbackend +#Mod1 3 :ExecCommand sudo sv restart mythbackend +#Mod1 h :ExecCommand MythVantage -H +#Mod1 Control u :ExecCommand /usr/LH/bin/unclutter-toggle.sh Mod1 Escape :GotoWindow {1} Mod4 w :Restart wmaker diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD index 6d6e615..21a084b 100644 --- a/abs/core/mythinstall/PKGBUILD +++ b/abs/core/mythinstall/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jams pkgname=mythinstall pkgver=3 -pkgrel=24 +pkgrel=26 pkgdesc="LinHES installer/systemconfig GUI." arch=i686 depends=('mythtv>=0.25') diff --git a/abs/core/mythtv/stable-0.25/git_src/git_hash b/abs/core/mythtv/stable-0.25/git_src/git_hash index 8df731d..a49d4a9 100644 --- a/abs/core/mythtv/stable-0.25/git_src/git_hash +++ b/abs/core/mythtv/stable-0.25/git_src/git_hash @@ -1 +1 @@ -2a2af9f7f7b66c13b7cb4e65149acbf6088f4cbf +c22ac5272ac23a6a8a45653aaf8804339cc06a4a diff --git a/abs/core/mythtv/stable-0.25/git_src/git_hash_web b/abs/core/mythtv/stable-0.25/git_src/git_hash_web index 0bcf85d..814e09b 100644 --- a/abs/core/mythtv/stable-0.25/git_src/git_hash_web +++ b/abs/core/mythtv/stable-0.25/git_src/git_hash_web @@ -1 +1 @@ -1d056f77dc29045008b52b82e90bc935ff1ab948 +8c43d8da31d738c75ec6abc9daff2772b16310c8 diff --git a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD index 2c3db17..e6afd7b 100644 --- a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD @@ -12,7 +12,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.25 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.mythtv.org" diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD index aaa1a12..43f4b25 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD @@ -6,7 +6,7 @@ pkgname=mythtv pkgver=0.25 -pkgrel=4 +pkgrel=5 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') @@ -118,7 +118,7 @@ package() { # patch the xml LinHES style cp -r ${startdir}/menu-xml/*.xml ${pkgdir}/usr/share/mythtv/themes/defaultmenu/ - mv ${pkgdir}/usr/share/mythtv/themes/defaultmenu/is.xml ${pkgdir}/usr/share/mythtv/ +# mv ${pkgdir}/usr/share/mythtv/themes/defaultmenu/is.xml ${pkgdir}/usr/share/mythtv/ cd ${pkgdir}/usr/share/mythtv patch -p0 < ${startdir}/menu-xml/mainmenu.xml.patch || return 1 patch -p0 < ${startdir}/menu-xml/optical_menu.xml.patch || return 1 @@ -136,7 +136,7 @@ package() { md5sums=('7ef6de58240e7aad389a0b13d91b1cf6' '2babd4b8e146a7538d18dcd55695b0be' - '55c079404303ec4edeb1a8af1cf16597' + 'c4db7784c5107ae846fd795a4dabe0bc' 'f735805a80b0d1180dee01f9df1b7004' 'f407d6af23e74a49540755420f84fa58' '5469d9921b726db750b991c87d226158') diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml index ac52497..c436423 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml +++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/HOST_SETTINGS.xml @@ -38,9 +38,11 @@ <button> <type>MV_SOFTWARE_MENU</type> <text>Software</text> - <action>EXEC mythinstall -s plugins </action> + <action>EXEC mythinstall -s plugins,software </action> </button> + + <button> <type>MV_SHUTDOWN_SETUP_MENU</type> <text>Shutdown Settings</text> diff --git a/abs/core/mythtv/stable-0.25/mythtv/myth_settings.patch b/abs/core/mythtv/stable-0.25/mythtv/myth_settings.patch index 5fbcddf..ebc6264 100644 --- a/abs/core/mythtv/stable-0.25/mythtv/myth_settings.patch +++ b/abs/core/mythtv/stable-0.25/mythtv/myth_settings.patch @@ -1232,14 +1232,6 @@ diff --git a/mythtv/programs/mythutil/mythutil.pro b/mythtv/programs/mythutil/my index 774528f..5be3ec7 100644 --- a/mythtv/programs/mythutil/mythutil.pro +++ b/mythtv/programs/mythutil/mythutil.pro -@@ -3,6 +3,7 @@ include ( ../../version.pro ) - include ( ../programs-libs.pro ) - - QT += network sql -+QT += xml - - TEMPLATE = app - CONFIG += thread @@ -10,7 +11,7 @@ TARGET = mythutil target.path = $${PREFIX}/bin INSTALLS = target diff --git a/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD index f78c224..8d4e6a6 100644 --- a/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD +++ b/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythweb pkgver=0.25 -pkgrel=1 +pkgrel=2 commit_hash=`cat ../git_src/git_hash_web` diff --git a/abs/extra/sapphire/PKGBUILD b/abs/extra/sapphire/PKGBUILD index c82d2ab..034bea2 100644 --- a/abs/extra/sapphire/PKGBUILD +++ b/abs/extra/sapphire/PKGBUILD @@ -2,7 +2,7 @@ pkgname=sapphire _kernver=`uname -r` -pkgver=3.5 +pkgver=4.2 pkgrel=1 pkgdesc="Kernel module for Sapphire remote" arch=('i686' 'x86_64') @@ -30,5 +30,5 @@ package() { install -m 644 keymap.default ${pkgdir}/usr/share/doc/sapphire rm -fr ${pkgdir}/lib/modules/$_kernver/modules* } -md5sums=('b1c97f4328810f2dfbd6d8721d5950c5' - '90fcf01a3b96eb49a69d20bca74167a2') +md5sums=('fe72676bc6b68b5f000a98eec3972887' + '3a69715829fe7cf450d0ec8410c7a4eb') 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 |