Merge branch 'master' of git+ssh://openadk.org/git/openadk

7 files changed, 42 insertions, 233 deletions

diff --git a/scripts/adkprepare.sh b/scripts/adkprepare.sh
index ff0ecfaf7..c76907c7f 100755
--- a/scripts/adkprepare.sh
+++ b/scripts/adkprepare.sh
@@ -43,14 +43,11 @@ openbsd() {
 openbsd_full() {
 	PKG_PATH="ftp://ftp.openbsd.org/pub/OpenBSD/${ver}/packages/${arch}/"
 	export PKG_PATH
-	pkg_add -v bison
 	pkg_add -v zip
 	pkg_add -v intltool
 	pkg_add -v libIDL
 	pkg_add -v m4
-	pkg_add -v autoconf-2.62p0
 	pkg_add -v gperf
-	pkg_add -v python-2.6.6p0
 }
 
 openbsd_lux() {
@@ -84,10 +81,8 @@ netbsd_full() {
 	pkg_add -vu intltool
 	pkg_add -vu lynx
 	pkg_add -vu zip
-	pkg_add -vu bison
 	pkg_add -vu libIDL
 	pkg_add -vu xkbcomp
-	pkg_add -vu python26
 }
 
 netbsd_lux() {
@@ -106,7 +101,7 @@ freebsd() {
 
 freebsd_full() {
 	echo "Preparing FreeBSD for full OpenADK package builds"
-	pkg_add -r intltool lynx bison zip xkbcomp glib20 libIDL autoconf268 libxslt automake14 swig
+	pkg_add -r intltool lynx zip xkbcomp glib20 libIDL libxslt swig
 }
 
 freebsd_lux() {
diff --git a/scripts/create.sh b/scripts/create.sh
index e96f4db77..058942314 100755
--- a/scripts/create.sh
+++ b/scripts/create.sh
@@ -37,7 +37,7 @@ esac
 
 test -n "$KSH_VERSION" || if ! which mksh >/dev/null 2>&1; then
 	make package=mksh fetch || exit 1
-	df=mksh-R40f.cpio.gz
+	df=mksh-R48b.tgz
 	rm -rf build_mksh
 	mkdir -p build_mksh
 	gzip -dc dl/"$df" | (cd build_mksh; cpio -mid)
@@ -297,7 +297,7 @@ fi
 print "Creating ext2fs filesystem image..."
 cd "$T"
 f=0
-genext2fs -U -b $((partfssz)) -d src fsimg || f=1
+genext2fs -U -N 32768 -b $((partfssz)) -d src fsimg || f=1
 if (( !f )); then
 	# use bc(1): this may be over the shell’s 32-bit arithmetics
 	wantsz=$($bc <<<"$((partfssz))*1024")
diff --git a/scripts/make-ipkg-dir.sh b/scripts/make-ipkg-dir.sh
index 857076fb1..65eeb5621 100644
--- a/scripts/make-ipkg-dir.sh
+++ b/scripts/make-ipkg-dir.sh
@@ -1,4 +1,4 @@
-BASE=http://www.openadk.org
+BASE=http://www.openadk.org/distfiles
 TARGET=$1
 CONTROL=$2
 VERSION=$3
@@ -14,7 +14,7 @@ grep '^Priority' "$CONTROL" 2>&1 >/dev/null || \
         echo "Priority: optional" >> "$TARGET/CONTROL/control"
 grep '^Source' "$CONTROL" 2>&1 >/dev/null || {
         pkgbase=$(echo "$WD" | sed -e "s|^$TOPDIR/||g")
-        [ "$pkgbase" = "$WD" ] && src="N/A" || src="$BASE/$pkgbase"
+        [ "$pkgbase" = "$WD" ] && src="N/A" || src="$BASE"
         echo "Source: $src" >> "$TARGET/CONTROL/control"
 }
 echo "Version: $VERSION" >> "$TARGET/CONTROL/control"
diff --git a/scripts/rstrip.sh b/scripts/rstrip.sh
index 846bafd2f..e676dea82 100644
--- a/scripts/rstrip.sh
+++ b/scripts/rstrip.sh
@@ -28,8 +28,13 @@ fi
 find $TARGETS -type f -a -exec file {} \; | \
     while IFS= read -r line; do
 	F=${line%%:*}
+	D=${TARGETS}-dbg
 	V=${F##*/fake-+([!/])/}
+	P=${F##*/pkg-+([!/])/}
+	Q=${P%/*}
+	R=${P##*/}
 	T="${prefix}strip"
+	O="${prefix}objcopy"
 	T=$T$stripcomm
 	case $line in
 	*ELF*executable*statically\ linked*)
@@ -55,6 +60,9 @@ find $TARGETS -type f -a -exec file {} \; | \
 	echo "$SELF: $V:$S"
 	echo "-> $T $F"
 	eval "chmod u+w $F"
+	eval "mkdir -p $D/usr/lib/debug/$Q"
+	eval "$O --only-keep-debug $F $D/usr/lib/debug/$P.debug"
 	eval "$T $F"
+	eval "cd $D/usr/lib/debug/$Q && $O --add-gnu-debuglink=$R.debug $F"
 done
 exit 0
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 757ae4256..5d4a80abc 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -23,13 +23,6 @@ out=0
 
 . $topdir/.config
 
-uname -a|grep '\(Debian\|Ubuntu\)' >/dev/null 2>&1
-if [ $? -eq 0 ];then
-	if [[ -n $ADK_COMPILE_PYTHON2 ]]; then
-		NEED_DPKG_ARCHITECTURE="$NEED_DPKG_ARCHITECTURE python2"
-	fi
-fi
-
 if [[ -n $ADK_NATIVE ]];then
 	if [[ -n $ADK_PACKAGE_NEON ]];then
 		NEED_LIBXML2_DEV="$NEED_LIBXML2_DEV neon"
@@ -68,47 +61,7 @@ if [[ -n $ADK_NATIVE ]];then
 	fi
 fi
 
-if [[ -n $ADK_PACKAGE_LIBX11 ]]; then
-	NEED_X11="$NEED_X11 libx11"
-fi
-
-if [[ -n $ADK_PACKAGE_LIBNL ]]; then
-	NEED_FLEX="$NEED_FLEX libnl"
-fi
-
-if [[ -n $ADK_PACKAGE_GPSD ]]; then
-	NEED_PYTHON="$NEED_PYTHON gpsd"
-fi
-
-if [[ -n $ADK_PACKAGE_LIBVPX ]]; then
-	NEED_YASM="$NEED_YASM libvpx"
-fi
-
-if [[ -n $ADK_COMPILE_ORBIT2 ]]; then
-	NEED_LIBIDL="$NEED_LIBIDL orbit2"
-fi
-
-if [[ -n $ADK_PACKAGE_FIREFOX ]]; then
-	NEED_YASM="$NEED_YASM firefox"
-	NEED_LIBIDL="$NEED_LIBIDL firefox"
-	NEED_PYTHON="$NEED_PYTHON firefox"
-	NEED_ZIP="$NEED_ZIP firefox"
-fi
-
-if [[ -n $ADK_PACKAGE_MESALIB ]]; then
-	NEED_MAKEDEPEND="$NEED_MAKEDEPEND mesalib"
-fi
-
-if [[ -n $ADK_COMPILE_HEIMDAL ]]; then
-	NEED_BISON="$NEED_BISON heimdal-server"
-fi
-
-if [[ -n $ADK_COMPILE_KRB5 ]]; then
-	NEED_BISON="$NEED_BISON krb5"
-fi
-
 if [[ -n $ADK_COMPILE_OPENJDK ]]; then
-	NEED_ZIP="$NEED_ZIP openjdk"
 	NEED_GXX="$NEED_GXX openjdk"
 	NEED_XSLTPROC="$NEED_XSLTPROC openjdk"
 fi
@@ -119,43 +72,18 @@ if [[ -n $ADK_COMPILE_OPENJDK ]]; then
 fi
 
 if [[ -n $ADK_COMPILE_OPENJDK7 ]]; then
-	NEED_ZIP="$NEED_ZIP openjdk7"
-fi
-
-if [[ -n $ADK_COMPILE_OPENJDK7 ]]; then
 	cd ${TOPDIR}/jtools; bash prereq.sh
 	[ $? -ne 0 ] && out=1
 fi
 
-if [[ -n $ADK_PACKAGE_LIBXCB ]]; then
-	NEED_XSLTPROC="$NEED_XSLTPROC libxcb"
-fi
-
-if [[ -n $ADK_COMPILE_PCMCIAUTILS ]]; then
-	NEED_BISON="$NEED_BISON pcmciautils"
-	NEED_FLEX="$NEED_FLEX pcmciautils"
-fi
-
 if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then
 	NEED_XKBCOMP="$NEED_XKBCOMP xkeyboard-config"
 fi
 
-if [[ -n $ADK_COMPILE_AUTOCONF ]]; then
-	NEED_M4="$NEED_M4 autoconf"
-fi
-
-if [[ -n $ADK_COMPILE_AUTOMAKE ]]; then
-	NEED_AUTOCONF="$NEED_AUTOCONF automake"
-fi
-
 if [[ -n $ADK_COMPILE_COROSYNC ]]; then
 	NEED_GROFF="$NEED_GROFF corosync"
 fi
 
-if [[ -n $ADK_COMPILE_LIBTOOL ]]; then
-	NEED_AUTOMAKE="$NEED_AUTOMAKE libtool"
-fi
-
 if [[ -n $ADK_PACKAGE_SQUID ]]; then
 	NEED_GXX="$NEED_GXX squid"
 fi
@@ -164,11 +92,6 @@ if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then
 	NEED_INTL="$NEED_INTL xkeyboard-config"
 fi
 
-if [[ -n $ADK_PACKAGE_LIBPCAP ]]; then
-	NEED_FLEX="$NEED_FLEX libpcap"
-	NEED_BISON="$NEED_BISON libpcap"
-fi
-
 if [[ -n $ADK_PACKAGE_LIBXFONT ]]; then
 	NEED_WWW="$NEED_WWW libXfont"
 	NEED_XMLTO="$NEED_XMLTO libXfont"
@@ -182,19 +105,6 @@ if [[ -n $ADK_PACKAGE_EGLIBC ]]; then
 	NEED_GPERF="$NEED_GPERF eglibc"
 fi
 
-if [[ -n $ADK_PACKAGE_GLIB ]]; then
-	NEED_GETTEXT="$NEED_GETTEXT glib"
-fi
-
-if [[ -n $ADK_PACKAGE_BCM2835_VC ]]; then
-	NEED_CMAKE="$NEED_CMAKE bcm2835-vc"
-fi
-
-if [[ -n $ADK_PACKAGE_YAJL ]]; then
-	NEED_RUBY="$NEED_RUBY yajl"
-	NEED_CMAKE="$NEED_CMAKE yajl"
-fi
-
 if [[ -n $ADK_PACKAGE_XBMC ]]; then
 	NEED_SDLDEV="$NEED_SDLDEV xbmc"
 	NEED_SDLIMAGEDEV="$NEED_SDLIMAGEDEV xbmc"
@@ -216,16 +126,6 @@ if [[ -n $ADK_PACKAGE_FONT_ADOBE_75DPI ]]; then
 	NEED_MKFONTDIR="$NEED_MKFONTDIR font-adobe-75dpi"
 fi
 
-if [[ -n $NEED_GETTEXT ]]; then
-	if ! which gettext >/dev/null 2>&1; then
-		echo >&2 You need gettext to build $NEED_GETTEXT
-		out=1
-	elif ! which msgfmt >/dev/null 2>&1; then
-		echo >&2 You need msgfmt to build $NEED_GETTEXT
-		out=1
-	fi
-fi
-
 if [[ -n $NEED_LIBTIRPCDEV ]];then
 	if ! test -f /usr/include/tirpc/netconfig.h >/dev/null; then
 		echo >&2 You need tirpc headers to build $NEED_LIBTIRPCDEV
@@ -305,15 +205,6 @@ if [[ -n $NEED_X11DEV ]];then
 	fi
 fi
 
-if [[ -n $NEED_X11 ]];then
-	if ! test -f /usr/include/X11/X.h >/dev/null; then
-	  if ! test -f /usr/local/include/X11/X.h >/dev/null; then
-		echo >&2 You need X11 headers to build $NEED_X11
-		out=1
-	  fi
-	fi
-fi
-
 if [[ -n $NEED_XEXTDEV ]];then
 	if ! test -f /usr/include/X11/extensions/XShm.h >/dev/null; then
 		echo >&2 You need X11 extensions headers to build $NEED_XEXTDEV
@@ -342,27 +233,6 @@ if [[ -n $NEED_MKFONTDIR ]]; then
 	fi
 fi
 
-if [[ -n $NEED_M4 ]]; then
-	if ! which m4 >/dev/null 2>&1; then
-		echo >&2 You need GNU m4 to build $NEED_M4
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_AUTOCONF ]]; then
-	if ! which autoconf >/dev/null 2>&1; then
-		echo >&2 You need autoconf to build $NEED_AUTOCONF
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_AUTOMAKE ]]; then
-	if ! which automake >/dev/null 2>&1; then
-		echo >&2 You need automake to build $NEED_AUTOMAKE
-		out=1
-	fi
-fi
-
 if [[ -n $NEED_INTL ]]; then
 	if ! which intltool-update >/dev/null 2>&1; then
 		echo >&2 You need intltool to build $NEED_INTL
@@ -381,34 +251,6 @@ if [[ -n $NEED_WWW ]]; then
 	fi
 fi
 
-if [[ -n $NEED_BISON ]]; then
-	if ! which bison >/dev/null 2>&1; then
-		echo >&2 You need bison to build $NEED_BISON
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_CMAKE ]]; then
-	if ! which cmake >/dev/null 2>&1; then
-		echo >&2 You need cmake to build $NEED_CMAKE
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_ZIP ]]; then
-	if ! which zip >/dev/null 2>&1; then
-		echo >&2 You need zip to build $NEED_ZIP
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_LIBIDL ]]; then
-	if ! which libIDL-config-2 >/dev/null 2>&1; then
-		echo >&2 You need libIDL-config-2 to build $NEED_LIBIDL
-		out=1
-	fi
-fi
-
 if [[ -n $NEED_SWIG ]]; then
 	if ! which swig >/dev/null 2>&1; then
 		echo >&2 You need swig to build $NEED_SWIG
@@ -430,13 +272,6 @@ if [[ -n $NEED_GXX ]]; then
 	fi
 fi
 
-if [[ -n $NEED_RUBY ]]; then
-	if ! which ruby >/dev/null 2>&1; then
-		echo >&2 You need ruby to build $NEED_RUBY
-		out=1
-	fi
-fi
-
 if [[ -n $NEED_XKBCOMP ]]; then
 	if ! which xkbcomp >/dev/null 2>&1; then
 		echo >&2 You need xkbcomp to build $NEED_XKBCOMP
@@ -451,22 +286,6 @@ if [[ -n $NEED_RPM ]]; then
 	fi
 fi
 
-if [[ -n $NEED_FLEX ]]; then
-	if ! which flex >/dev/null 2>&1; then
-		echo >&2 You need flex to build $NEED_FLEX
-		out=1
-	fi
-fi
-
-if [[ -n $ADK_LINUX_X86 ]]; then
-	if [[ -n $NEED_YASM ]]; then
-		if ! which yasm >/dev/null 2>&1; then
-			echo >&2 You need yasm to build $NEED_YASM
-			out=1
-		fi
-	fi
-fi
-
 if [[ -n $NEED_XSLTPROC ]]; then
 	if ! which xsltproc >/dev/null 2>&1; then
 		echo >&2 You need xsltproc to build $NEED_XSLTPROC
@@ -481,29 +300,6 @@ if [[ -n $NEED_DBUSGLIB ]]; then
 	fi
 fi
 
-if [[ -n $NEED_PYTHON ]]; then
-	if ! which python >/dev/null 2>&1; then
-		if ! test -x /usr/pkg/bin/python2.6 >/dev/null; then
-			echo >&2 You need python to build $NEED_PYTHON
-			out=1
-		fi
-	fi
-fi
-
-if [[ -n $NEED_MAKEDEPEND ]]; then
-	if ! which makedepend >/dev/null 2>&1; then
-		echo >&2 You need makedepend to build $NEED_MAKEDEPEND
-		out=1
-	fi
-fi
-
-if [[ -n $NEED_DPKG_ARCHITECTURE ]]; then
-	if ! which dpkg-architecture >/dev/null 2>&1; then
-		echo >&2 You need dpkg-architecture to build $NEED_DPKG_ARCHITECTURE
-		out=1
-	fi
-fi
-
 if [[ -n $ADK_USE_CCACHE ]]; then
         if ! which ccache >/dev/null 2>&1; then
                 echo >&2 You have selected to build with ccache, but ccache could not be found.
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index 7b1446b76..a060d24fc 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -112,6 +112,12 @@ if ! which gzip >/dev/null 2>&1; then
 	out=1
 fi
 
+if ! which bzip2 >/dev/null 2>&1; then
+	echo You must install bzip2 to continue.
+	echo
+	out=1
+fi
+
 if ! which lzop >/dev/null 2>&1; then
 	echo You must install lzop to continue.
 	echo
@@ -130,12 +136,6 @@ if ! which xz >/dev/null 2>&1; then
 	out=1
 fi
 
-if ! which bzip2 >/dev/null 2>&1; then
-	echo You must install bzip2 to continue.
-	echo
-	out=1
-fi
-
 if ! which patch >/dev/null 2>&1; then
 	echo You must install patch to continue.
 	echo
@@ -213,12 +213,6 @@ if ! which wget >/dev/null 2>&1; then
 	out=1
 fi
 
-if ! which file >/dev/null 2>&1; then
-	echo You must install \"file\" to continue.
-	echo
-	out=1
-fi
-
 if ! which perl >/dev/null 2>&1; then
 	echo You must install perl to continue.
 	echo
@@ -226,19 +220,19 @@ if ! which perl >/dev/null 2>&1; then
 fi
 
 if ! which m4 >/dev/null 2>&1; then
-	echo "You must install m4 (macro processor) to continue."
-	echo
-	out=1
+       echo "You must install m4 (macro processor) to continue."
+       echo
+       out=1
 fi
 
-if ! which pkg-config >/dev/null 2>&1; then
-	echo  "You need pkg-config to continue."
+if ! which bc >/dev/null 2>&1; then
+	echo  "You need bc to continue."
 	echo
 	out=1
 fi
 
-if ! which bc >/dev/null 2>&1; then
-	echo  "You need bc to continue."
+if ! which xargs >/dev/null 2>&1; then
+	echo  "You need xargs to continue."
 	echo
 	out=1
 fi
diff --git a/scripts/update-patches b/scripts/update-patches
index d38a8fdf4..f4303f841 100644
--- a/scripts/update-patches
+++ b/scripts/update-patches
@@ -77,11 +77,27 @@ else
 	patch_newfiles=0
 fi
 
+if [[ -e $WRKDIST/../.autoreconf_done ]]; then
+	touch $ORGDIST/.autoreconf_done
+	ignore_autoconf=1
+else
+	ignore_autoconf=0
+fi
+
 DIFF_FLAGS="-adu -I \"^--- $(echo $D_SUBP.orig/ | $TRANSFORM)@@	.*\""
 DIFF_FLAGS="$DIFF_FLAGS -I \"^\+\+\+ $(echo $D_SUBP/ | $TRANSFORM)@@	.*\""
 
 for file in $(cd ${WRKDIST}; find . -type f | sed 's#^\./##'); do
+	echo "DEBUG: $file" >> /tmp/debug
 	[[ ! -e $ORGDIST/$file && $patch_newfiles = 0 ]] && continue
+	[[ $file = configure && $ignore_autoconf = 1 ]] && continue	
+	[[ $file = missing && $ignore_autoconf = 1 ]] && continue	
+	[[ $file = depcomp && $ignore_autoconf = 1 ]] && continue	
+	[[ $file = install-sh && $ignore_autoconf = 1 ]] && continue	
+	[[ $file = aclocal.m4 && $ignore_autoconf = 1 ]] && continue	
+	[[ $file = INSTALL && $ignore_autoconf = 1 ]] && continue	
+	[[ $file = config.h.in && $ignore_autoconf = 1 ]] && continue	
+	[[ $(basename $file) = Makefile.in && $ignore_autoconf = 1 ]] && continue	
 	cmp -s "$ORGDIST/$file" "$WRKDIST/$file" && continue
 	echo "Processing ${file}..." >&2
 	# look in patchdir for an existing patchfile matching this