mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-09 18:45:54 +02:00
w_scan: update to 20121111.
This commit is contained in:
Arne Fitzenreiter
@@ -1,2 +1,2 @@
|
||||
opt/vdr/bin/w_scan
|
||||
opt/vdr/bin/w_scan_start
|
||||
usr/bin/w_scan
|
||||
#usr/share/man/man1/w_scan.1
|
||||
|
||||
16
lfs/w_scan
16
lfs/w_scan
@@ -1,7 +1,7 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
|
||||
# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
|
||||
# #
|
||||
# This program is free software: you can redistribute it and/or modify #
|
||||
# it under the terms of the GNU General Public License as published by #
|
||||
@@ -25,7 +25,7 @@
|
||||
include Config
|
||||
|
||||
|
||||
VER = 20080105
|
||||
VER = 20121111
|
||||
|
||||
THISAPP = w_scan-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.bz2
|
||||
@@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PROG = w_scan
|
||||
PAK_VER = 1
|
||||
PAK_VER = 2
|
||||
|
||||
DEPS = ""
|
||||
|
||||
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 9541244559d2da9442a137f7891d45d3
|
||||
$(DL_FILE)_MD5 = 30da05747fed9988e11ebc7745f5e71f
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -78,10 +78,8 @@ $(subst %,%_MD5,$(objects)) :
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && patch < $(DIR_SRC)/src/patches/w_scan-ipfire.patch
|
||||
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
|
||||
-mkdir -pv /opt/vdr/bin
|
||||
cd $(DIR_APP) && install -m 755 w_scan /opt/vdr/bin/
|
||||
cd $(DIR_APP) && install -m 755 w_scan_start.sh /opt/vdr/bin/w_scan_start
|
||||
cd $(DIR_APP) && ./configure --prefix=/usr
|
||||
cd $(DIR_APP) && make $(MAKETUNING)
|
||||
cd $(DIR_APP) && make install
|
||||
@rm -rf $(DIR_APP)
|
||||
@$(POSTBUILD)
|
||||
|
||||
@@ -1,130 +0,0 @@
|
||||
diff -Naur w_scan_start.sh w_scan_start.sh
|
||||
--- w_scan_start.sh 2008-01-05 19:58:44.000000000 +0100
|
||||
+++ w_scan_start.sh 2008-05-14 18:29:21.000000000 +0200
|
||||
@@ -6,11 +6,11 @@
|
||||
# - 20060812: first version
|
||||
# - 20060822: many improvements
|
||||
# cu@vdr-portal
|
||||
-#
|
||||
+# - 20080514: patches for ipfire by arne_f@ipfire.org
|
||||
#######################################################
|
||||
|
||||
umask 022
|
||||
-export PATH="$(pwd):/bin:/usr/bin:/sbin:/usr/sbin"
|
||||
+export PATH="$(pwd):/bin:/usr/bin:/sbin:/usr/sbin:/opt/vdr/bin"
|
||||
DATE="$(date +%Y)$(date +%m)$(date +%d)" # $DATE == "YYYYMMDD", i.e. 20060710
|
||||
W_SCAN=$(which w_scan 2>/dev/null)
|
||||
UDEVSTART=$(which udevstart)
|
||||
@@ -224,7 +224,7 @@
|
||||
echo "Checking for ct-vdr style startscript.."
|
||||
if [ -e /etc/init.d/vdr ]; then # c't-vdr
|
||||
echo_yes
|
||||
- $(/etc/init.d/vdr stop)
|
||||
+ /etc/init.d/vdr stop
|
||||
stopped=true
|
||||
else
|
||||
echo_no
|
||||
@@ -375,7 +375,7 @@
|
||||
|
||||
# which generic dvb modules should be always loaded?
|
||||
MODULES_TO_LOAD="videodev v4l1_compat \
|
||||
- v4l2_common video_buf dvb_core ves1820 \
|
||||
+ v4l2_common dvb_core ves1820 \
|
||||
dvb_ttpci \
|
||||
budget_ci budget_av budget_ci budget "
|
||||
|
||||
@@ -661,9 +661,11 @@
|
||||
echo -e -n $NORMAL
|
||||
echo -e -n "\\033[1;34m"
|
||||
if [ ${WHAT_TO_SCAN:0:2} != 0 ]; then
|
||||
+ echo ":->W_SCAN $DATE DVB-T" >> channels.conf-$DATE
|
||||
$W_SCAN >> channels.conf-$DATE
|
||||
fi
|
||||
- if [ ${WHAT_TO_SCAN:3:2} != 0 ]; then
|
||||
+ if [ ${WHAT_TO_SCAN:3:2} != 0 ]; then
|
||||
+ echo ":->W_SCAN $DATE DVB-C" >> channels.conf-$DATE
|
||||
$W_SCAN -fc >> channels.conf-$DATE
|
||||
fi
|
||||
echo -e -n $NORMAL
|
||||
@@ -671,55 +673,34 @@
|
||||
|
||||
function CopyConf ()
|
||||
{
|
||||
- if [ -s channels.conf-$DATE ]; then
|
||||
- clear
|
||||
- echo -e -n $SUCCESS
|
||||
- echo "****************************************************************"
|
||||
- echo "* *"
|
||||
- echo "* w_scan is done. *"
|
||||
- echo -e "* The output file is called "$FAILURE"channels.conf-$DATE"$SUCCESS". *"
|
||||
- echo "* Should I copy this to default location for you? [y/n] *"
|
||||
- echo "* *"
|
||||
- echo "****************************************************************"
|
||||
- echo -e -n $NORMAL && tput sgr0
|
||||
- read RESPONSE
|
||||
- echo -e -n $NORMAL
|
||||
- if [ "$RESPONSE" != "y" ]; then
|
||||
- echo "Copying channels.conf skipped - okay."
|
||||
- echo "The channels.conf generated can be found at"
|
||||
- echo -n -e "\\033[1;34m"
|
||||
- echo "$(pwd)/channels.conf-$DATE"
|
||||
- echo ""
|
||||
- echo -e -n $NORMAL
|
||||
- else
|
||||
- if [ -d /etc/vdr ]; then
|
||||
- mv /etc/vdr/channels.conf /etc/vdr/channels.conf-backup$DATE
|
||||
- cp channels.conf-$DATE /etc/vdr/channels.conf
|
||||
- fi
|
||||
- if [ -d /var/lib/vdr ]; then
|
||||
- mv /var/lib/vdr/channels.conf /var/lib/vdr/channels.conf-backup$DATE
|
||||
- cp channels.conf-$DATE /var/lib/vdr/channels.conf
|
||||
- fi
|
||||
- fi
|
||||
- else
|
||||
- clear
|
||||
- echo -e -n $FAILURE
|
||||
- echo "****************************************************************"
|
||||
- echo "* *"
|
||||
- echo "* Something went wrong. The channels.conf generated is *EMPTY*!*"
|
||||
- echo "* To analyze your problem I recommend the command *"
|
||||
- echo "* './w_scan 2>&1 | tee w_scan.log-dvbt && *"
|
||||
- echo "* ./w_scan -fc 2>&1 | tee w_scan.log-dvbc' *"
|
||||
- echo "* *"
|
||||
- echo "* w_scan will report the problem into the logfiles *"
|
||||
- echo "* w_scan.log-dvbt and w_scan.log-dvbc. *"
|
||||
- echo "* *"
|
||||
- echo "* PRESS ANY KEY TO CONTINUE *"
|
||||
- echo "****************************************************************"
|
||||
+ echo -e -n $SUCCESS
|
||||
+ echo "****************************************************************"
|
||||
+ echo "* *"
|
||||
+ echo "* w_scan is done. *"
|
||||
+ echo -e "* The output file is called "$FAILURE"channels.conf-$DATE"$SUCCESS". *"
|
||||
+ echo "* Should I copy this to default location for you? [y/n] *"
|
||||
+ echo "* *"
|
||||
+ echo "****************************************************************"
|
||||
+ echo -e -n $NORMAL && tput sgr0
|
||||
+ read RESPONSE
|
||||
+ echo -e -n $NORMAL
|
||||
+ if [ "$RESPONSE" != "y" ]; then
|
||||
+ echo "Copying channels.conf skipped - okay."
|
||||
+ echo "The channels.conf generated can be found at"
|
||||
+ echo -n -e "\\033[1;34m"
|
||||
+ echo "$(pwd)/channels.conf-$DATE"
|
||||
+ echo ""
|
||||
echo -e -n $NORMAL
|
||||
- read
|
||||
+ else
|
||||
+ if [ -d /opt/vdr/etc ]; then
|
||||
+ mv /opt/vdr/etc/channels.conf /opt/vdr/etc/channels.conf-backup$DATE
|
||||
+ cp channels.conf-$DATE /opt/vdr/etc/channels.conf
|
||||
+ fi
|
||||
+ if [ -d /var/lib/vdr ]; then
|
||||
+ mv /var/lib/vdr/channels.conf /var/lib/vdr/channels.conf-backup$DATE
|
||||
+ cp channels.conf-$DATE /var/lib/vdr/channels.conf
|
||||
+ fi
|
||||
fi
|
||||
-
|
||||
}
|
||||
|
||||
# the program itself.
|
||||
Reference in New Issue
Block a user