Find a small patch modifying makebacularel, config and sign to
use tar.bz2 as default source format
config is modified to make folders less "bee"
config export now GPGKEY so other key can be use to sign package
useful for us, preparing the rpm for community and when we want to create
intermediate release (-dev)
sign source config
See patch attached.
--
Bruno Friedmann
Ioda-Net Sàrl www.ioda-net.ch
openSUSE Member & Ambassador
GPG KEY : D5C9B751C4653227
irc: tigerfoot
>From 0560701d6c9cf6594517e40f501db276be1bebfe Mon Sep 17 00:00:00 2001
From: Bruno Friedmann <br...@ioda-net.ch>
Date: Sun, 25 Sep 2011 16:19:31 +0200
Subject: [PATCH] -makebacularel output .tar.bz2 files -config export BGPGKEY
so tar.bz2 can be signed by others useful for package
maintainers to publish signed -dev version -sign use
BGPGKEY accordly now
---
bacula/release/config | 8 +++++---
bacula/release/makebacularel | 24 +++++++++++++-----------
bacula/release/sign | 2 +-
3 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/bacula/release/config b/bacula/release/config
index acfebe7..f6d891d 100644
--- a/bacula/release/config
+++ b/bacula/release/config
@@ -11,10 +11,12 @@ reltype=beta
repo=$reltype
+# Allow other keys
+export BGPGKEY=${bacula:-$5}
# Bacula git repos
-bacula=${bacula:-${HOME}/bee/bacula}
-docs=${docs:-${HOME}/bee/docs}
+bacula=${bacula:-$1}
+docs=${docs:-$1/../docs}
#
# Set the following to your remote name. By default it is origin.
@@ -30,7 +32,7 @@ cwd=`pwd`
cd ${bacula}/bacula
if [ $? -ne 0 ]; then
- echo "Directory: $1 does not exist"
+ echo "Directory: $1/bacula does not exist"
exit 1
fi
current=`git branch | awk '/*/ { print $2 }'`
diff --git a/bacula/release/makebacularel b/bacula/release/makebacularel
index 869667a..3080100 100755
--- a/bacula/release/makebacularel
+++ b/bacula/release/makebacularel
@@ -11,6 +11,7 @@
#
# Commit all changes, update the language files,
# export the release, make a release tar.
+# Now use bz2 like doc
#
# source config
. ./config
@@ -23,7 +24,7 @@ remote=$2
branch=$3
ver=$4
-if [ $# != 4 ] ; then
+if [ $# < 4 ] ; then
echo "Need $0 <source-directory> <remote-name> <branch> <version>"
echo "e.g. $0 release-source bee Branch-4.0 4.0.3"
exit 1
@@ -78,10 +79,10 @@ if [ $? != 0 ] ; then
fi
echo "Create Tag $fulltag done"
cd ${cwd}
-rm -rf $base_pkg-$ver $base_pkg-$ver.tar.gz $base_pkg-$ver.tar.gz.sig
+rm -rf $base_pkg-$ver $base_pkg-$ver.tar.* $base_pkg-$ver.tar.*.sig
rm -rf $fulltag
cd ${src}
-git archive --format=tar --prefix=$base_pkg-$ver/ $fulltag | gzip >${cwd}/$base_pkg-$ver.tar.gz
+git archive --format=tar --prefix=$base_pkg-$ver/ $fulltag | bzip2 -9 >${cwd}/$base_pkg-$ver.tar.bz2
if [ $? != 0 ] ; then
echo " "
@@ -89,9 +90,9 @@ if [ $? != 0 ] ; then
echo " "
exit 1
fi
-echo "Exported release into ${cwd}/$base_pkg-$ver.tar.gz"
+echo "Exported release into ${cwd}/$base_pkg-$ver.tar.bz2"
cd ${cwd}
-tar xfz $base_pkg-$ver.tar.gz
+tar xfj $base_pkg-$ver.tar.bz2
# First remove Enterprise Win32 plugin source
cd $base_pkg-$ver/bacula
cp -fp ReleaseNotes ${cwd}/ReleaseNotes
@@ -102,14 +103,14 @@ mv bacula $base_pkg-$ver
mv gui $base_pkg-gui-$ver
mv regress $base_pkg-regress-$ver
# Tar each component individually
-tar cvfz ../$base_pkg-$ver.tar.gz $base_pkg-$ver
-tar cvfz ../$base_pkg-gui-$ver.tar.gz $base_pkg-gui-$ver
-tar cvfz ../$base_pkg-regress-$ver.tar.gz $base_pkg-regress-$ver
+tar cvfj ../$base_pkg-$ver.tar.bz2 $base_pkg-$ver
+tar cvfj ../$base_pkg-gui-$ver.tar.bz2 $base_pkg-gui-$ver
+tar cvfj ../$base_pkg-regress-$ver.tar.bz2 $base_pkg-regress-$ver
cd ..
rm -rf $base_pkg-$ver
-./sign $base_pkg-$ver.tar.gz
-./sign $base_pkg-gui-$ver.tar.gz
-./sign $base_pkg-regress-$ver.tar.gz
+./sign $base_pkg-$ver.tar.bz2
+./sign $base_pkg-gui-$ver.tar.bz2
+./sign $base_pkg-regress-$ver.tar.bz2
if [ a$push != ano ]; then
cd ${src}
@@ -120,3 +121,4 @@ fi
cd ${src}
git checkout ${current}
+
diff --git a/bacula/release/sign b/bacula/release/sign
index 964780d..9f9eba3 100755
--- a/bacula/release/sign
+++ b/bacula/release/sign
@@ -1,3 +1,3 @@
#!/bin/sh
-gpg --detach-sign --armor --default-key bacula -o $1.sig $1
+gpg --detach-sign --armor --default-key ${BGPGKEY} -o $1.sig $1
gpg --verify $1.sig
--
1.7.6.3
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2dcopy2
_______________________________________________
Bacula-devel mailing list
Bacula-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bacula-devel
