|
@@ -206,13 +206,18 @@ setup-vbootstrap(){
|
|
|
Msg_NoSupportVARCH_$LOCALE
|
|
|
[ $? -eq 0 ] && exit 1
|
|
|
;;
|
|
|
+ i686)
|
|
|
+ [ "$(uname -i)" = "ppc" ] && \
|
|
|
+ Msg_NoSupportVARCH_$LOCALE
|
|
|
+ [ $? -eq 0 ] && exit 1
|
|
|
+ ;;
|
|
|
x86_64)
|
|
|
[ "$(uname -i)" = "ppc" ] && \
|
|
|
Msg_NoSupportVARCH_$LOCALE
|
|
|
[ $? -eq 0 ] && exit 1
|
|
|
;;
|
|
|
ppc)
|
|
|
- [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ] && \
|
|
|
+ [ "$(uname -i)" = "i386" -o "$(uname -i)" = "i686" -o "$(uname -i)" = "x86_64" ] && \
|
|
|
Msg_NoSupportVARCH_$LOCALE
|
|
|
[ $? -eq 0 ] && exit 1
|
|
|
;;
|
|
@@ -531,7 +536,7 @@ RPM_Build(){
|
|
|
RPM_PKG_USER=$(stat -c %U $RPM_PKG)
|
|
|
RPM_PKG_GROUP=$(stat -c %G $RPM_PKG)
|
|
|
local __install="install -p -v -o ${RPM_PKG_USER} -g ${RPM_PKG_GROUP}"
|
|
|
- RPM_PKG_ARCH_LIST="RPMS/i386 RPMS/x86_64 RPMS/ppc RPMS/noarch SRPMS"
|
|
|
+ RPM_PKG_ARCH_LIST="RPMS/i386 RPMS/i686 RPMS/x86_64 RPMS/ppc RPMS/noarch SRPMS"
|
|
|
[ -z "${TARGET}" ] || \
|
|
|
RPM_PKG_ARCH_LIST="RPMS/${TARGET} ${RPM_PKG_ARCH_LIST}"
|
|
|
|