Browse Source

fix recompile BUG of PKG_MULTI packages

Waldemar Brodkorb 14 years ago
parent
commit
55c0efbdbd
3 changed files with 5 additions and 14 deletions
  1. 0 1
      BUGS
  2. 0 2
      scripts/rstrip.sh
  3. 5 11
      scripts/split-cfg.sh

+ 0 - 1
BUGS

@@ -1,3 +1,2 @@
-- packages with subpackages get recompiled
 - openssh on amd64 does not work, ssh-keygen endless loop
 - uclibc on lemote mips64 target does not work (only uclibc-trunk with patches)

+ 0 - 2
scripts/rstrip.sh

@@ -33,10 +33,8 @@ find $TARGETS -type f -a -exec file {} \; | \
 	T=$T$stripcomm
 	case $line in
 	*ELF*executable*statically\ linked*)
-		echo >&2 "$SELF: *WARNING* '$V' is not dynamically linked!"
 		;;
 	*ELF*relocatable*,\ not\ stripped*)
-		echo >&2 "$SELF: *WARNING* '$V' is a relocatable!"
 		;;
 	esac
 	case $line in

+ 5 - 11
scripts/split-cfg.sh

@@ -62,28 +62,22 @@ for oldfile in $oldfiles; do
 done
 print -nu2 '\r'
 
-# now scan for dependencies of packages; the information
-# should probably be in build_mipsel because it's generated
-# at build time, but OTOH, soon enough, parts of Makefile
-# and the entire Config.in will be auto-generated anyway,
-# so we're better off placing it here
-#XXX this is too slow @868 configure options
+# now handle package dependencies
 cd $TOPDIR/.cfg_${TARGET}_${LIBC}
 rm -f $TOPDIR/package/*/info.mk
 for option in *; do
 	pbar="$option ..."
 	print -nu2 "$pbar\r"
 	ao=:
-	fgrep -l $option $TOPDIR/package/*/{Makefile,Config.*} 2>&- | \
+	fgrep -l $option $TOPDIR/package/*/Config.* 2>&- | \
 	    while read line; do
 		print -r -- ${line%/*}/info.mk
 	done | while read fname; do
 		[[ $ao = *:$fname:* ]] && continue
 		ao=$ao$fname:
-		echo "\${_IPKGS_COOKIE}: \${TOPDIR}/.cfg_${TARGET}_${LIBC}/$option" >>$fname
+		if [ "$option" != "ADK_HAVE_DOT_CONFIG" ];then
+			echo "\${_IPKGS_COOKIE}: \${TOPDIR}/.cfg_${TARGET}_${LIBC}/$option" >>$fname
+		fi
 	done
 done
-pbar=done
-print -u2 "$pbar"
-
 exit 0