contrib/rpm: add README, improve usage output and rename --no-build option to --no-dist

This commit is contained in:
Thomas Haller 2016-02-17 11:38:40 +01:00
parent 6dc431b0c9
commit 0685780566
2 changed files with 32 additions and 6 deletions

23
contrib/fedora/rpm/README Normal file
View file

@ -0,0 +1,23 @@
# To build RPM packages for Fedora derivates directly from git, just do:
#
# preparation:
#
git clone git://anongit.freedesktop.org/NetworkManager/NetworkManager
cd NetworkManager
git checkout $WHATEVER
sudo sh ./contrib/fedora/REQUIRED_PACKAGES
#
# build the packages. Pass --help for usage help.
#
./contrib/fedora/rpm/build_clean.sh
#
# install
#
sudo dnf install ./contrib/fedora/rpm/latest/RPMS/x86_64/*rpm

View file

@ -7,15 +7,18 @@ die() {
} }
usage() { usage() {
echo "USAGE: $0 [-h|--help|-?|help] [-f|--force] [-c|--clean] [-Q|--quick]" echo "USAGE: $0 [-h|--help|-?|help] [-f|--force] [-c|--clean] [-Q|--quick] [-S|--srpm] [-N|--no-dist] [[-w|--with OPTION] ...] [[-W|--without OPTION] ...]"
echo echo
echo "Does all the steps from a clean working directory to an RPM of NetworkManager" echo "Does all the steps from a clean git working directory to an RPM of NetworkManager"
echo echo
echo "Options:" echo "Options:"
echo " --force: force build, even if working directory is not clean and has local modifications" echo " --force: force build, even if working directory is not clean and has local modifications"
echo " --clean: run \`git-clean -fdx :/\` before build" echo " --clean: run \`git-clean -fdx :/\` before build"
echo " --quick: only run \`make dist\` instead of \`make distcheck\`" echo " --quick: only run \`make dist\` instead of \`make distcheck\`"
echo " --srpm: only build the SRPM" echo " --srpm: only build the SRPM"
echo " --no-dist: skip creating the source tarball if you already did \`make dist\`"
echo " --with \$OPTION: pass --with \$OPTION to rpmbuild. For example --with debug"
echo " --without \$OPTION: pass --without \$OPTION to rpmbuild. For example --without debug"
} }
@ -31,7 +34,7 @@ cd "$GITDIR" || die "could not change to $GITDIR"
IGNORE_DIRTY=0 IGNORE_DIRTY=0
GIT_CLEAN=0 GIT_CLEAN=0
QUICK=0 QUICK=0
NO_BUILD=0 NO_DIST=0
WITH_LIST=() WITH_LIST=()
_next_with= _next_with=
@ -58,8 +61,8 @@ for A; do
-S|--srpm) -S|--srpm)
BUILDTYPE=SRPM BUILDTYPE=SRPM
;; ;;
-N|--no-build) -N|--no-dist)
NO_BUILD=1 NO_DIST=1
IGNORE_DIRTY=1 IGNORE_DIRTY=1
;; ;;
-w|--with) -w|--with)
@ -93,7 +96,7 @@ if [[ $IGNORE_DIRTY != 1 ]]; then
fi fi
fi fi
if [[ $NO_BUILD != 1 ]]; then if [[ $NO_DIST != 1 ]]; then
./autogen.sh --enable-gtk-doc || die "Error autogen.sh" ./autogen.sh --enable-gtk-doc || die "Error autogen.sh"
if [[ $QUICK == 1 ]]; then if [[ $QUICK == 1 ]]; then