Browse Source

updated vbuilder.sh.in: added --rpmbuild-define, --rpmbuild-without options

git-svn-id: http://trac.vinelinux.org/repos/projects/vbootstrap/trunk@2531 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 13 years ago
parent
commit
108ba2456b
3 changed files with 17 additions and 4 deletions
  1. 5 0
      vbootstrap-vl.spec
  2. 1 1
      vbuilder-bash-completion.sh
  3. 11 3
      vbuilder.sh.in

+ 5 - 0
vbootstrap-vl.spec

@@ -77,6 +77,11 @@ vbuilder は vbootstrap を利用して chroot 環境の構築し、
 
 
 %changelog
+* Wed Jan 19 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.35-1
+- updated po translations
+- updated vbuilder.sh.in, vbuilder-bash-completion.sh
+  - added --rpmbuild-define, --rpmbuild-without option
+
 * Tue Jan 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.34-1
 - updated vbuilder.sh.in
   - defined require-root() (Thanks to tomo-p-san)

+ 1 - 1
vbuilder-bash-completion.sh

@@ -22,7 +22,7 @@ _vbuilder()
     first="${COMP_WORDS[1]}"
 
     ## The basic options we'll complete.
-    options="--version --arch --category --dist-upgrade --unionfs --target --with-compat32 --rpmbuild-with --sign --no-install --bootstrap-dir --cache-dir --built-rpms-dir"
+    options="--version --arch --category --dist-upgrade --unionfs --target --with-compat32 --rpmbuild-define --rpmbuild-with --rpmbuild-without --sign --no-install --bootstrap-dir --cache-dir --built-rpms-dir"
     actions="clean build build-rpm install-rpm remove-rpm show-info"
     opts="$options $actions"
 

+ 11 - 3
vbuilder.sh.in

@@ -6,7 +6,7 @@ TEXTDOMAINDIR=/usr/share/locale
 
 Usage(){
     cat<<EOF
-Usage:	$(basename $0) {--version [version]} {--arch [arch]} {--category [categories]} {--dist-upgrade} {--target [target]} {--with-compat32} {--rpmbuild-with [bcond_with]} {--sign} {--no-install} {--bootstrap-dir [directory]} {--cache-dir [directory]} {--built-rpms-dir [directory]} {clean|build|build-rpm [src.rpm]|install-rpm [arch.rpm|package]|remove-rpm [package]|show-info}
+Usage:	$(basename $0) {--version [version]} {--arch [arch]} {--category [categories]} {--dist-upgrade} {--target [target]} {--with-compat32} {--rpmbuild-define [macro_expr]} {--rpmbuild-with [bcond_with]} {--rpmbuild-without [bcond_with]} {--sign} {--no-install} {--bootstrap-dir [directory]} {--cache-dir [directory]} {--built-rpms-dir [directory]} {clean|build|build-rpm [src.rpm]|install-rpm [arch.rpm|package]|remove-rpm [package]|show-info}
 
 Options:
 	--version:		set [version] (default: ${DEFAULT_VERSION})
@@ -16,7 +16,9 @@ Options:
 	--unionfs:		cover a bootstrap with unionfs
 	--target:		build rpms with [target]
 	--with-compat32:	build rpms with compat32 on boostrap
+	--rpmbuild-define:	give a option --define [macro_expr] to rpmbuild
 	--rpmbuild-with:	give a option --with [bcond_with] to rpmbuild
+	--rpmbuild-without:	give a option --without [bcond_with] to rpmbuild
 	--sign:			sign built rpms
 	--no-install:		build only a source rpm - do NOT install a built rpm
 	--bootstrap-dir:	set a bootstrap directory (default: ${VBOOTSTRAP_DIR})
@@ -59,7 +61,7 @@ check-parameter(){
 		Usage
 		return 1
 		;;
-	    --version|--arch|--category|--target|--rpmbuild-with|--bootstrap-dir|--cache-dir|--built-rpms-dir)
+	    --version|--arch|--category|--target|--rpmbuild-define|--rpmbuild-with|--rpmbuild-without|--bootstrap-dir|--cache-dir|--built-rpms-dir)
 		[ $with_actions -eq 1 ] && \
 		    echo $"E: You can give no more options after actions" && \
 		    return 1
@@ -709,7 +711,7 @@ require-root $* || exit 1
 while [ $# -gt 0 ]; do
     tmpARG=$1
     case $tmpARG in
-	--version|--arch|--category|--target|--rpmbuild-with|--bootstrap-dir|--cache-dir|--built-rpms-dir)
+	--version|--arch|--category|--target|--rpmbuild-define|--rpmbuild-with|--rpmbuild-without|--bootstrap-dir|--cache-dir|--built-rpms-dir)
 	    shift
 	    ;;
 	--dist-upgrade|--unionfs|--with-compat32|--sign|--no-install)
@@ -748,9 +750,15 @@ while [ $# -gt 0 ]; do
 	--with-compat32)
 	    RPM_OPTS="${RPM_OPTS} --with compat32"
 	    ;;
+	--rpmbuild-define)
+	    RPM_OPTS="${RPM_OPTS} --define $1"
+	    ;;
 	--rpmbuild-with)
 	    RPM_OPTS="${RPM_OPTS} --with $1"
 	    ;;
+	--rpmbuild-without)
+	    RPM_OPTS="${RPM_OPTS} --without $1"
+	    ;;
 	--sign)
 	    with_sign=1
 	    ;;