|
@@ -7,7 +7,7 @@ TEXTDOMAINDIR=/usr/share/locale
|
|
|
Usage(){
|
|
Usage(){
|
|
|
cat<<EOF
|
|
cat<<EOF
|
|
|
$(basename $0) @@VBUILDER_VERSION@@ $(echo $([ -z "@@VBUILDER_REVISION@@" ] || echo "(r@@VBUILDER_REVISION@@)"))
|
|
$(basename $0) @@VBUILDER_VERSION@@ $(echo $([ -z "@@VBUILDER_REVISION@@" ] || echo "(r@@VBUILDER_REVISION@@)"))
|
|
|
-Usage: $(basename $0) {--profile [profile]} {--version [version]} {--arch [arch]} {--category [categories]} {--fetch-url [fetch_url]} {--dist-upgrade} {--target [target]} {--with-compat32} {--rpmbuild-define [macro_expr]} {--rpmbuild-with [bcond_with]} {--rpmbuild-without [bcond_with]} {--sign} {--no-install} {--debug} {--help} {--bootstrap-dir [directory]} {--unionfs-dir [directory]} {--cache-dir [directory]} {--built-rpms-dir [directory]} {clean|build|build-rpm [src.rpm]|install-rpm [arch.rpm|package]|remove-rpm [package]}
|
|
+Usage: $(basename $0) {--profile [profile]} {--version [version]} {--arch [arch]} {--category [categories]} {--fetch-url [fetch_url]} {--dist-upgrade} {--target [target]} {--no-build-essential} {--with-compat32} {--rpmbuild-define [macro_expr]} {--rpmbuild-with [bcond_with]} {--rpmbuild-without [bcond_with]} {--sign} {--no-install} {--debug} {--help} {--bootstrap-dir [directory]} {--unionfs-dir [directory]} {--cache-dir [directory]} {--built-rpms-dir [directory]} {clean|build|build-rpm [src.rpm]|install-rpm [arch.rpm|package]|remove-rpm [package]}
|
|
|
EOF
|
|
EOF
|
|
|
|
|
|
|
|
echo $"
|
|
echo $"
|
|
@@ -685,9 +685,8 @@ Build(){
|
|
|
cat >${BUILD_ROOT}/etc/apt/sources.list.d/local.list<<EOF
|
|
cat >${BUILD_ROOT}/etc/apt/sources.list.d/local.list<<EOF
|
|
|
${LOCAL_REPOS}
|
|
${LOCAL_REPOS}
|
|
|
EOF
|
|
EOF
|
|
|
- fi
|
|
|
|
|
-
|
|
|
|
|
$__chroot_sh "apt-get update"
|
|
$__chroot_sh "apt-get update"
|
|
|
|
|
+ fi
|
|
|
|
|
|
|
|
## additional base packages
|
|
## additional base packages
|
|
|
[ ! -z "${ADD_BASE_PKGS}" ] && \
|
|
[ ! -z "${ADD_BASE_PKGS}" ] && \
|
munepi