From 11a26c7947fc54521e5e380518937dba7f07d8ca Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 20 Oct 2011 10:51:04 +0200 Subject: try to mount secondary filesystems after modules are loaded --- package/base-files/Makefile | 2 +- package/base-files/src/etc/init.d/boot | 4 ++++ package/base-files/src/etc/network/if-pre-up.d/03-bridge | 4 +++- package/base-files/src/init | 1 - 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index fa1fecd86..b00b81918 100644 --- a/package/base-files/Makefile +++ b/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 diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot index ed55ccc88..e30360142 100644 --- a/package/base-files/src/etc/init.d/boot +++ b/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 diff --git a/package/base-files/src/etc/network/if-pre-up.d/03-bridge b/package/base-files/src/etc/network/if-pre-up.d/03-bridge index 9bdbf8302..916fafadb 100755 --- a/package/base-files/src/etc/network/if-pre-up.d/03-bridge +++ b/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 diff --git a/package/base-files/src/init b/package/base-files/src/init index cfd264c3e..98d24c834 100755 --- a/package/base-files/src/init +++ b/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 -- cgit v1.2.3 From 00bca586c4f68b2a846b9e2a04ec7245a9f0d881 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 20 Oct 2011 10:51:30 +0200 Subject: fix cross-compiling issues --- package/zip/patches/patch-unix_Makefile | 33 ++++++++++++++++++++++++++++ package/zip/patches/patch-unix_Makefile.orig | 29 ++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 package/zip/patches/patch-unix_Makefile create mode 100644 package/zip/patches/patch-unix_Makefile.orig diff --git a/package/zip/patches/patch-unix_Makefile b/package/zip/patches/patch-unix_Makefile new file mode 100644 index 000000000..426f6869e --- /dev/null +++ b/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: diff --git a/package/zip/patches/patch-unix_Makefile.orig b/package/zip/patches/patch-unix_Makefile.orig new file mode 100644 index 000000000..ff185d2d8 --- /dev/null +++ b/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: -- cgit v1.2.3 From fd0ab933ae9f42c3d701371e234c55c963521080 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 20 Oct 2011 10:52:18 +0200 Subject: /lib/libc.so should not be a symlink! --- package/eglibc/Makefile | 2 +- package/glibc/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 494978b0c..785c03415 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -102,7 +102,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 diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 6ca0475e5..27cbe28f8 100644 --- a/package/glibc/Makefile +++ b/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 -- cgit v1.2.3 From 5a27be86c10163a49430f5efe3a56f191ad1bc67 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 20 Oct 2011 10:52:46 +0200 Subject: fine tune prepare script for *BSD --- scripts/adkprepare.sh | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/scripts/adkprepare.sh b/scripts/adkprepare.sh index 96d8f4303..ff0ecfaf7 100755 --- a/scripts/adkprepare.sh +++ b/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 -- cgit v1.2.3 From 94f1a388e180c4ec7481b81df36f349683057976 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 20 Oct 2011 10:53:16 +0200 Subject: fix typos and pkgconfig file installation --- package/libXp/Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/libXp/Makefile b/package/libXp/Makefile index d01c734a0..9682b4f5b 100644 --- a/package/libXp/Makefile +++ b/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 -- cgit v1.2.3 From dc2b0b19fce3968d62b7d146e0575827393a1369 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 20 Oct 2011 22:05:28 +0200 Subject: add getconf --- package/eglibc/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 785c03415..0378d6200 100644 --- a/package/eglibc/Makefile +++ b/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 -- cgit v1.2.3 From 4adee536cba89d43bcfd5493d7f2223b95493520 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 20 Oct 2011 22:05:46 +0200 Subject: add sha256sum --- package/coreutils/Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/package/coreutils/Makefile b/package/coreutils/Makefile index 8d35c3c8e..1e85c09d4 100644 --- a/package/coreutils/Makefile +++ b/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 -- cgit v1.2.3 From 29bf7d46e86412e415ade4b6fd493bb5b6a6cc17 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 20 Oct 2011 22:06:05 +0200 Subject: remove verbose mode flags --- package/libvirt/files/libvirt.init | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/libvirt/files/libvirt.init b/package/libvirt/files/libvirt.init index 2644e1a1b..fe83686dc 100755 --- a/package/libvirt/files/libvirt.init +++ b/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 ;; *) -- cgit v1.2.3 From 021237fba314dadb8f861a5ca5d45e327bcdd154 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 21 Oct 2011 09:28:19 +0200 Subject: wrapper for BSD --- scripts/tar | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 scripts/tar diff --git a/scripts/tar b/scripts/tar new file mode 100755 index 000000000..60c5057da --- /dev/null +++ b/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 -- cgit v1.2.3 From ded3b4fdf4b0171762288f22a532c7306ddb3cbc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 21 Oct 2011 09:29:36 +0200 Subject: always use fsf config.guess --- toolchain/gmp/Makefile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/toolchain/gmp/Makefile b/toolchain/gmp/Makefile index c96ad76b2..202709540 100644 --- a/toolchain/gmp/Makefile +++ b/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) \ -- cgit v1.2.3