From b0ce2cfa164887cc75e6a2fda453ed42f927280a Mon Sep 17 00:00:00 2001 From: 6543 Date: Sat, 12 May 2018 22:37:35 +0200 Subject: [PATCH 1/2] lintian improvements --- DEBIAN/conffiles | 1 + DEBIAN/control | 2 +- autogen.sh | 29 +++++++++++++++++++++++++++-- 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 DEBIAN/conffiles diff --git a/DEBIAN/conffiles b/DEBIAN/conffiles new file mode 100644 index 0000000..00efd0f --- /dev/null +++ b/DEBIAN/conffiles @@ -0,0 +1 @@ +/etc/remaster/config.sample.cfg diff --git a/DEBIAN/control b/DEBIAN/control index 7ae5be4..1347ee3 100644 --- a/DEBIAN/control +++ b/DEBIAN/control @@ -4,7 +4,7 @@ Version: 1.9.3 Architecture: all Maintainer: 6543 <6543@obermui.de> Installed-Size: -Depends: squashfs-tools, xorriso, wget, sed, sendemail, bash +Depends: squashfs-tools, xorriso, wget, sed (>= 4.2), sendemail, bash (>= 4.3) Suggests: nfs-kernel-server, isc-dhcp-server Section: utils Priority: optional diff --git a/autogen.sh b/autogen.sh index 922a731..d992954 100755 --- a/autogen.sh +++ b/autogen.sh @@ -27,7 +27,10 @@ function copy() { #changelog mkdir -p build/usr/share/doc/remaster cp -v changes/remaster.md build/usr/share/doc/remaster/changelog - gzip build/usr/share/doc/remaster/changelog + gzip --best build/usr/share/doc/remaster/changelog +} +function rights() { + echo ja } #config ... @@ -47,19 +50,37 @@ function set_libdir() { #modes function debug() { clean + + #prebuild copy set_rootdir "`pwd`/build" set_libdir "`pwd`/build/usr/lib/remaster" } function install() { + #überprüfe auf root + [ "`id -u`" != "0" ] && { echo "Error start as root"; exit 1; } + + #lösche alltes build dir clean + + #prebuild copy set_rootdir "" set_libdir "/usr/lib/remaster" - #cp -f -r build/* / + + #set owner + chown -r root:root build/ + + #install + cp -f -r build/* / } function build-deb() { + #überprüfe auf root + [ "`id -u`" != "0" ] && { echo "Error start as root"; exit 1; } + + #lösche alltes build dir clean + #prebuild copy set_rootdir "" @@ -70,10 +91,14 @@ function build-deb() { cp -v -r -f DEBIAN build/ #create md5sums find ./build -type f -exec md5sum {} \; | grep -v './build/DEBIAN' | sed 's/\.\/build\///g' > build/DEBIAN/md5sums + #set size SIZE="`du --exclude=build/DEBIAN -c build/ | cut -f 1 | tail -n 1`" sed -i "s//$SIZE/g" build/DEBIAN/control + #set owner + chown -r root:root build/ + ## #build deb ## From d63d13fe80761e5e129a358f89bcf5132a5ec396 Mon Sep 17 00:00:00 2001 From: 6543 Date: Sat, 12 May 2018 22:40:41 +0200 Subject: [PATCH 2/2] del dummy func --- autogen.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/autogen.sh b/autogen.sh index d992954..d9b6286 100755 --- a/autogen.sh +++ b/autogen.sh @@ -29,9 +29,6 @@ function copy() { cp -v changes/remaster.md build/usr/share/doc/remaster/changelog gzip --best build/usr/share/doc/remaster/changelog } -function rights() { - echo ja -} #config ... function set_rootdir() { @@ -91,6 +88,7 @@ function build-deb() { cp -v -r -f DEBIAN build/ #create md5sums find ./build -type f -exec md5sum {} \; | grep -v './build/DEBIAN' | sed 's/\.\/build\///g' > build/DEBIAN/md5sums + chmod 0644 build/DEBIAN/md5sums #set size SIZE="`du --exclude=build/DEBIAN -c build/ | cut -f 1 | tail -n 1`"