Commit d0719ecc authored by Bernd Schubert's avatar Bernd Schubert

packages: Fix name bugs and debian opentk-lib postrm bug

- Fix package and binary version strings
- Set correct script name (fhgfs-opentk-lib-update-ib) in
  debians postinst

git-svn-id: https://svn.itwm.fhg.de/svn/fsdevel/projects@2199 06d474eb-e7fd-0310-b1d4-fdbe02cb80bc
parent 7d72df4e
__NAME__ (__FHGFS_VERSION__) stable; urgency=low
__NAME__ (__VER__.__RELEASE_STR__.debian__DEBIAN_VERSION__) stable; urgency=low
* initial native debian packaging
......
......@@ -72,7 +72,7 @@ fi
# build daemon
make FHGFS_OPENTK_PATH=%{FHGFS_OPENTK_PATH} \
FHGFS_VERSION=${FHGFS_VERSION} \
FHGFS_VERSION=%{FHGFS_VERSION} \
FHGFS_COMMON_PATH=%{FHGFS_COMMON_PATH} admon
......
......@@ -8,7 +8,7 @@ VER=${VER:-"2011.04"}
RELEASE_STR=${RELEASE_STR:-`date +%F|tr - .`.`date +%T| tr -d :`}
#CODENAME=`lsb_release -c -s`
DEBIAN_VERSION=`lsb_release -r -s | sed -e 's/\..*$//'`
FHGFS_VERSION="${VER}.${RELEASE_STR}.debian${DEBIAN_VERSION}"
FHGFS_VERSION="${VER}-${RELEASE_STR}"
FHGFS_OPENTK_PATH=${FHGFS_OPENTK_PATH:-`readlink -f ../../fhgfs_opentk_lib`}
FHGFS_COMMON_PATH=${FHGFS_COMMON_PATH:-`readlink -f ../../fhgfs_common`}
......@@ -20,7 +20,9 @@ RULES="debian/rules"
sed \
-e "s/__NAME__/$NAME/" \
-e "s/__FHGFS_VERSION__/$FHGFS_VERSION/" \
-e "s/__VER__/$VER/" \
-e "s/__RELEASE_STR__/$RELEASE_STR/" \
-e "s/__DEBIAN_VERSION__/$DEBIAN_VERSION/g" \
${CHANGELOG}.in > ${CHANGELOG}
sed \
......
__NAME__ (__FHGFS_VERSION__.debian__DEBIAN_VERSION__) stable; urgency=low
__NAME__ (__VER__.__RELEASE_STR__.debian__DEBIAN_VERSION__) stable; urgency=low
* initial native debian packaging
......
......@@ -69,7 +69,7 @@ echo "mkdir RPM_BUILD_ROOT (${RPM_BUILD_ROOT})"
mkdir -p ${RPM_BUILD_ROOT}
make FHGFS_CLIENT_OPENTK_PATH=%{FHGFS_CLIENT_OPENTK_PATH} \
RELEASE_PATH=${RPM_BUILD_ROOT}/opt/fhgfs/src/client \
FHGFS_VERSION=${FHGFS_VERSION} \
FHGFS_VERSION=%{FHGFS_VERSION} \
WITHOUT_OPENTK=1 V=1 prepare_release
pwd
mkdir -p ${RPM_BUILD_ROOT}/etc/fhgfs
......
......@@ -8,7 +8,7 @@ VER=${VER:-"2011.04"}
RELEASE_STR=${RELEASE_STR:-`date +%F|tr - .`.`date +%T| tr -d :`}
#CODENAME=`lsb_release -c -s`
DEBIAN_VERSION=`lsb_release -r -s | sed -e 's/\..*$//'`
FHGFS_VERSION="${VER}.${RELEASE_STR}"
FHGFS_VERSION="${VER}-${RELEASE_STR}"
FHGFS_COMMON_PATH=${FHGFS_COMMON_PATH:-`readlink -f ../../fhgfs_common`}
FHGFS_CLIENT_OPENTK_PATH=${FHGFS_CLIENT_OPENTK_PATH:-"../../fhgfs_client_opentk_module"}
......@@ -19,7 +19,8 @@ RULES="debian/rules"
sed \
-e "s/__NAME__/$NAME/g" \
-e "s/__FHGFS_VERSION__/$FHGFS_VERSION/g" \
-e "s/__VER__/$VER/" \
-e "s/__RELEASE_STR__/$RELEASE_STR/" \
-e "s/__DEBIAN_VERSION__/$DEBIAN_VERSION/g" \
${CHANGELOG}.in > ${CHANGELOG}
......
__NAME__ (__FHGFS_VERSION__.debian__DEBIAN_VERSION__) stable; urgency=low
__NAME__ (__VER__.__RELEASE_STR__.debian__DEBIAN_VERSION__) stable; urgency=low
* initial native debian packaging
......
......@@ -68,7 +68,7 @@ echo "Nothing to do in build"
cd build
echo "mkdir RPM_BUILD_ROOT (${RPM_BUILD_ROOT})"
mkdir -p ${RPM_BUILD_ROOT}
make FHGFS_VERSION=${FHGFS_VERSION} \
make FHGFS_VERSION=%{FHGFS_VERSION} \
RELEASE_PATH=${RPM_BUILD_ROOT}/opt/fhgfs/src/client prepare_release
%files
......
......@@ -8,7 +8,7 @@ VER=${VER:-"2011.04"}
RELEASE_STR=${RELEASE_STR:-`date +%F|tr - .`.`date +%T| tr -d :`}
#CODENAME=`lsb_release -c -s`
DEBIAN_VERSION=`lsb_release -r -s | sed -e 's/\..*$//'`
FHGFS_VERSION="${VER}.${RELEASE_STR}"
FHGFS_VERSION="${VER}-${RELEASE_STR}"
FHGFS_COMMON_PATH=${FHGFS_COMMON_PATH:-`readlink -f ../../fhgfs_common`}
......@@ -17,7 +17,8 @@ RULES="debian/rules"
sed \
-e "s/__NAME__/$NAME/g" \
-e "s/__FHGFS_VERSION__/$FHGFS_VERSION/g" \
-e "s/__VER__/$VER/" \
-e "s/__RELEASE_STR__/$RELEASE_STR/" \
-e "s/__DEBIAN_VERSION__/$DEBIAN_VERSION/g" \
${CHANGELOG}.in > ${CHANGELOG}
......
__NAME__ (__FHGFS_VERSION__.debian__DEBIAN_VERSION__) stable; urgency=low
__NAME__ (__VER__.__RELEASE_STR__.debian__DEBIAN_VERSION__) stable; urgency=low
* initial native debian packaging
......
......@@ -62,7 +62,7 @@ The package contains files required by all FhGFS daemons
# FHGFS_COMMON_PATH=%{FHGFS_COMMON_PATH} \
# FHGFS_ONLINE_CFG_PATH=%{FHGFS_ONLINE_CFG_PATH} \
# FHGFS_FSCK_PATH=%{FHGFS_FSCK_PATH} \
# FHGFS_VERSION=${FHGFS_VERSION} \
# FHGFS_VERSION=%{FHGFS_VERSION} \
# -C build/
......
......@@ -8,7 +8,7 @@ VER=${VER:-"2011.04"}
RELEASE_STR=${RELEASE_STR:-`date +%F|tr - .`.`date +%T| tr -d :`}
#CODENAME=`lsb_release -c -s`
DEBIAN_VERSION=`lsb_release -r -s | sed -e 's/\..*$//'`
FHGFS_VERSION="${VER}.${RELEASE_STR}"
FHGFS_VERSION="${VER}-${RELEASE_STR}"
FHGFS_OPENTK_PATH=${FHGFS_OPENTK_PATH:-`readlink -f ../../fhgfs_opentk_lib`}
FHGFS_COMMON_PATH=${FHGFS_COMMON_PATH:-`readlink -f ../../fhgfs_common`}
......@@ -20,7 +20,8 @@ RULES="debian/rules"
sed \
-e "s/__NAME__/$NAME/g" \
-e "s/__FHGFS_VERSION__/$FHGFS_VERSION/g" \
-e "s/__VER__/$VER/" \
-e "s/__RELEASE_STR__/$RELEASE_STR/" \
-e "s/__DEBIAN_VERSION__/$DEBIAN_VERSION/g" \
${CHANGELOG}.in > ${CHANGELOG}
......
__NAME__ (__FHGFS_VERSION__.debian__DEBIAN_VERSION__) stable; urgency=low
__NAME__ (__VER__.__RELEASE_STR__.debian__DEBIAN_VERSION__) stable; urgency=low
* initial native debian packaging
......
......@@ -63,7 +63,7 @@ The package contains the FhGFS helper daemon.
%build
cd build
make FHGFS_OPENTK_PATH=%{FHGFS_OPENTK_PATH} \
FHGFS_VERSION=${FHGFS_VERSION} \
FHGFS_VERSION=%{FHGFS_VERSION} \
FHGFS_COMMON_PATH=%{FHGFS_COMMON_PATH}
%define debug_package %{nil}
......
......@@ -8,7 +8,7 @@ VER=${VER:-"2011.04"}
RELEASE_STR=${RELEASE_STR:-`date +%F|tr - .`.`date +%T| tr -d :`}
#CODENAME=`lsb_release -c -s`
DEBIAN_VERSION=`lsb_release -r -s | sed -e 's/\..*$//'`
FHGFS_VERSION="${VER}.${RELEASE_STR}"
FHGFS_VERSION="${VER}-${RELEASE_STR}"
FHGFS_OPENTK_PATH=${FHGFS_OPENTK_PATH:-`readlink -f ../../fhgfs_opentk_lib`}
FHGFS_COMMON_PATH=${FHGFS_COMMON_PATH:-`readlink -f ../../fhgfs_common`}
......@@ -18,7 +18,8 @@ RULES="debian/rules"
sed \
-e "s/__NAME__/$NAME/g" \
-e "s/__FHGFS_VERSION__/$FHGFS_VERSION/g" \
-e "s/__VER__/$VER/" \
-e "s/__RELEASE_STR__/$RELEASE_STR/" \
-e "s/__DEBIAN_VERSION__/$DEBIAN_VERSION/g" \
${CHANGELOG}.in > ${CHANGELOG}
......
__NAME__ (__FHGFS_VERSION__.debian__DEBIAN_VERSION__) stable; urgency=low
__NAME__ (__VER__.__RELEASE_STR__.debian__DEBIAN_VERSION__) stable; urgency=low
* initial native debian packaging
......
......@@ -62,7 +62,7 @@ The package contains the FhGFS meta-data server daemon.
%build
cd build
make FHGFS_OPENTK_PATH=%{FHGFS_OPENTK_PATH} \
FHGFS_VERSION=${FHGFS_VERSION} \
FHGFS_VERSION=%{FHGFS_VERSION} \
FHGFS_COMMON_PATH=%{FHGFS_COMMON_PATH}
......
......@@ -8,7 +8,7 @@ VER=${VER:-"2011.04"}
RELEASE_STR=${RELEASE_STR:-`date +%F|tr - .`.`date +%T| tr -d :`}
#CODENAME=`lsb_release -c -s`
DEBIAN_VERSION=`lsb_release -r -s | sed -e 's/\..*$//'`
FHGFS_VERSION="${VER}.${RELEASE_STR}"
FHGFS_VERSION="${VER}-${RELEASE_STR}"
FHGFS_OPENTK_PATH=${FHGFS_OPENTK_PATH:-`readlink -f ../../fhgfs_opentk_lib`}
FHGFS_COMMON_PATH=${FHGFS_COMMON_PATH:-`readlink -f ../../fhgfs_common`}
......@@ -18,7 +18,8 @@ RULES="debian/rules"
sed \
-e "s/__NAME__/$NAME/g" \
-e "s/__FHGFS_VERSION__/$FHGFS_VERSION/g" \
-e "s/__VER__/$VER/" \
-e "s/__RELEASE_STR__/$RELEASE_STR/" \
-e "s/__DEBIAN_VERSION__/$DEBIAN_VERSION/g" \
${CHANGELOG}.in > ${CHANGELOG}
......
__NAME__ (__FHGFS_VERSION__.debian__DEBIAN_VERSION__) stable; urgency=low
__NAME__ (__VER__.__RELEASE_STR__.debian__DEBIAN_VERSION__) stable; urgency=low
* initial native debian packaging
......
......@@ -58,7 +58,7 @@ The package contains the FhGFS management daemon.
%build
cd build
make FHGFS_OPENTK_PATH=%{FHGFS_OPENTK_PATH} \
FHGFS_VERSION=${FHGFS_VERSION} \
FHGFS_VERSION=%{FHGFS_VERSION} \
FHGFS_COMMON_PATH=%{FHGFS_COMMON_PATH}
......
......@@ -8,7 +8,7 @@ VER=${VER:-"2011.04"}
RELEASE_STR=${RELEASE_STR:-`date +%F|tr - .`.`date +%T| tr -d :`}
#CODENAME=`lsb_release -c -s`
DEBIAN_VERSION=`lsb_release -r -s | sed -e 's/\..*$//'`
FHGFS_VERSION="${VER}.${RELEASE_STR}"
FHGFS_VERSION="${VER}-${RELEASE_STR}"
FHGFS_OPENTK_PATH=${FHGFS_OPENTK_PATH:-`readlink -f ../../fhgfs_opentk_lib`}
FHGFS_COMMON_PATH=${FHGFS_COMMON_PATH:-`readlink -f ../../fhgfs_common`}
......@@ -18,7 +18,8 @@ RULES="debian/rules"
sed \
-e "s/__NAME__/$NAME/g" \
-e "s/__FHGFS_VERSION__/$FHGFS_VERSION/g" \
-e "s/__VER__/$VER/" \
-e "s/__RELEASE_STR__/$RELEASE_STR/" \
-e "s/__DEBIAN_VERSION__/$DEBIAN_VERSION/g" \
${CHANGELOG}.in > ${CHANGELOG}
......
__NAME__ (__FHGFS_VERSION__.debian__DEBIAN_VERSION__) stable; urgency=low
__NAME__ (__VER__.__RELEASE_STR__.debian__DEBIAN_VERSION__) stable; urgency=low
* initial native debian packaging
......
......@@ -3,7 +3,7 @@
set -e
# enable or disable IB support and create the symlink
fhgfs-opentk-lib-check-and-update-ib.sh -R
fhgfs-opentk-lib-and-update-ib -R
#DEBHELPER#
......@@ -71,7 +71,7 @@ ldconfig
cd build
# build without IB support
make FHGFS_VERSION=${FHGFS_VERSION} FHGFS_COMMON_PATH=%{FHGFS_COMMON_PATH} package_lib
make FHGFS_VERSION=%{FHGFS_VERSION} FHGFS_COMMON_PATH=%{FHGFS_COMMON_PATH} package_lib
%define debug_package %{nil}
......
......@@ -8,7 +8,7 @@ VER=${VER:-"2011.04"}
RELEASE_STR=${RELEASE_STR:-`date +%F|tr - .`.`date +%T| tr -d :`}
#CODENAME=`lsb_release -c -s`
DEBIAN_VERSION=`lsb_release -r -s | sed -e 's/\..*$//'`
FHGFS_VERSION="${VER}.${RELEASE_STR}"
FHGFS_VERSION="${VER}-${RELEASE_STR}"
FHGFS_COMMON_PATH=${FHGFS_COMMON_PATH:-`readlink -f ../../fhgfs_common`}
......@@ -16,9 +16,10 @@ CHANGELOG="debian/changelog"
RULES="debian/rules"
sed \
-e "s/__NAME__/$NAME/g" \
-e "s/__FHGFS_VERSION__/$FHGFS_VERSION/g" \
-e "s/__DEBIAN_VERSION__/$DEBIAN_VERSION/g" \
-e "s/__NAME__/$NAME/g" \
-e "s/__VER__/$VER/" \
-e "s/__RELEASE_STR__/$RELEASE_STR/" \
-e "s/__DEBIAN_VERSION__/$DEBIAN_VERSION/g" \
${CHANGELOG}.in > ${CHANGELOG}
sed \
......
__NAME__ (__FHGFS_VERSION__.debian__DEBIAN_VERSION__) stable; urgency=low
__NAME__ (__VER__.__RELEASE_STR__.debian__DEBIAN_VERSION__) stable; urgency=low
* initial native debian packaging
......
......@@ -57,7 +57,7 @@ This package contains the FhGFS storage server binaries.
%build
cd build
make FHGFS_OPENTK_PATH=%{FHGFS_OPENTK_PATH} \
FHGFS_VERSION=${FHGFS_VERSION} \
FHGFS_VERSION=%{FHGFS_VERSION} \
FHGFS_COMMON_PATH=%{FHGFS_COMMON_PATH}
......
......@@ -8,7 +8,7 @@ VER=${VER:-"2011.04"}
RELEASE_STR=${RELEASE_STR:-`date +%F|tr - .`.`date +%T| tr -d :`}
#CODENAME=`lsb_release -c -s`
DEBIAN_VERSION=`lsb_release -r -s | sed -e 's/\..*$//'`
FHGFS_VERSION="${VER}.${RELEASE_STR}"
FHGFS_VERSION="${VER}-${RELEASE_STR}"
FHGFS_OPENTK_PATH=${FHGFS_OPENTK_PATH:-`readlink -f ../../fhgfs_opentk_lib`}
FHGFS_COMMON_PATH=${FHGFS_COMMON_PATH:-`readlink -f ../../fhgfs_common`}
......@@ -18,7 +18,8 @@ RULES="debian/rules"
sed \
-e "s/__NAME__/$NAME/g" \
-e "s/__FHGFS_VERSION__/$FHGFS_VERSION/g" \
-e "s/__VER__/$VER/" \
-e "s/__RELEASE_STR__/$RELEASE_STR/" \
-e "s/__DEBIAN_VERSION__/$DEBIAN_VERSION/g" \
${CHANGELOG}.in > ${CHANGELOG}
......
__NAME__ (__FHGFS_VERSION__.debian__DEBIAN_VERSION__) stable; urgency=low
__NAME__ (__VER__.__RELEASE_STR__.debian__DEBIAN_VERSION__) stable; urgency=low
* initial native debian packaging
......
......@@ -64,7 +64,7 @@ make FHGFS_OPENTK_PATH=%{FHGFS_OPENTK_PATH} \
FHGFS_COMMON_PATH=%{FHGFS_COMMON_PATH} \
FHGFS_ONLINE_CFG_PATH=%{FHGFS_ONLINE_CFG_PATH} \
FHGFS_FSCK_PATH=%{FHGFS_FSCK_PATH} \
FHGFS_VERSION=${FHGFS_VERSION} \
FHGFS_VERSION=%{FHGFS_VERSION} \
-C build/
......
......@@ -8,7 +8,7 @@ VER=${VER:-"2011.04"}
RELEASE_STR=${RELEASE_STR:-`date +%F|tr - .`.`date +%T| tr -d :`}
#CODENAME=`lsb_release -c -s`
DEBIAN_VERSION=`lsb_release -r -s | sed -e 's/\..*$//'`
FHGFS_VERSION="${VER}.${RELEASE_STR}"
FHGFS_VERSION="${VER}-${RELEASE_STR}"
FHGFS_OPENTK_PATH=${FHGFS_OPENTK_PATH:-`readlink -f ../../fhgfs_opentk_lib`}
FHGFS_COMMON_PATH=${FHGFS_COMMON_PATH:-`readlink -f ../../fhgfs_common`}
......@@ -20,7 +20,8 @@ RULES="debian/rules"
sed \
-e "s/__NAME__/$NAME/g" \
-e "s/__FHGFS_VERSION__/$FHGFS_VERSION/g" \
-e "s/__VER__/$VER/" \
-e "s/__RELEASE_STR__/$RELEASE_STR/" \
-e "s/__DEBIAN_VERSION__/$DEBIAN_VERSION/g" \
${CHANGELOG}.in > ${CHANGELOG}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment