scripts/make-distrofiles.sh: remove obsolete -s switch

diff --git a/scripts/build-in-obs.sh b/scripts/build-in-obs.sh
index 7aea0d3d12ed6a46ddc93051066c92701c4bc5be..a67fddc8d60bec72dc8418104523945796aef07e 100755 (executable)
--- a/scripts/build-in-obs.sh
+++ b/scripts/build-in-obs.sh
@@ -2,7 +2,7 @@
 
 # Example usage:
 # 1. place tarball to be released in git root dir
-# 2. scripts/make-distrofiles.sh -s
+# 2. scripts/make-distrofiles.sh
 # 3. scripts/build-in-obs.sh knot-resolver-latest
 
 project=home:CZ-NIC:$1

diff --git a/scripts/make-distrofiles.sh b/scripts/make-distrofiles.sh
index 09b96258cdb32eff2038f383178105543e3a4c76..a2aae869e3524cf6f19431e44fec06e6e580d518 100755 (executable)
--- a/scripts/make-distrofiles.sh
+++ b/scripts/make-distrofiles.sh
@@ -2,26 +2,12 @@
 set -o errexit -o nounset -o xtrace
 
 cd "$(dirname ${0})/.."
-PKGDIR="build_dist/meson-dist"
-
-# Run with -s to include *.symbols files.
+pkgdir="build_dist/meson-dist"
 
 package=knot-resolver
-withsymbols=false
-
-while getopts "s" o; do
-       case "${o}" in
-               s)
-                       withsymbols=true
-                       ;;
-               *)
-                       ;;
-       esac
-done
-shift $((OPTIND-1))
 
 
-pushd ${PKGDIR}
+pushd ${pkgdir}
 version=$(ls ${package}*.tar.xz | sed "s/${package}-\(.*\).tar.xz/\1/")
 popd
 
@@ -40,18 +26,13 @@ done
 # Rename archive to debian format
 pkgname="${package}-${version}"
 debname="${package}_${version}.orig"
-cp "${PKGDIR}/${pkgname}.tar.xz" "${debname}.tar.xz"
+cp "${pkgdir}/${pkgname}.tar.xz" "${debname}.tar.xz"
 
 # Prepare clean debian-specific directory
 tar -xf "${debname}.tar.xz"
 pushd "${pkgname}" > /dev/null
 cp -arL ../distro/deb debian
 
-# Optionally remove symbols file
-if [ "$withsymbols" = false ]; then
-    rm -f debian/*.symbols
-fi
-
 # Create debian archive and dsc
 dpkg-source -b .
 popd > /dev/null