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

package/base-files/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		48
+PKG_RELEASE:=		49
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 

package/base-files/src/etc/init.d/boot

@@ -26,4 +26,8 @@ for f in /etc/modules.d/*; do
 done
 # settle down, after module load
 sleep 2
+# any lvm volumes to activate?
+[ -x /usr/sbin/lvm ] && { lvm vgscan; lvm vgchange -ay;}
+# check and mount all filesystems not /
+[ -f /etc/fstab ] && { fsck -p >/dev/null; mount -a; swapon -a;}
 exit 0

package/base-files/src/etc/network/if-pre-up.d/03-bridge

@@ -15,7 +15,9 @@ case "$IF_BRIDGE_PORTS" in
 esac
 
 brctl addbr $IFACE || exit 1
-[[ -n $IF_BRIDGE_FD ]] && brctl setfd $IFACE $IF_BRIDGE_FD
+if [ "$IF_BRIDGE_FD" != "" ]; then
+ brctl setfd $IFACE $IF_BRIDGE_FD
+fi
 
 for IF in $INTERFACES; do
   if ! grep -q $IF /proc/net/dev; then

package/base-files/src/init

@@ -22,5 +22,4 @@ cat /etc/.rnd >/dev/urandom 2>&1
 [ -x /kexecinit ] && { /kexecinit; }
 [ -x /cryptinit ] && { /cryptinit; exec switch_root /mnt "/init";}
 [ -x /sbin/cfgfs ] && { cfgfs setup; mount -o remount,ro /;} || mount -o remount,rw /
-[ -f /etc/fstab ] && { fsck -p >/dev/null; mount -a; swapon -a;}
 exec /sbin/init

package/coreutils/Makefile

@@ -12,20 +12,28 @@ PKG_SECTION:=		base
 PKG_URL:=		http://www.gnu.org/software/coreutils/
 PKG_SITES:=		http://ftp.gnu.org/gnu/coreutils/
 
-PKG_SUBPKGS:=		TSORT
+PKG_SUBPKGS:=		TSORT SHA256SUM
 PKGSD_TSORT:=		topological sort utility
 PKGSC_TSORT:=		misc
+PKGSD_SHA256SUM:=	SHA1 256 bit checksum utility
+PKGSC_SHA256SUM:=	misc
 
 include $(TOPDIR)/mk/package.mk
 
 #$(eval $(call PKG_template,COREUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,TSORT,tsort,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_TSORT},${PKGSC_TSORT}))
+$(eval $(call PKG_template,SHA256SUM,sha256sum,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_SHA256SUM},${PKGSC_SHA256SUM}))
 
 CONFIGURE_ARGS+=	--disable-rpath
 
-post-install:
+tsort-install:
 	$(INSTALL_DIR) $(IDIR_TSORT)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/tsort \
 		$(IDIR_TSORT)/usr/bin
 
+sha256sum-install:
+	$(INSTALL_DIR) $(IDIR_SHA256SUM)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/sha256sum \
+		$(IDIR_SHA256SUM)/usr/bin
+
 include ${TOPDIR}/mk/pkg-bottom.mk

package/eglibc/Makefile

@@ -54,7 +54,7 @@ ifeq ($(ADK_LOCALES),y)
 	$(CP) $(STAGING_TARGET_DIR)/usr/bin/locale $(IDIR_EGLIBC)/usr/bin
 endif
 	${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc \
-	    $(IDIR_EGLIBC)/usr/lib
+	    $(IDIR_EGLIBC)/usr/lib $(IDIR_EGLIBC)/usr/bin
 	cd ${STAGING_TARGET_DIR} && for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \
 		test -s usr/share/zoneinfo/"$$f" || continue; \
 		echo usr/share/zoneinfo/"$$f" | \
@@ -82,6 +82,7 @@ endif
 	${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/gai.conf ${IDIR_EGLIBC}/etc
 	${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/nscd.conf ${IDIR_EGLIBC}/etc
 	${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/nsswitch.conf ${IDIR_EGLIBC}/etc
+	$(CP) $(STAGING_TARGET_DIR)/usr/bin/getconf $(IDIR_EGLIBC)/usr/bin
 
 eglibc-static-install:
 	${INSTALL_DIR} $(IDIR_EGLIBC_STATIC)/usr/lib
@@ -102,7 +103,7 @@ ifeq ($(ADK_TARGET_ABI_N64),y)
 endif
 	${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_EGLIBC_DEV}/usr/lib
 	${CP} ${STAGING_TARGET_DIR}/usr/lib/libc_nonshared.a ${IDIR_EGLIBC_DEV}/usr/lib
-	-for file in libc libcrypt libdl libm libresolv librt libutil; do \
+	-for file in libcrypt libdl libm libresolv librt libutil; do \
 		cd $(IDIR_EGLIBC_DEV)/lib/; ln -sf $$file-$(PKG_VERSION).so $$file.so; \
 	done
 	# header package

package/glibc/Makefile

@@ -57,7 +57,7 @@ glibc-dev-install:
 	-cp ./files/libc.so.$(CPU_ARCH) $(IDIR_GLIBC_DEV)/usr/lib/libc.so
 	${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_GLIBC_DEV}/usr/lib
 	${CP} ${STAGING_TARGET_DIR}/usr/lib/libc_nonshared.a ${IDIR_GLIBC_DEV}/usr/lib
-	-for file in libc libcrypt libdl libm libresolv librt libutil; do \
+	-for file in libcrypt libdl libm libresolv librt libutil; do \
 		cd $(IDIR_GLIBC_DEV)/lib; ln -sf $$file-$(PKG_VERSION).so $$file.so; \
 	done
 	# header package

package/libXp/Makefile

@@ -15,21 +15,20 @@ PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_SUBPKGS:=		LIBXP LIBXP_DEV
 PKGSD_LIBXP_DEV:=	X Print headers
 PKGSC_LIBXP_DEV:=	x11/devel
+PKGSS_LIBXP_DEV:=	printproto
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXP,libpt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXP_DEV,libpt-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXP_DEV},${PKGSC_LIBXP_DEV}))
+$(eval $(call PKG_template,LIBXP,libxp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXP_DEV,libxp-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXP_DEV},${PKGSC_LIBXP_DEV}))
 
 libxp-install:
 	${INSTALL_DIR} ${IDIR_LIBXP}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXp.so* ${IDIR_LIBXP}/usr/lib
 
 libxp-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBXP_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXP_DEV}/usr/include
 	${INSTALL_DIR} ${IDIR_LIBXP_DEV}/usr/lib/pkgconfig
-	${INSTALL_DATA} ${WRKINST}/usr/lib/pkgconfig/*.pc \
+	${INSTALL_DATA} ${WRKBUILD}/*.pc \
 		${IDIR_LIBXP_DEV}/usr/lib/pkgconfig
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/libvirt/files/libvirt.init

@@ -10,13 +10,14 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	/usr/sbin/libvirtd -dv
+	/usr/sbin/libvirtd -d
 	;;
 stop)
 	kill $(pgrep -f /usr/sbin/libvirtd)
 	;;
 restart)
 	sh $0 stop
+	sleep 2
 	sh $0 start
 	;;
 *)

package/zip/patches/patch-unix_Makefile

@@ -0,0 +1,33 @@
+--- zip30.orig/unix/Makefile	2008-05-07 08:33:56.000000000 +0200
++++ zip30/unix/Makefile	2011-10-19 22:21:08.000000000 +0200
+@@ -22,7 +22,7 @@ SHELL = /bin/sh
+ LN = ln -s
+ 
+ # (to use the GNU compiler, change cc to gcc in CC)
+-CC = cc
++CC ?= cc
+ BIND = $(CC)
+ AS = $(CC) -c
+ CPP = /lib/cpp
+@@ -58,7 +58,7 @@ IZ_OUR_BZIP2_DIR = bzip2
+ #   LFLAGS1   flags after output file spec, before obj file list
+ #   LFLAGS2   flags after obj file list (libraries, etc)
+ CFLAGS_NOOPT = -I. -DUNIX $(LOCAL_ZIP)
+-CFLAGS = -O2 $(CFLAGS_NOOPT)
++CFLAGS ?= -O2 $(CFLAGS_NOOPT)
+ LFLAGS1 =
+ LFLAGS2 = -s
+ 
+@@ -199,10 +199,10 @@ flags:  unix/configure
+ #               Generic targets:
+ 
+ generic: flags
+-	eval $(MAKE) $(MAKEF) zips `cat flags`
++	eval $(MAKE) $(MAKEF) zips `cat flags` CC=$(CC)
+ 
+ generic_gcc:
+-	$(MAKE) $(MAKEF) generic CC=gcc CPP="gcc -E"
++	$(MAKE) $(MAKEF) generic CPP="gcc -E" CC=$(CC)
+ 
+ # AT&T 6300 PLUS (don't know yet how to allocate 64K bytes):
+ att6300nodir:

package/zip/patches/patch-unix_Makefile.orig

@@ -0,0 +1,29 @@
+--- zip30.orig/unix/Makefile	2008-05-07 08:33:56.000000000 +0200
++++ zip30/unix/Makefile	2011-10-19 22:20:07.000000000 +0200
+@@ -22,7 +22,7 @@ SHELL = /bin/sh
+ LN = ln -s
+ 
+ # (to use the GNU compiler, change cc to gcc in CC)
+-CC = cc
++CC ?= cc
+ BIND = $(CC)
+ AS = $(CC) -c
+ CPP = /lib/cpp
+@@ -58,7 +58,7 @@ IZ_OUR_BZIP2_DIR = bzip2
+ #   LFLAGS1   flags after output file spec, before obj file list
+ #   LFLAGS2   flags after obj file list (libraries, etc)
+ CFLAGS_NOOPT = -I. -DUNIX $(LOCAL_ZIP)
+-CFLAGS = -O2 $(CFLAGS_NOOPT)
++CFLAGS ?= -O2 $(CFLAGS_NOOPT)
+ LFLAGS1 =
+ LFLAGS2 = -s
+ 
+@@ -202,7 +202,7 @@ generic: flags
+ 	eval $(MAKE) $(MAKEF) zips `cat flags`
+ 
+ generic_gcc:
+-	$(MAKE) $(MAKEF) generic CC=gcc CPP="gcc -E"
++	$(MAKE) $(MAKEF) generic CPP="gcc -E" CC=$(CC)
+ 
+ # AT&T 6300 PLUS (don't know yet how to allocate 64K bytes):
+ att6300nodir:

scripts/adkprepare.sh

@@ -7,10 +7,11 @@ ver=$(uname -r)
 arch=$(uname -m)
 
 ext=0
-while getopts "e" option
+while getopts "el" option
 do
 	case $option in
 		e) ext=1 ;;
+		l) lux=1 ;;
 		*) printf "Option not recognized\n";exit 1 ;;
 	esac
 done
@@ -49,12 +50,19 @@ openbsd_full() {
 	pkg_add -v m4
 	pkg_add -v autoconf-2.62p0
 	pkg_add -v gperf
-	pkg_add -v python-2.6.3p1
+	pkg_add -v python-2.6.6p0
+}
+
+openbsd_lux() {
+	PKG_PATH="ftp://ftp.openbsd.org/pub/OpenBSD/${ver}/packages/${arch}/"
+	export PKG_PATH
+	pkg_add -v screen--
+	pkg_add -v vim--no_x11
 }
 
 netbsd() {
 	echo "Preparing NetBSD for OpenADK"
-	PKG_PATH="ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/${arch}/5.0/All/"
+	PKG_PATH="ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/${arch}/${ver}/All/"
 	export PKG_PATH
 	pkg_add -vu xz
 	pkg_add -vu scmgit
@@ -71,7 +79,7 @@ netbsd() {
 
 netbsd_full() {
 	echo "Preparing NetBSD for full OpenADK package builds"
-	PKG_PATH="ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/${arch}/5.0/All/"
+	PKG_PATH="ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/${arch}/${ver}/All/"
 	export PKG_PATH
 	pkg_add -vu intltool
 	pkg_add -vu lynx
@@ -82,6 +90,15 @@ netbsd_full() {
 	pkg_add -vu python26
 }
 
+netbsd_lux() {
+	echo "Preparing NetBSD for deluxe OpenADK package builds"
+	PKG_PATH="ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/${arch}/${ver}/All/"
+	export PKG_PATH
+	pkg_add -vu vim
+	pkg_add -vu screen
+	pkg_add -vu mksh
+}
+
 freebsd() {
 	echo "Preparing FreeBSD for OpenADK"
 	pkg_add -r git gmake bash wget unzip gtar gsed gawk gperf
@@ -89,7 +106,12 @@ freebsd() {
 
 freebsd_full() {
 	echo "Preparing FreeBSD for full OpenADK package builds"
-	pkg_add -r intltool lynx bison zip xkbcomp glib20 libIDL autoconf262
+	pkg_add -r intltool lynx bison zip xkbcomp glib20 libIDL autoconf268 libxslt automake14 swig
+}
+
+freebsd_lux() {
+	echo "Preparing FreeBSD for deluxe OpenADK package builds"
+	pkg_add -r screen mksh vim
 }
 
 case $os in 
@@ -100,14 +122,17 @@ case $os in
 	FreeBSD)
 		freebsd
 		[ $ext -eq 1 ] && freebsd_full
+		[ $lux -eq 1 ] && freebsd_lux
 		;;
 	OpenBSD)
 		openbsd
 		[ $ext -eq 1 ] && openbsd_full
+		[ $lux -eq 1 ] && openbsd_lux
 		;;
 	NetBSD)
 		netbsd
 		[ $ext -eq 1 ] && netbsd_full
+		[ $lux -eq 1 ] && netbsd_lux
 		;;
 	Darwin)
 		darwin

scripts/tar

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+if [ -z "$(which gtar 2>/dev/null)" ];then
+	/bin/tar "$@"
+else
+	gtar "$@"
+fi

toolchain/gmp/Makefile

@@ -12,13 +12,7 @@ endif
 
 $(WRKBUILD)/.headers:
 $(WRKBUILD)/.configured:
-# for cygwin and ubunto on amd64
-ifneq (,$(filter CYGWIN%,${OStype}))
 	(cd $(WRKBUILD); cp configfsf.guess config.guess)
-endif
-ifeq (${OStype},Linux)
-	(cd $(WRKBUILD); cp configfsf.guess config.guess)
-endif
 	(cd $(WRKBUILD); \
 		./configure \
 		--prefix=$(STAGING_HOST_DIR) \