From c10b5c8e99e8428202033234e882ff846e00a853 Mon Sep 17 00:00:00 2001 From: john30 Date: Sun, 29 Mar 2015 12:10:18 +0200 Subject: [PATCH] unified --- make_debian.sh | 48 ++++++++++++++++-------------- make_freetz.sh | 79 ++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 104 insertions(+), 23 deletions(-) diff --git a/make_debian.sh b/make_debian.sh index c05dd46d..746f1acf 100755 --- a/make_debian.sh +++ b/make_debian.sh @@ -20,9 +20,15 @@ echo "*************" echo " prepare" echo "*************" echo -mkdir -p debian-build/ebusd || exit 1 -cd debian-build/ebusd || exit 1 -(tar cf - -C ../.. --exclude=debian-build --exclude=./.* .| tar xf -) || exit 1 +VERSION=`head -n 1 VERSION` +ARCH=`dpkg --print-architecture` +BUILD="build-$ARCH" +RELEASE="ebusd-$VERSION" +PACKAGE="${RELEASE}_${ARCH}.deb" +rm -rf "$BUILD" +mkdir -p "$BUILD" || exit 1 +cd "$BUILD" || exit 1 +(tar cf - -C .. "--exclude=./$BUILD" --exclude=./.* .| tar xf -) || exit 1 echo echo "*************" @@ -30,24 +36,22 @@ echo " build" echo "*************" echo ./autogen.sh || exit 1 -make DESTDIR="$PWD/release" install-strip || exit 1 +make DESTDIR="$PWD/$RELEASE" install-strip || exit 1 echo echo "*************" echo " pack" echo "*************" echo -mkdir -p release/DEBIAN release/etc/init.d release/etc/default release/etc/ebusd release/etc/logrotate.d release/usr/bin release/usr/bin || exit 1 +mkdir -p $RELEASE/DEBIAN $RELEASE/etc/init.d $RELEASE/etc/default $RELEASE/etc/logrotate.d || exit 1 -cp contrib/etc/init.d/ebusd.debian release/etc/init.d/ebusd || exit 1 -cp contrib/etc/default/ebusd.debian release/etc/default/ebusd || exit 1 -cp contrib/etc/ebusd/* release/etc/ebusd/ || exit 1 -cp contrib/etc/logrotate.d/ebusd release/etc/logrotate.d/ || exit 1 -cp ChangeLog.md release/DEBIAN/changelog || exit 1 -VERSION=`head -n 1 VERSION` +cp contrib/etc/init.d/ebusd.debian $RELEASE/etc/init.d/ebusd || exit 1 +cp contrib/etc/default/ebusd.debian $RELEASE/etc/default/ebusd || exit 1 +cp contrib/etc/ebusd/* $RELEASE/etc/ebusd/ || exit 1 +cp contrib/etc/logrotate.d/ebusd $RELEASE/etc/logrotate.d/ || exit 1 +cp ChangeLog.md $RELEASE/DEBIAN/changelog || exit 1 -ARCH=`dpkg --print-architecture` -cat < release/DEBIAN/control +cat < $RELEASE/DEBIAN/control Package: ebusd Version: $VERSION Section: net @@ -61,26 +65,28 @@ Description: eBUS daemon. ebusd is a daemon for handling communication with eBUS devices connected to a 2-wire bus system. EOF -cat < release/DEBIAN/dirs +cat < $RELEASE/DEBIAN/dirs /etc/ebusd -/usr/bin/ /etc/init.d /etc/default /etc/logrotate.d +/usr/bin EOF -mv release ebusd-$VERSION || exit 1 -dpkg -b ebusd-$VERSION || exit 1 -mv ebusd-$VERSION.deb ../../ebusd-${VERSION}_${ARCH}.deb || exit 1 +dpkg -b $RELEASE || exit 1 +mv ebusd-$VERSION.deb "../$PACKAGE" || exit 1 echo echo "*************" echo " cleanup" echo "*************" echo -cd ../.. -rm -rf debian-build +cd .. +rm -rf "$BUILD" echo -echo "Debian package created: ./ebusd-${VERSION}_${ARCH}.deb" +echo "Package created: $PACKAGE" +echo +echo "Content:" +dpkg -c "$PACKAGE" diff --git a/make_freetz.sh b/make_freetz.sh index 3209df53..ff97a4e1 100755 --- a/make_freetz.sh +++ b/make_freetz.sh @@ -1,4 +1,79 @@ #!/bin/sh +# Copyright (C) John Baier 2014-2015 +# +# This file is part of ebusd. +# +# ebusd is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# ebusd is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ebusd. If not, see http://www.gnu.org/licenses/. + +echo "*************" +echo " prepare" +echo "*************" +echo +VERSION=`head -n 1 VERSION` +ARCH=freetz +BUILD="build-$ARCH" +RELEASE="ebusd-$VERSION" +PACKAGE="${RELEASE}_${ARCH}.tgz" export PATH=$PATH:/usr/mipsel-linux-uclibc/bin -./autogen.sh --host=mipsel-linux-uclibc -make +rm -rf "$BUILD" +mkdir -p "$BUILD" || exit 1 +cd "$BUILD" || exit 1 +(tar cf - -C .. "--exclude=./$BUILD" --exclude=./.* .| tar xf -) || exit 1 + +echo +echo "*************" +echo " build" +echo "*************" +echo +./autogen.sh --host=mipsel-linux-uclibc || exit 1 +make DESTDIR="$PWD/$RELEASE" install-strip || exit 1 + +echo +echo "*************" +echo " pack" +echo "*************" +echo +cp contrib/etc/ebusd/* $RELEASE/ || exit 1 +mv $RELEASE/usr/bin/ebusd $RELEASE/usr/bin/ebusctl $RELEASE/ || exit 1 +rm -rf $RELEASE/usr/ $RELEASE/etc/ || exit 1 + +cat < $RELEASE/INFO +Package: ebusd +Version: $VERSION +Maintainer: John Baier +Homepage: https://github.com/john30/ebusd +Bugs: https://github.com/john30/ebusd/issues +Depends: libstdc++6, libc6, libgcc1 +Description: eBUS daemon. + ebusd is a daemon for handling communication with eBUS devices connected to a + 2-wire bus system. +EOF + +tar czf $RELEASE.tgz $RELEASE || exit 1 +mv $RELEASE.tgz "../$PACKAGE" || exit 1 + +echo +echo "*************" +echo " cleanup" +echo "*************" +echo +cd .. +rm -rf "$BUILD" + +echo +echo "Package created: $PACKAGE" +echo +echo "Content:" +tar tzvf "$PACKAGE" +