diff options
Diffstat (limited to 'package')
32 files changed, 290 insertions, 50 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/banner b/package/base-files/src/etc/banner index cc967559a..1ac725fd1 100644 --- a/package/base-files/src/etc/banner +++ b/package/base-files/src/etc/banner @@ -1,2 +1,8 @@ - Linux created with OpenADK + ___ _ ____ _ __ + / _ \ _ __ ___ _ __ / \ | _ \| |/ / +| | | | '_ \ / _ \ '_ \ / _ \ | | | | ' / +| |_| | |_) | __/ | | |/ ___ \| |_| | . \ + \___/| .__/ \___|_| |_/_/ \_\____/|_|\_\ + |_| + Linux created with OpenADK 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 c57149fe3..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;} exec /sbin/init diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 6fa32318e..7dd161802 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -4,8 +4,8 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cfgfs -PKG_VERSION:= 1.0.8 -PKG_RELEASE:= 7 +PKG_VERSION:= 1.0.9 +PKG_RELEASE:= 1 PKG_DESCR:= compressed config filesystem PKG_SECTION:= base PKG_URL:= http://openadk.org/ diff --git a/package/cfgfs/src/fwcf.sh b/package/cfgfs/src/fwcf.sh index 0fac5ec1f..8fec0422d 100644 --- a/package/cfgfs/src/fwcf.sh +++ b/package/cfgfs/src/fwcf.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (c) 2006, 2007 # Thorsten Glaser <tg@mirbsd.de> -# Copyright (c) 2009, 2010 +# Copyright (c) 2009, 2010, 2011 # Waldemar Brodkorb <wbx@openadk.org> # # Provided that these terms and disclaimer and all copyright notices @@ -42,7 +42,7 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin wd=$(pwd) cd / -what='Configuration Filesystem Utility (cfgfs), Version 1.08' +what='Configuration Filesystem Utility (cfgfs), Version 1.09' who=$(id -u) if [ $who -ne 0 ]; then @@ -114,7 +114,6 @@ EOF esac mtd=0 - if [ -x /sbin/nand ];then mtdtool=/sbin/nand fi @@ -129,6 +128,9 @@ rootdisk=$(readlink /dev/root) rootdisk=${rootdisk%p*} rootdisk=${rootdisk%[1-9]} part=$(fdisk -l /dev/$rootdisk 2>/dev/null|awk '$5 == 88 { print $1 }') +if [ -f .cfgfs ];then + . /.cfgfs +fi if [ -z $part ]; then # fallback to /dev/sda in case of encrypted root part=$(fdisk -l /dev/sda 2>/dev/null|awk '$5 == 88 { print $1 }') 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 diff --git a/package/dmidecode/Makefile b/package/dmidecode/Makefile new file mode 100644 index 000000000..4c037298c --- /dev/null +++ b/package/dmidecode/Makefile @@ -0,0 +1,26 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= dmidecode +PKG_VERSION:= 2.11 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 9fddbbc3e330bee5950b8b5d424a57cb +PKG_DESCR:= reports information about your system's hardware +PKG_SECTION:= misc +PKG_URL:= http://www.nongnu.org/dmidecode/ +PKG_SITES:= http://download.savannah.gnu.org/releases/dmidecode/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,DMIDECODE,dmidecode,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE:= manual + +dmidecode-install: + $(INSTALL_DIR) $(IDIR_DMIDECODE)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/usr/sbin/dmidecode \ + $(IDIR_DMIDECODE)/usr/sbin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/dmidecode/patches/patch-Makefile b/package/dmidecode/patches/patch-Makefile new file mode 100644 index 000000000..cf37262cb --- /dev/null +++ b/package/dmidecode/patches/patch-Makefile @@ -0,0 +1,22 @@ +--- dmidecode-2.11.orig/Makefile 2010-10-11 16:08:16.000000000 +0200 ++++ dmidecode-2.11/Makefile 2011-10-17 19:22:27.000000000 +0200 +@@ -12,8 +12,8 @@ + # (at your option) any later version. + # + +-CC = gcc +-CFLAGS = -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \ ++CC ?= gcc ++CFLAGS ?= -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \ + -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef + #CFLAGS += -DBIGENDIAN + #CFLAGS += -DALIGNMENT_WORKAROUND +@@ -26,7 +26,7 @@ CFLAGS += -O2 + LDFLAGS = + + DESTDIR = +-prefix = /usr/local ++prefix = /usr + sbindir = $(prefix)/sbin + mandir = $(prefix)/share/man + man8dir = $(mandir)/man8 diff --git a/package/dmidecode/patches/patch-Makefile.orig b/package/dmidecode/patches/patch-Makefile.orig new file mode 100644 index 000000000..fcd3c6dd7 --- /dev/null +++ b/package/dmidecode/patches/patch-Makefile.orig @@ -0,0 +1,20 @@ +--- dmidecode-2.11.orig/Makefile 2010-10-11 16:08:16.000000000 +0200 ++++ dmidecode-2.11/Makefile 2011-10-17 19:21:58.000000000 +0200 +@@ -12,7 +12,7 @@ + # (at your option) any later version. + # + +-CC = gcc ++CC ?= gcc + CFLAGS = -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \ + -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef + #CFLAGS += -DBIGENDIAN +@@ -26,7 +26,7 @@ CFLAGS += -O2 + LDFLAGS = + + DESTDIR = +-prefix = /usr/local ++prefix = /usr + sbindir = $(prefix)/sbin + mandir = $(prefix)/share/man + man8dir = $(mandir)/man8 diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 494978b0c..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 @@ -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 diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 8a6e267c8..125b9ad5e 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -20,9 +20,6 @@ TARGET_CPPFLAGS:= '' TARGET_CFLAGS:= '' TARGET_CXXFLAGS:= $(filter-out -fstack-protector,$(TARGET_CXXFLAGS)) -#ifeq ($(ADK_LINUX_64),y) -#CONFIGURE_ARGS+= --with-abi=64 -#endif ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) CONFIGURE_ARGS+= --with-abi=$(ADK_TARGET_ABI) endif 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 diff --git a/package/gperf/Makefile b/package/gperf/Makefile index be2b4b4ce..1a8608e63 100644 --- a/package/gperf/Makefile +++ b/package/gperf/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= c1f1db32fb6598d6a93e6e88796a8632 PKG_DESCR:= perfect hash function generator PKG_SECTION:= lang +PKG_DEPENDS:= libstdc++ PKG_URL:= http://www.gnu.org/software/gperf/ PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/} diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 040fbcb96..b03957080 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -14,12 +14,12 @@ PKG_DEPENDS+= kmod-nf-conntrack-ipv4 kmod-nf-nat PKG_DEPENDS+= kmod-ip-nf-target-masquerade kmod-ip-nf-target-reject PKG_DEPENDS+= kmod-ip-nf-filter kmod-ip-nf-match-state PKG_DEPENDS+= kmod-netfilter-xt-target-tcpmss -PKG_DEPENDS6:= kmod-ip6-nf-iptables kmod-nf-conntrack-ipv6 -PKG_DEPENDS6+= kmod-ip6-nf-filter kmod-ip6-nf-target-reject +PKG_DEPENDS+= kmod-ip6-nf-iptables kmod-nf-conntrack-ipv6 +PKG_DEPENDS+= kmod-ip6-nf-filter kmod-ip6-nf-target-reject PKG_URL:= http://www.netfilter.org/ PKG_SITES:= http://www.netfilter.org/projects/iptables/files/ -PKG_SUBPKGS:= IPTABLES IP6TABLES IPTABLES_DEV +PKG_SUBPKGS:= IPTABLES IPTABLES_DEV PKGSC_IPTABLES_DEV:= devel DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 @@ -32,7 +32,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,IPTABLES_DEV,iptables-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKGSC_IPTABLES_DEV})) -$(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS6},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS+= --enable-devel @@ -40,18 +39,17 @@ iptables-install: ${INSTALL_DIR} ${IDIR_IPTABLES}/{usr/lib,etc,usr/sbin} ${INSTALL_DATA} ./files/firewall.conf ${IDIR_IPTABLES}/etc ${CP} ${WRKINST}/usr/sbin/iptables* ${IDIR_IPTABLES}/usr/sbin + ${CP} ${WRKINST}/usr/sbin/xtables* ${IDIR_IPTABLES}/usr/sbin ${CP} ${WRKINST}/usr/lib/libiptc.so* ${IDIR_IPTABLES}/usr/lib ${CP} ${WRKINST}/usr/lib/libip4tc.so* ${IDIR_IPTABLES}/usr/lib ${CP} ${WRKINST}/usr/lib/libxtables.so* ${IDIR_IPTABLES}/usr/lib + ${INSTALL_DIR} ${IDIR_IPTABLES}/{usr/lib,etc,usr/sbin} + ${INSTALL_DATA} ./files/firewall6.conf ${IDIR_IPTABLES}/etc + ${INSTALL_BIN} ${WRKINST}/usr/sbin/ip6tables ${IDIR_IPTABLES}/usr/sbin + ${CP} ${WRKINST}/usr/lib/libip6tc.so* ${IDIR_IPTABLES}/usr/lib iptables-dev-install: ${INSTALL_DIR} ${IDIR_IPTABLES_DEV}/usr/include ${CP} ${WRKINST}/usr/include/* ${IDIR_IPTABLES_DEV}/usr/include -ip6tables-install: - ${INSTALL_DIR} ${IDIR_IP6TABLES}/{usr/lib,etc,usr/sbin} - ${INSTALL_DATA} ./files/firewall6.conf ${IDIR_IP6TABLES}/etc - ${INSTALL_BIN} ${WRKINST}/usr/sbin/ip6tables ${IDIR_IP6TABLES}/usr/sbin - ${CP} ${WRKINST}/usr/lib/libip6tc.so* ${IDIR_IP6TABLES}/usr/lib - include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libX11/patches/patch-src_util_Makefile_in b/package/libX11/patches/patch-src_util_Makefile_in index 2c1689069..6af15c2b5 100644 --- a/package/libX11/patches/patch-src_util_Makefile_in +++ b/package/libX11/patches/patch-src_util_Makefile_in @@ -1,13 +1,24 @@ --- libX11-1.4.0.orig/src/util/Makefile.in 2010-11-21 23:15:55.000000000 +0100 -+++ libX11-1.4.0/src/util/Makefile.in 2011-04-28 22:56:41.000000000 +0200 -@@ -262,7 +262,6 @@ top_build_prefix = @top_build_prefix@ ++++ libX11-1.4.0/src/util/Makefile.in 2011-10-21 09:41:05.000000000 +0200 +@@ -143,7 +143,7 @@ LD = @LD@ + LDFLAGS = @LDFLAGS_FOR_BUILD@ + LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ + LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ ++LIBS = + LIBTOOL = @LIBTOOL@ + LIB_MAN_DIR = @LIB_MAN_DIR@ + LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ +@@ -262,8 +262,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ makekeys_CFLAGS = \ - $(X11_CFLAGS) \ - $(CWARNFLAGS) +- $(CWARNFLAGS) ++ $(CWARNFLAGS) -I/usr/local/include EXTRA_DIST = mkks.sh + @@ -351,12 +350,12 @@ distclean-compile: @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< diff --git a/package/libXext/Makefile b/package/libXext/Makefile index d99bb7247..f0d716bc3 100644 --- a/package/libXext/Makefile +++ b/package/libXext/Makefile @@ -15,6 +15,7 @@ PKG_SITES:= ${MASTER_SITE_XORG} PKG_SUBPKGS:= LIBXEXT LIBXEXT_DEV PKGSD_LIBXEXT_DEV:= X11 extension headers PKGSC_LIBXEXT_DEV:= x11/devel +PKGSS_LIBXEXT_DEV:= xextproto ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly @@ -23,7 +24,7 @@ endif include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -$(eval $(call PKG_template,LIBXEXT_DEV,libxext-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXEXT_DEV},${PKGSC_LIBXEXT_DEV},${PKG_OPTS})) +$(eval $(call PKG_template,LIBXEXT_DEV,libxext-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_LIBXEXT_DEV},${PKGSD_LIBXEXT_DEV},${PKGSC_LIBXEXT_DEV},${PKG_OPTS})) CONFIGURE_ARGS+= --disable-malloc0returnsnull diff --git a/package/libXi/Makefile b/package/libXi/Makefile index bdf1c54c8..990edce4c 100644 --- a/package/libXi/Makefile +++ b/package/libXi/Makefile @@ -13,6 +13,10 @@ PKG_BUILDDEP:= xproto xextproto libXext PKG_URL:= http://xorg.freedesktop.org/ PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= LIBXI LIBXI_DEV +PKGSS_LIBXI_DEV:= inputproto +PKGSC_LIBXI_DEV:= x11/devel + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif @@ -20,6 +24,7 @@ endif include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXI,libxi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS))) +$(eval $(call PKG_template,LIBXI_DEV,libxi-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_LIBXI_DEV},${PKG_DESCR},${PKGSC_LIBXI_DEV},$(PKG_OPTS))) CONFIGURE_ARGS+= --disable-malloc0returnsnull @@ -28,4 +33,9 @@ post-install: $(CP) $(WRKINST)/usr/lib/libXi*.so* \ $(IDIR_LIBXI)/usr/lib +libxi-dev-install: + $(INSTALL_DIR) $(IDIR_LIBXI_DEV)/usr/include + $(CP) $(WRKINST)/usr/include/* \ + $(IDIR_LIBXI_DEV)/usr/include + include ${TOPDIR}/mk/pkg-bottom.mk 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 diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile index 6d3b65d19..1e09ad648 100644 --- a/package/libvirt/Makefile +++ b/package/libvirt/Makefile @@ -11,7 +11,8 @@ PKG_DESCR:= virtualization API PKG_SECTION:= libs PKG_BUILDDEP:= libxml2 gnutls python2 libpcap parted udev PKG_DEPENDS:= libxml2 libgnutls python2 libpcap libreadline -PKG_DEPENDS+= libintl +PKG_DEPENDS+= libintl dmidecode kmod-netfilter-xt-target-checksum +PKG_DEPENDS+= dnsmasq qemu PKG_URL:= http://www.libvirt.org/ PKG_SITES:= ftp://libvirt.org/libvirt/ @@ -24,7 +25,10 @@ $(eval $(call PKG_template,LIBVIRT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${P include ${TOPDIR}/mk/python.mk -CONFIGURE_ENV+= gl_cv_warn__fstack_protector_all=no +CONFIGURE_ENV+= gl_cv_warn__fstack_protector_all=no \ + ac_cv_path_IPTABLES_PATH=/usr/sbin/iptables \ + ac_cv_path_IP6TABLES_PATH=/usr/sbin/ip6tables \ + ac_cv_path_IP_PATH=/bin/ip CONFIGURE_ARGS+= --without-xen \ --without-uml \ --without-esx \ @@ -38,6 +42,9 @@ CONFIGURE_ARGS+= --without-xen \ post-install: ${INSTALL_DIR} ${IDIR_LIBVIRT}/usr/lib ${IDIR_LIBVIRT}/usr/bin ${INSTALL_DIR} ${IDIR_LIBVIRT}/etc/libvirt ${IDIR_LIBVIRT}/usr/sbin + ${INSTALL_DIR} ${IDIR_LIBVIRT}/usr/share/libvirt + $(CP) $(WRKINST)/usr/share/libvirt/* \ + ${IDIR_LIBVIRT}/usr/share/libvirt ${INSTALL_BIN} ${WRKINST}/usr/bin/virsh ${IDIR_LIBVIRT}/usr/bin ${CP} ${WRKINST}/usr/lib/libvirt*.so* ${IDIR_LIBVIRT}/usr/lib ${CP} ${WRKINST}/etc/libvirt/* ${IDIR_LIBVIRT}/etc/libvirt diff --git a/package/libvirt/files/libvirt.init b/package/libvirt/files/libvirt.init new file mode 100755 index 000000000..fe83686dc --- /dev/null +++ b/package/libvirt/files/libvirt.init @@ -0,0 +1,27 @@ +#!/bin/sh +#PKG libvirt +#INIT 80 +. /etc/rc.conf + +case $1 in +autostop) ;; +autostart) + test x"$libvirtd" = x"NO" && exit 0 + exec sh $0 start + ;; +start) + /usr/sbin/libvirtd -d + ;; +stop) + kill $(pgrep -f /usr/sbin/libvirtd) + ;; +restart) + sh $0 stop + sleep 2 + sh $0 start + ;; +*) + echo "usage: $0 {start | stop | restart}" + exit 1 +esac +exit $? diff --git a/package/libvirt/files/libvirt.postinst b/package/libvirt/files/libvirt.postinst new file mode 100644 index 000000000..4c39b14f0 --- /dev/null +++ b/package/libvirt/files/libvirt.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf libvirtd libvirtd NO diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index e9115efbb..d6cbb4ffb 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -30,7 +30,7 @@ $(eval $(call PKG_template,LIBXML2_PYTHON,libxml2-python,${PKG_VERSION}-${PKG_RE include $(TOPDIR)/mk/python.mk TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) -ifeq ($(ADK_PACKAGE_LIBXML2_PYTHON),y) +ifneq ($(ADK_PACKAGE_LIBXML2_PYTHON),) CONFIGURE_ARGS+= --with-python=${STAGING_DIR}/usr else CONFIGURE_ARGS+= --without-python diff --git a/package/python2/Makefile b/package/python2/Makefile index b28b5d49e..5464d3d7a 100644 --- a/package/python2/Makefile +++ b/package/python2/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= python2 PKG_VERSION:= 2.7.1 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 15ed56733655e3fab785e49a7278d2fb PKG_DESCR:= Python scripting language (Version 2) PKG_SECTION:= lang @@ -31,6 +31,7 @@ $(eval $(call PKG_template,PYTHON2_BZIP2,${PKG_NAME}-bzip2,${PKG_VERSION}-${PKG_ $(eval $(call PKG_template,PYTHON2_READLINE,${PKG_NAME}-readline,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_PYTHON2_READLINE},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TARGET_CFLAGS+= -fPIC +TARGET_LDFLAGS+= -L. MAKE_ENV+= OPT="$(TARGET_CFLAGS)" \ RANLIB="${TARGET_CROSS}ranlib" \ HOSTPYTHON=./hostpython \ diff --git a/package/qemu/Makefile b/package/qemu/Makefile index 7074bf80c..63f4040d0 100644 --- a/package/qemu/Makefile +++ b/package/qemu/Makefile @@ -4,18 +4,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:= qemu -PKG_VERSION:= 0.14.1 +PKG_VERSION:= 0.15.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= b6c713a8db638e173af53a62d5178640 +PKG_MD5SUM:= 34f17737baaf1b3495c89cd6d4a607ed PKG_DESCR:= cpu and system emulator PKG_SECTION:= misc -PKG_DEPENDS:= zlib libsdl -PKG_BUILDDEP:= zlib sdl +PKG_DEPENDS:= zlib libsdl libpng +PKG_BUILDDEP:= zlib sdl libpng PKG_URL:= http://wwww.qemu.org/ -PKG_SITES:= http://download.savannah.gnu.org/releases/qemu/ +PKG_SITES:= http://wiki.qemu.org/download/ PKG_ARCH_DEPENDS:= native x86 x86_64 -PKG_SYSTEM_DEPENDS:= ibm-x40 +PKG_SYSTEM_DEPENDS:= ibm-x40 shuttle-sa76 include $(TOPDIR)/mk/package.mk @@ -26,6 +26,7 @@ CONFIG_STYLE:= minimal CONFIGURE_ARGS+= --host-cc=$(CC_FOR_BUILD) \ --prefix=/usr \ --sysconfdir=/etc \ + --enable-kvm \ --bindir=/usr/bin TARGET_LDFLAGS+= -pthread -lm -lrt diff --git a/package/samba/Makefile b/package/samba/Makefile index 0485febc2..b3658cdbc 100644 --- a/package/samba/Makefile +++ b/package/samba/Makefile @@ -29,7 +29,9 @@ CONFIGURE_ENV+= samba_cv_CC_NEGATIVE_ENUM_VALUES=no \ samba_cv_USE_SETRESUID=no \ ac_cv_lib_ext_nsl_connect=no \ ac_cv_search_yp_get_default_domain=no \ - ac_cv_lib_ext_nsl_gethostbyname=no + ac_cv_lib_ext_nsl_gethostbyname=no \ + ac_cv_file__proc_sys_kernel_core_pattern=yes \ + libreplace_cv_HAVE_GETADDRINFO=no CONFIGURE_ARGS+= --libdir=/usr/lib/samba \ --localstatedir=/var/log/samba \ --with-configdir=/etc/samba \ diff --git a/package/tar/Makefile b/package/tar/Makefile index ea82632dd..8c16627d1 100644 --- a/package/tar/Makefile +++ b/package/tar/Makefile @@ -20,7 +20,7 @@ CONFIGURE_ENV+= gl_cv_func_mbrtowc_incomplete_state=no \ gl_cv_func_wcrtomb_retval=no post-install: - ${INSTALL_DIR} ${IDIR_TAR}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/tar ${IDIR_TAR}/usr/bin + ${INSTALL_DIR} ${IDIR_TAR}/bin + ${INSTALL_BIN} ${WRKINST}/usr/bin/tar ${IDIR_TAR}/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/virtinst/Makefile b/package/virtinst/Makefile index 4c2414920..8c3aba0d5 100644 --- a/package/virtinst/Makefile +++ b/package/virtinst/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= d8f6a61d7edbc78129a8b5df2807ad46 PKG_DESCR:= virtual machine installer PKG_SECTION:= misc PKG_BUILDDEP:= python2 urlgrabber libxml2 libxslt -PKG_DEPENDS:= python2 urlgrabber libxml2-python libxslt +PKG_DEPENDS:= python2 urlgrabber libxml2-python libxslt libvirt PKG_URL:= http://virt-manager.org/ PKG_SITES:= http://virt-manager.org/download/sources/virtinst/ diff --git a/package/xf86-video-ati/Makefile b/package/xf86-video-ati/Makefile new file mode 100644 index 000000000..f89f63af5 --- /dev/null +++ b/package/xf86-video-ati/Makefile @@ -0,0 +1,30 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= xf86-video-ati +PKG_VERSION:= 6.13.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 6bb71cff9ad9c5c7b258b2b6c56fdc95 +PKG_DESCR:= X11 driver for ATI VGA chip +PKG_SECTION:= x11/drivers +PKG_BUILDDEP:= xorg-server libdrm xf86driproto MesaLib udev +PKG_DEPENDS:= xorg-server libdrm mesalib udev +PKG_SITES:= ${MASTER_SITE_XORG} +PKG_NEED_CXX:= 1 + +PKG_CFLINE_XF86_VIDEO_ATI:=depends on ADK_TARGET_WITH_VGA + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,XF86_VIDEO_ATI,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ARGS+= --enable-dri + +post-install: + ${INSTALL_DIR} ${IDIR_XF86_VIDEO_ATI}/usr/lib/xorg/modules/drivers + ${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/*.so \ + ${IDIR_XF86_VIDEO_ATI}/usr/lib/xorg/modules/drivers/ + +include ${TOPDIR}/mk/pkg-bottom.mk 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: |