|
@@ -3,7 +3,7 @@
|
|
|
|
|
|
Usage_C(){
|
|
Usage_C(){
|
|
cat<<EOF
|
|
cat<<EOF
|
|
-Usage: $(basename $0) {--version [version]} {--arch [arch]} {--category [categories]} {--dist-upgrade} {--target [target]} {--with-compat32} {--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-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}
|
|
|
|
|
|
Options:
|
|
Options:
|
|
--version: set [version] (default: ${DEFAULT_VERSION})
|
|
--version: set [version] (default: ${DEFAULT_VERSION})
|
|
@@ -13,6 +13,7 @@ Options:
|
|
--unionfs: cover a bootstrap with unionfs
|
|
--unionfs: cover a bootstrap with unionfs
|
|
--target: build rpms with [target]
|
|
--target: build rpms with [target]
|
|
--with-compat32: build rpms with compat32 on boostrap
|
|
--with-compat32: build rpms with compat32 on boostrap
|
|
|
|
+ --rpmbuild-with: give a option --with [bcond_with] to rpmbuild
|
|
--sign: sign built rpms
|
|
--sign: sign built rpms
|
|
--no-install: build only a source rpm - do NOT install a built rpm
|
|
--no-install: build only a source rpm - do NOT install a built rpm
|
|
--bootstrap-dir: set a bootstrap directory (default: ${VBOOTSTRAP_DIR})
|
|
--bootstrap-dir: set a bootstrap directory (default: ${VBOOTSTRAP_DIR})
|
|
@@ -199,7 +200,7 @@ check-parameter(){
|
|
Usage_$LOCALE
|
|
Usage_$LOCALE
|
|
return 1
|
|
return 1
|
|
;;
|
|
;;
|
|
- --version|--arch|--category|--target|--bootstrap-dir|--cache-dir|--built-rpms-dir)
|
|
+ --version|--arch|--category|--target|--rpmbuild-with|--bootstrap-dir|--cache-dir|--built-rpms-dir)
|
|
[ $with_actions -eq 1 ] && \
|
|
[ $with_actions -eq 1 ] && \
|
|
Msg_GiveNoMoreOptions_$LOCALE && return 1
|
|
Msg_GiveNoMoreOptions_$LOCALE && return 1
|
|
shift
|
|
shift
|
|
@@ -830,7 +831,7 @@ check-parameter $* || exit 1
|
|
while [ $# -gt 0 ]; do
|
|
while [ $# -gt 0 ]; do
|
|
tmpARG=$1
|
|
tmpARG=$1
|
|
case $tmpARG in
|
|
case $tmpARG in
|
|
- --version|--arch|--category|--target|--bootstrap-dir|--cache-dir|--built-rpms-dir)
|
|
+ --version|--arch|--category|--target|--rpmbuild-with|--bootstrap-dir|--cache-dir|--built-rpms-dir)
|
|
shift
|
|
shift
|
|
;;
|
|
;;
|
|
--dist-upgrade|--unionfs|--with-compat32|--sign|--no-install)
|
|
--dist-upgrade|--unionfs|--with-compat32|--sign|--no-install)
|
|
@@ -869,6 +870,9 @@ while [ $# -gt 0 ]; do
|
|
--with-compat32)
|
|
--with-compat32)
|
|
RPM_OPTS="${RPM_OPTS} --with compat32"
|
|
RPM_OPTS="${RPM_OPTS} --with compat32"
|
|
;;
|
|
;;
|
|
|
|
+ --rpmbuild-with)
|
|
|
|
+ RPM_OPTS="${RPM_OPTS} --with $1"
|
|
|
|
+ ;;
|
|
--sign)
|
|
--sign)
|
|
with_sign=1
|
|
with_sign=1
|
|
;;
|
|
;;
|