[gentoo-commits] gentoo-vdr r615 - in gentoo-vdr-scripts/trunk: . usr/sbin usr/share/vdr/inc

[Matthias Schwarzott (zzam)]

Author: zzam
Date: 2008-06-21 12:41:31 +0000 (Sat, 21 Jun 2008)
New Revision: 615

Added:
   gentoo-vdr-scripts/trunk/usr/sbin/vdr-get-header-checksum
Modified:
   gentoo-vdr-scripts/trunk/ChangeLog
   gentoo-vdr-scripts/trunk/usr/sbin/Makefile
   gentoo-vdr-scripts/trunk/usr/share/vdr/inc/plugin-functions.sh
Log:
Factored out checksum creation to extra executable.

Modified: gentoo-vdr-scripts/trunk/ChangeLog
===================================================================
--- gentoo-vdr-scripts/trunk/ChangeLog	2008-06-19 16:38:09 UTC (rev 614)
+++ gentoo-vdr-scripts/trunk/ChangeLog	2008-06-21 12:41:31 UTC (rev 615)
@@ -1,6 +1,10 @@
 # ChangeLog for gentoo-vdr-scripts
 # $Id$
 
+  21 Jun 2008; Matthias Schwarzott <zzam@g.o> usr/sbin/Makefile,
+  +usr/sbin/vdr-get-header-checksum, usr/share/vdr/inc/plugin-functions.sh:
+  Factored out checksum creation to extra executable.
+
   19 Jun 2008; Matthias Schwarzott <zzam@g.o>
   usr/share/vdr/rcscript/watchdog-restart-20-modules.sh,
   usr/sbin/dvb-reload-modules:

Modified: gentoo-vdr-scripts/trunk/usr/sbin/Makefile
===================================================================
--- gentoo-vdr-scripts/trunk/usr/sbin/Makefile	2008-06-19 16:38:09 UTC (rev 614)
+++ gentoo-vdr-scripts/trunk/usr/sbin/Makefile	2008-06-21 12:41:31 UTC (rev 615)
@@ -4,7 +4,7 @@
 
 MYDIR = $(DESTDIR)/usr/sbin
 SUBDIRS =
-BINS = acpi-wakeup.sh rtc-wakeup.sh vdr-watchdogd dvb-reload-modules
+BINS = acpi-wakeup.sh rtc-wakeup.sh vdr-watchdogd dvb-reload-modules vdr-get-header-checksum
 CONFS =
 
 all: compile

Added: gentoo-vdr-scripts/trunk/usr/sbin/vdr-get-header-checksum
===================================================================
--- gentoo-vdr-scripts/trunk/usr/sbin/vdr-get-header-checksum	                        (rev 0)
+++ gentoo-vdr-scripts/trunk/usr/sbin/vdr-get-header-checksum	2008-06-21 12:41:31 UTC (rev 615)
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+die() {
+	echo "$@" 1>&2
+	exit 1
+}
+
+verbose() {
+	[ "$verbose" -ge "1" ] && echo "$@" 1>&2
+}
+
+show_help() {
+	echo "Usage:"
+	echo "  vdr-get-header-checksum [-v] [-h]"
+}
+
+
+verbose=0
+
+for p; do
+	case "$p" in
+	-v)	verbose=1 ;;
+	-h)	show_help
+		exit 0;;
+	*)	show_help
+		exit 1;;
+	esac
+done
+
+include_dir=/usr/include/vdr
+
+verbose "Creating vdr header files checksum of ${include_dir}"
+
+plugin_dir="$(awk '/^PLUGINLIBDIR/{ print $3 }' ${include_dir}/Make.config)"
+if [ -n "${plugin_dir}" ]; then
+	plugin_dir=/usr/lib/vdr/plugins
+fi
+
+vdr_checksum_dir="${plugin_dir%/plugins}/checksums"
+vdr_checksum="${vdr_checksum_dir}/header-md5-vdr"
+
+# use pre-existing checksum file, no need to do more work :)
+if [ -f "${vdr_checksum}" ]; then
+	verbose "Using existing checksum from ${vdr_checksum}"
+	cat "${vdr_checksum}"
+else
+	verbose "Creating checksum from files"
+
+	type md5sum >/dev/null 2>&1 || die "Could not find command md5sum."
+	type sort >/dev/null 2>&1 || die "Could not find command sort"
+
+	cd ${include_dir} || die "Could not cd to ${include_dir}"
+	md5sum *.h libsi/*.h|LC_ALL=C sort --key=2
+fi
+
+verbose "Checksum created."
+exit 0
+


Property changes on: gentoo-vdr-scripts/trunk/usr/sbin/vdr-get-header-checksum
___________________________________________________________________
Name: svn:executable
   + *

Modified: gentoo-vdr-scripts/trunk/usr/share/vdr/inc/plugin-functions.sh
===================================================================
--- gentoo-vdr-scripts/trunk/usr/share/vdr/inc/plugin-functions.sh	2008-06-19 16:38:09 UTC (rev 614)
+++ gentoo-vdr-scripts/trunk/usr/share/vdr/inc/plugin-functions.sh	2008-06-21 12:41:31 UTC (rev 615)
@@ -10,32 +10,6 @@
 	fi
 }
 
-init_header_checksum() {
-	plugin_dir=$(awk '/^PLUGINLIBDIR/{ print $3 }' /usr/include/vdr/Make.config)
-	if [ -n "${plugin_dir}" ]; then
-		plugin_dir=/usr/lib/vdr/plugins
-	fi
-
-	if ! type md5sum >/dev/null 2>&1; then
-		PLUGIN_CHECK_MD5=no
-		return
-	fi
-
-	vdr_checksum_dir="${plugin_dir%/plugins}/checksums"
-	vdr_checksum=${vdr_checksum_dir}/header-md5-vdr
-
-	if [ ! -f "${vdr_checksum}" ]; then
-		vdr_checksum="${PL_TMP}"/header-md5-vdr
-
-		rm -f ${vdr_checksum} 2>/dev/null
-		(
-			cd /usr/include/vdr
-			md5sum *.h libsi/*.h|LC_ALL=C sort --key=2
-		) > ${vdr_checksum}
-	fi
-	PLUGIN_CHECK_MD5=yes
-}
-
 print_skip_header() {
 	if [ "${skip_header_printed}" != "1" ]; then
 		ewarn "  Skipped these plugins:"
@@ -46,8 +20,7 @@
 
 load_plugin_list_start() {
 	rm -f "${LOADED_PLUGINS_FILE}"
-	# needed for plugin patchlevel check
-	init_header_checksum
+	prepare_plugin_checks
 
 	local PLUGIN_CONF=/etc/conf.d/vdr.plugins PLUGIN= line=
 	if [ -f "${PLUGIN_CONF}" ]; then
@@ -100,6 +73,22 @@
 	esac
 }
 
+prepare_plugin_checks() {
+	# find plugin dir, needed for multilib ...
+	plugin_dir="$(awk '/^PLUGINLIBDIR/{ print $3 }' /usr/include/vdr/Make.config)"
+	if [ -n "${plugin_dir}" ]; then
+		plugin_dir=/usr/lib/vdr/plugins
+	fi
+
+	# needed for plugin patchlevel check
+	vdr_checksum_dir="${plugin_dir%/plugins}/checksums"
+	vdr_checksum="${PL_TMP}"/header-md5-vdr
+	PLUGIN_CHECK_MD5=no
+	if vdr-get-header-checksum > "${vdr_checksum}"; then
+		PLUGIN_CHECK_MD5=yes
+	fi
+}
+
 check_plugin() {
 	local PLUGIN="${1}"
 	local plugin_file="${plugin_dir}/libvdr-${PLUGIN}.so.${APIVERSION}"
@@ -111,7 +100,7 @@
 
 	local plugin_checksum_file=${vdr_checksum_dir}/header-md5-vdr-${PLUGIN}
 	if [ "${PLUGIN_CHECK_MD5}" = "yes" ] && [ -e "${plugin_checksum_file}" ]; then
-		if ! diff ${vdr_checksum} ${plugin_checksum_file} >/dev/null; then
+		if ! cmp -s ${vdr_checksum} ${plugin_checksum_file}; then
 			skip_plugin "${PLUGIN}" "PATCHLEVEL"
 			return 1
 		fi

-- 
gentoo-commits@l.g.o mailing list