|
@@ -5,7 +5,6 @@ TEXTDOMAIN=vbootstrap
|
|
|
TEXTDOMAINDIR=/usr/share/locale
|
|
|
|
|
|
Usage(){
|
|
|
- set
|
|
|
cat<<EOF
|
|
|
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}
|
|
|
|
|
@@ -705,6 +704,7 @@ RPM_Build(){
|
|
|
RPM_Sign(){
|
|
|
[ $with_sign -eq 1 ] || return 1
|
|
|
|
|
|
+ ## check $SUDO_USER and $USERHELPER_UID
|
|
|
local RPM_SIGN_USER=$SUDO_USER
|
|
|
if [ -z "${RPM_SIGN_USER}" ]; then
|
|
|
RPM_SIGN_USER=$(user_from_uid $USERHELPER_UID)
|
|
@@ -714,9 +714,17 @@ RPM_Sign(){
|
|
|
fi
|
|
|
fi
|
|
|
|
|
|
+ setup-vbootstrap || return 1
|
|
|
+
|
|
|
+ [ -d ${BUILD_ROOT} ] || Build
|
|
|
+
|
|
|
+ mount-chroot unionfs_dir
|
|
|
+
|
|
|
echo $"Signing built rpms using ${RPM_SIGN_USER}'s key: "
|
|
|
su $RPM_SIGN_USER -c "rpm --addsign $(for i in $RPM_PKG_ARCH_LIST; do find $BUILD_ROOT${BUILD_DIR}/${i} -type f -regex '.*\.rpm' 2>/dev/null; done | sed -e s,$BUILD_ROOT${BUILD_DIR},${BUILT_RPMS_DIR}/${MAJOR_VERSION},g -e 's/$/ \\/g')"
|
|
|
|
|
|
+ mount-chroot --umount unionfs_dir
|
|
|
+
|
|
|
return 0
|
|
|
}
|
|
|
|