diff options
61 files changed, 333 insertions, 56549 deletions
@@ -110,8 +110,8 @@ config ADK_KERNEL_VERSION_3_9_9 prompt "3.9.9" boolean -config ADK_KERNEL_VERSION_3_4_51 - prompt "3.4.51" +config ADK_KERNEL_VERSION_3_4_52 + prompt "3.4.52" boolean endchoice @@ -119,7 +119,7 @@ endchoice config ADK_KERNEL_VERSION string default "3.9.9" if ADK_KERNEL_VERSION_3_9_9 - default "3.4.51" if ADK_KERNEL_VERSION_3_4_51 + default "3.4.52" if ADK_KERNEL_VERSION_3_4_52 help config ADK_KERNEL_COMP_GZIP_RASPBERRY_PI diff --git a/mk/build.mk b/mk/build.mk index 5dcfa0818..5f9a3684c 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -84,6 +84,8 @@ DEFCONFIG= ADK_DEBUG=n \ BUSYBOX_FEATURE_SUN_LABEL=n \ BUSYBOX_FEATURE_OSF_LABEL=n \ BUSYBOX_FEATURE_SGI_LABEL=n \ + BUSYBOX_FEATURE_INETD_RPC=n \ + BUSYBOX_FEATURE_MOUNT_NFS=n \ ADK_KERNEL_RT2X00_DEBUG=n \ ADK_KERNEL_ATH5K_DEBUG=n \ ADK_KERNEL_DEBUG_WITH_KGDB=n diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index e80460f9c..157dcd059 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -10,9 +10,9 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= 70504d1685140e3ee355b9f860284d85 endif -ifeq ($(ADK_KERNEL_VERSION_3_4_51),y) -KERNEL_VERSION:= 3.4.51 +ifeq ($(ADK_KERNEL_VERSION_3_4_52),y) +KERNEL_VERSION:= 3.4.52 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= f028dc67e2e8a782debc3207d47b33a0 +KERNEL_MD5SUM:= 97411d754781f6bae5c0a6e48849b3c9 endif diff --git a/mk/modules.mk b/mk/modules.mk index 4e247d98d..4085a4c7d 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -441,13 +441,22 @@ $(eval $(call KMOD_template,NF_CONNTRACK,nf-conntrack,\ $(eval $(call KMOD_template,NF_CONNTRACK_IPV4,nf-conntrack-ipv4,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_defrag_ipv4 \ $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_conntrack_ipv4 \ -,50)) +,46)) -$(eval $(call KMOD_template,NF_NAT_IPV4,nf-nat-ipv4,\ +ifeq ($(KERNEL_BASE),3) +ifeq ($(KERNEL_MAJ),4) +$(eval $(call KMOD_template,FULL_NAT,full-nat,\ + $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat \ + $(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_nat \ +,50)) +else +$(eval $(call KMOD_template,FULL_NAT,full-nat,\ $(MODULES_DIR)/kernel/net/netfilter/nf_nat \ $(MODULES_DIR)/kernel/net/ipv4/netfilter/nf_nat_ipv4 \ $(MODULES_DIR)/kernel/net/ipv4/netfilter/iptable_nat \ ,50)) +endif +endif $(eval $(call KMOD_template,NF_CONNTRACK_FTP,nf-conntrack-ftp,\ $(MODULES_DIR)/kernel/net/netfilter/nf_conntrack_ftp \ @@ -499,7 +508,7 @@ $(eval $(call KMOD_template,NF_CONNTRACK_SIP,nf-conntrack-sip,\ $(eval $(call KMOD_template,IP_NF_IPTABLES,ip-nf-iptables,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ip_tables \ -,50)) +,49)) $(eval $(call KMOD_template,IP_NF_MATCH_IPRANGE,ip-nf-match-iprange,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/ipt_iprange \ @@ -1181,6 +1190,10 @@ $(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\ $(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-spitz \ ,55)) +$(eval $(call KMOD_template,SND_BCM2835,snd-bcm2835,\ + $(MODULES_DIR)/kernel/sound/arm/snd-bcm2835 \ +,55)) + #ifeq ($(ADK_LINUX_64),y) #V4L_COMPAT:=drivers/media/video/v4l2-compat-ioctl32 #endif @@ -1195,23 +1208,23 @@ $(eval $(call KMOD_template,USB_VIDEO_CLASS,usb-video-class,\ ,70)) $(eval $(call KMOD_template,USB_GSPCA,usb-gspca,\ - $(MODULES_DIR)/kernel/drivers/media/video/gspca/gspca_main \ + $(MODULES_DIR)/kernel/drivers/media/usb/gspca/gspca_main \ ,75)) $(eval $(call KMOD_template,USB_GSPCA_PAC207,usb-gspca-pac207,\ - $(MODULES_DIR)/kernel/drivers/media/video/gspca/gspca_pac207 \ + $(MODULES_DIR)/kernel/drivers/media/usb/gspca/gspca_pac207 \ ,80)) $(eval $(call KMOD_template,USB_GSPCA_PAC7311,usb-gspca-pac7311,\ - $(MODULES_DIR)/kernel/drivers/media/video/gspca/gspca_pac7311 \ + $(MODULES_DIR)/kernel/drivers/media/usb/gspca/gspca_pac7311 \ ,80)) $(eval $(call KMOD_template,USB_GSPCA_SPCA561,usb-gspca-spca561,\ - $(MODULES_DIR)/kernel/drivers/media/video/gspca/gspca_spca561 \ + $(MODULES_DIR)/kernel/drivers/media/usb/gspca/gspca_spca561 \ ,80)) $(eval $(call KMOD_template,USB_PWC,usb-pwc,\ - $(MODULES_DIR)/kernel/drivers/media/video/pwc/pwc \ + $(MODULES_DIR)/kernel/drivers/media/usb/pwc/pwc \ ,80)) # diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 2f89753c5..41ead5331 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:= 54 +PKG_RELEASE:= 55 PKG_SECTION:= base PKG_DESCR:= basic files and scripts @@ -83,8 +83,9 @@ ifneq (${ADK_PACKAGE_CONFIG_IN_ETC},) gzip -9c ${TOPDIR}/.config >$(IDIR_BASE_FILES)/etc/adkconfig.gz chmod 600 $(IDIR_BASE_FILES)/etc/adkconfig.gz endif - - +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) + echo 'export LD_LIBRARY_PATH=/opt/vc/lib' >> $(IDIR_BASE_FILES)/etc/profile +endif # simple network configuration ifneq (${ADK_SIMPLE_NETWORK_CONFIG},) diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot index e30360142..ed55ccc88 100644 --- a/package/base-files/src/etc/init.d/boot +++ b/package/base-files/src/etc/init.d/boot @@ -26,8 +26,4 @@ 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/init.d/mount b/package/base-files/src/etc/init.d/mount new file mode 100644 index 000000000..f0df597e5 --- /dev/null +++ b/package/base-files/src/etc/init.d/mount @@ -0,0 +1,10 @@ +#!/bin/sh +#INIT 99 +[[ $1 = autostart ]] || exit 0 + +# 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/bcm2835-vc/Makefile b/package/bcm2835-vc/Makefile new file mode 100644 index 000000000..29a8f3c0f --- /dev/null +++ b/package/bcm2835-vc/Makefile @@ -0,0 +1,25 @@ +# 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:= bcm2835-vc +PKG_VERSION:= 0.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 1ec77ba4e75807f505604c42738a2bee +PKG_DESCR:= vc tools for raspberry pi (bcm2835) +PKG_SECTION:= base +PKG_SITES:= http://openadk.org/distfiles/ + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,BCM2835_VC,bcm2835-vc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +do-install: + ${CP} ${WRKBUILD}/* ${IDIR_BCM2835_VC} + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/conntrack-tools/Makefile b/package/conntrack-tools/Makefile index 940e1772d..aeac0f2d2 100644 --- a/package/conntrack-tools/Makefile +++ b/package/conntrack-tools/Makefile @@ -4,13 +4,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:= conntrack-tools -PKG_VERSION:= 1.2.1 +PKG_VERSION:= 1.4.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 48d414cb7a354001babf184ae6c16db9 +PKG_MD5SUM:= 3cc4703d883c6f07085e29bdc993222b PKG_DESCR:= Connection tracking userspace tools PKG_SECTION:= firewall -PKG_DEPENDS:= libnetfilter-conntrack libnetfilter-cttimeout libmnl -PKG_BUILDDEP:= libnetfilter_conntrack libnetfilter_cttimeout libmnl +PKG_DEPENDS:= libtirpc libnetfilter_queue libnetfilter-conntrack libnetfilter-cttimeout libnetfilter-cthelper libmnl +PKG_BUILDDEP:= libtirpc libnetfilter_queue libnetfilter_conntrack libnetfilter_cttimeout libnetfilter_cthelper libmnl PKG_URL:= http://conntrack-tools.netfilter.org/ PKG_SITES:= http://www.netfilter.org/projects/conntrack-tools/files/ @@ -20,6 +20,8 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk +TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/tirpc + $(eval $(call PKG_template,CONNTRACK_TOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) post-install: diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index d9acdb8fd..4fcc6bf4b 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -38,6 +38,9 @@ else ${INSTALL_DIR} $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH) \ $(IDIR_EGLIBC)/usr/lib $(IDIR_EGLIBC)/usr/bin $(CP) $(STAGING_TARGET_DIR)/lib/ld* $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH) +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) + (cd $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH); ln -sf ld-linux.so.3 ld-linux-armhf.so.3) +endif -for file in libc libcrypt libdl libm libresolv libutil libnsl libnss_dns libnss_files; do \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH); \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH); \ diff --git a/package/glibc/Makefile b/package/glibc/Makefile index c6e57b460..2e50073f8 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -14,6 +14,7 @@ PKG_VER:= 2.16 PKG_SECTION:= base PKG_OPTS:= noremove PKG_SUBPKGS:= GLIBC GLIBC_DEV GLIBC_STATIC +PKG_DEPENDS:= tzdata NO_DISTFILES:= 1 diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 82a17f36b..105a5d801 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 6dd40c12fb8f4c4312a0f8434369fbcd PKG_DESCR:= The netfilter firewalling software PKG_SECTION:= firewall PKG_DEPENDS:= kmod-ip-nf-iptables kmod-nf-conntrack -PKG_DEPENDS+= kmod-nf-conntrack-ipv4 kmod-nf-nat-ipv4 +PKG_DEPENDS+= kmod-nf-conntrack-ipv4 kmod-full-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 diff --git a/package/libXScrnSaver/Makefile b/package/libXScrnSaver/Makefile index e92675cde..675a67f88 100644 --- a/package/libXScrnSaver/Makefile +++ b/package/libXScrnSaver/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 8e459e544298caa27fc7c7e5a56e2a6d PKG_DESCR:= X.Org XScrnSaver library PKG_SECTION:= x11/libs -PKG_BUILDDEP:= scrnsaverproto +PKG_BUILDDEP:= scrnsaverproto libXext PKG_URL:= http://xorg.freedesktop.org/ PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/libnetfilter_conntrack/Makefile b/package/libnetfilter_conntrack/Makefile index 3bc39808b..8f15fe50e 100644 --- a/package/libnetfilter_conntrack/Makefile +++ b/package/libnetfilter_conntrack/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libnetfilter_conntrack -PKG_VERSION:= 1.0.1 +PKG_VERSION:= 1.0.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= 2d17d9da1404728d61a29b4a8338ad0c +PKG_MD5SUM:= 73394a3d8d0cfecc6abb6027b4792d52 PKG_DESCR:= API to connection tracking state table PKG_SECTION:= libs PKG_DEPENDS:= libnfnetlink diff --git a/package/libnetfilter_cthelper/Makefile b/package/libnetfilter_cthelper/Makefile new file mode 100644 index 000000000..d086fc7dd --- /dev/null +++ b/package/libnetfilter_cthelper/Makefile @@ -0,0 +1,28 @@ +# 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:= libnetfilter_cthelper +PKG_VERSION:= 1.0.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= b2efab1a3a198a5add448960ba011acd +PKG_DESCR:= userspace library that provides the API to the user-space helper infrastructure +PKG_SECTION:= libs +PKG_DEPENDS:= libnfnetlink libmnl +PKG_BUILDDEP:= libnfnetlink libmnl +PKG_URL:= http://www.netfilter.org/projects/libnetfilter_cthelper/ +PKG_SITES:= http://www.netfilter.org/projects/libnetfilter_cthelper/files/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBNETFILTER_CTHELPER,libnetfilter-cthelper,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +post-install: + $(INSTALL_DIR) $(IDIR_LIBNETFILTER_CTHELPER)/usr/lib + $(CP) $(WRKINST)/usr/lib/libnetfilter_cthelper*so* \ + $(IDIR_LIBNETFILTER_CTHELPER)/usr/lib/ + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libnetfilter_queue/Makefile b/package/libnetfilter_queue/Makefile index 0391a856a..4cf6df2f8 100644 --- a/package/libnetfilter_queue/Makefile +++ b/package/libnetfilter_queue/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libnetfilter_queue -PKG_VERSION:= 1.0.1 +PKG_VERSION:= 1.0.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 08b968cb2d36c24deb7f26a69f5d8602 +PKG_MD5SUM:= df09befac35cb215865b39a36c96a3fa PKG_DESCR:= API to packets that have been queued by the kernel packet filter PKG_SECTION:= libs PKG_DEPENDS:= libnfnetlink diff --git a/package/libnfnetlink/Makefile b/package/libnfnetlink/Makefile index 33f382192..aeae9319e 100644 --- a/package/libnfnetlink/Makefile +++ b/package/libnfnetlink/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libnfnetlink -PKG_VERSION:= 1.0.0 +PKG_VERSION:= 1.0.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 016fdec8389242615024c529acc1adb8 +PKG_MD5SUM:= 98927583d2016a9fb1936fed992e2c5e PKG_DESCR:= low-level library for netfilter related kernel/userspace communication PKG_SECTION:= libs PKG_URL:= http://www.netfilter.org/projects/libnfnetlink/ diff --git a/package/libnfnetlink/patches/autotool.patch b/package/libnfnetlink/patches/autotool.patch deleted file mode 100644 index ad762d420..000000000 --- a/package/libnfnetlink/patches/autotool.patch +++ /dev/null @@ -1,56424 +0,0 @@ -older libtool is unecessary checking for c++ - - * regen autotool infrastruture via - "libtoolize; autoregen -vif; rm -rf automa4te" - * add fstack-protector patch manually - -diff -Nur libnfnetlink-1.0.0.orig/aclocal.m4 libnfnetlink-1.0.0/aclocal.m4 ---- libnfnetlink-1.0.0.orig/aclocal.m4 2009-06-22 19:48:34.000000000 +0200 -+++ libnfnetlink-1.0.0/aclocal.m4 2011-02-21 18:03:03.753553604 +0100 -@@ -1,7 +1,7 @@ --# generated automatically by aclocal 1.10.1 -*- Autoconf -*- -+# generated automatically by aclocal 1.11.1 -*- Autoconf -*- - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -13,108 +13,194 @@ - - m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl --m4_if(AC_AUTOCONF_VERSION, [2.61],, --[m4_warning([this file was generated for autoconf 2.61. -+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -+[m4_warning([this file was generated for autoconf 2.65. - You have another version of autoconf. It may work, but is not guaranteed to. - If you have problems, you may need to regenerate the build system entirely. - To do so, use the procedure documented by the package, typically `autoreconf'.])]) - - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -+# -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -+# 2006, 2007, 2008 Free Software Foundation, Inc. -+# Written by Gordon Matzigkeit, 1996 -+# -+# This file is free software; the Free Software Foundation gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. -+ -+m4_define([_LT_COPYING], [dnl -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -+# 2006, 2007, 2008 Free Software Foundation, Inc. -+# Written by Gordon Matzigkeit, 1996 -+# -+# This file is part of GNU Libtool. -+# -+# GNU Libtool is free software; you can redistribute it and/or -+# modify it under the terms of the GNU General Public License as -+# published by the Free Software Foundation; either version 2 of -+# the License, or (at your option) any later version. -+# -+# As a special exception to the GNU General Public License, -+# if you distribute this file as part of a program or library that -+# is built using GNU Libtool, you may include this file under the -+# same distribution terms that you use for the rest of that program. -+# -+# GNU Libtool is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ |