Browse Source

updated vbuilder.sh.in: added the target noarch in 6802RPM_TARGET_LIST

git-svn-id: http://trac.vinelinux.org/repos/projects/vbootstrap/trunk@3742 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 13 years ago
parent
commit
7ff5ccb903
2 changed files with 4 additions and 2 deletions
  1. 2 1
      vbootstrap-vl.spec
  2. 2 1
      vbuilder.sh.in

+ 2 - 1
vbootstrap-vl.spec

@@ -80,12 +80,13 @@ vbuilder は vbootstrap を利用して chroot 環境の構築し、
 
 
 %changelog
-* Sat Apr 23 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.43-1
+* Sat Apr 30 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.43-1
 - updated vbootstrap
   - supported versions format: <version>_<arch>
 - updated vbuilder.sh.in
   - dropped the action "show-info"
   - sync the above change for vbootstrap
+  - added the target "noarch" in $$RPM_TARGET_LIST
 
 * Sat Apr 16 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.42-1
 - fixed RPM_Sign(), Login_Chroot() in vbuilder.sh.in

+ 2 - 1
vbuilder.sh.in

@@ -295,7 +295,8 @@ setup-vbootstrap(){
 	## check build target option ${TARGET}
 	if [ ! -z "${TARGET}" ]; then
 	    RPM_TARGET_LIST="$(cat /usr/lib/rpm/rpmrc | grep arch_canon: | sed -e "s/arch_canon:[[:blank:]]*\(.*\):.*/\1/")"
-	    if [ -z "$(echo $RPM_TARGET_LIST | grep $TARGET)" ]; then
+	    RPM_TARGET_LIST="${RPM_TARGET_LIST} noarch"
+	    if [ -z "$(echo ${RPM_TARGET_LIST} | grep ${TARGET})" ]; then
 		echo $"E: rpm build target ${TARGET} is NOT supported"
 		return 1
 	    fi