dist/debian: minor fixes for relocatable .deb
- we don't use pbuilder anymore, so drop pbuilderrc - on build_deb.sh is_debian / is_ubuntu functions are unused now, drop them Signed-off-by: Takuya ASADA <syuu@scylladb.com> Message-Id: <20181024222136.3332-1-syuu@scylladb.com>
This commit is contained in:
parent
df2dee2402
commit
9ed8a01519
14
dist/debian/build_deb.sh
vendored
14
dist/debian/build_deb.sh
vendored
@ -28,20 +28,6 @@ is_redhat_variant() {
|
||||
is_debian_variant() {
|
||||
[ -f /etc/debian_version ]
|
||||
}
|
||||
is_debian() {
|
||||
case "$1" in
|
||||
jessie|stretch) return 0;;
|
||||
*) return 1;;
|
||||
esac
|
||||
}
|
||||
is_ubuntu() {
|
||||
case "$1" in
|
||||
trusty|xenial|bionic) return 0;;
|
||||
*) return 1;;
|
||||
esac
|
||||
}
|
||||
|
||||
|
||||
pkg_install() {
|
||||
if is_redhat_variant; then
|
||||
sudo yum install -y $1
|
||||
|
26
dist/debian/pbuilderrc
vendored
26
dist/debian/pbuilderrc
vendored
@ -1,26 +0,0 @@
|
||||
USENETWORK=yes
|
||||
BUILD_HOME=/tmp
|
||||
BASETGZ="/var/cache/pbuilder/$PRODUCT-jmx-$DIST.tgz"
|
||||
DISTRIBUTION="$DIST"
|
||||
BUILDRESULT="/var/cache/pbuilder/$PRODUCT-jmx-$DIST/result/"
|
||||
APTCACHE="/var/cache/pbuilder/$PRODUCT-jmx-$DIST/aptcache/"
|
||||
ALLOWUNTRUSTED=yes
|
||||
|
||||
if [ "$DIST" = "trusty" ] || [ "$DIST" = "xenial" ] || [ "$DIST" = "yakkety" ] || [ "$DIST" = "zesty" ] || [ "$DIST" = "artful" ] || [ "$DIST" = "bionic" ]; then
|
||||
MIRRORSITE="http://archive.ubuntu.com/ubuntu/"
|
||||
COMPONENTS="main restricted universe multiverse"
|
||||
DEBOOTSTRAPOPTS="--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg"
|
||||
if [ "$DIST" = "trusty" ]; then
|
||||
OTHERMIRROR="deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu trusty main"
|
||||
fi
|
||||
elif [ "$DIST" = "jessie" ] || [ "$DIST" = "stretch" ] || [ "$DIST" = "buster" ] || [ "$DIST" = "sid" ]; then
|
||||
MIRRORSITE="http://deb.debian.org/debian/"
|
||||
COMPONENTS="main contrib non-free"
|
||||
DEBOOTSTRAPOPTS="--keyring=/usr/share/keyrings/debian-archive-keyring.gpg"
|
||||
if [ "$DIST" = "jessie" ]; then
|
||||
OTHERMIRROR="deb http://httpredir.debian.org/debian jessie-backports main"
|
||||
fi
|
||||
else
|
||||
echo "Unknown distribution: $DIST"
|
||||
exit 1
|
||||
fi
|
Loading…
x
Reference in New Issue
Block a user