diff options
111 files changed, 8141 insertions, 5255 deletions
@@ -1,8 +1,3 @@ - openssh on amd64 does not work, ssh-keygen endless loop - uclibc on lemote mips64 target does not work (only uclibc-trunk with patches) -<<<<<<< HEAD - qemu-mips64* targets does not boot, kernel problem? -- (cross-)compile from debian amd64 to f.e. qemu-x86_64 or shuttle with - either glibc or eglibc is broken, have sth. todo with target == host -======= ->>>>>>> 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a @@ -208,6 +208,8 @@ NO_ERROR=0 )" >>prereq.mk @echo 'HOSTCC:=${CC}' >>prereq.mk @echo 'HOSTCFLAGS:=-O2' >>prereq.mk + @echo 'HOSTCXX:=${CXX}' >>prereq.mk + @echo 'HOSTCXXFLAGS:=-O2' >>prereq.mk @echo 'LANGUAGE:=C' >>prereq.mk @echo 'LC_ALL:=C' >>prereq.mk @echo 'MAKE:=$${GMAKE}' >>prereq.mk @@ -1,3 +1,5 @@ +- php update +- openssh update - macos x build - test on OpenSuSE - test on Fedora Core diff --git a/mk/build.mk b/mk/build.mk index 53f0ff5bf..5cd9a1458 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -236,7 +236,7 @@ ifeq ($(filter-out distclean,${MAKECMDGOALS}),) include ${TOPDIR}/mk/vars.mk else include $(TOPDIR)/prereq.mk -export BASH HOSTCC HOSTCFLAGS MAKE LANGUAGE LC_ALL OStype PATH +export BASH HOSTCC HOSTCFLAGS HOSTCXX HOSTCXXFLAGS MAKE LANGUAGE LC_ALL OStype PATH endif all: menuconfig diff --git a/mk/modules.mk b/mk/modules.mk index ab33f6863..90c26affc 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -510,6 +510,67 @@ $(eval $(call KMOD_template,IP_NF_TARGET_TTL,ip-nf-target-ttl,\ ,65)) # +# IPv6: Netfilter +# +$(eval $(call KMOD_template,NF_CONNTRACK_IPV6,nf-conntrack-ipv6,\ + $(MODULES_DIR)/kernel/net/ipv6/netfilter/nf_conntrack_ipv6 \ +,50)) + +$(eval $(call KMOD_template,IP6_NF_IPTABLES,ip6-nf-iptables,\ + $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6_tables \ +,50)) + +$(eval $(call KMOD_template,IP6_NF_MATCH_AH,ip6-nf-match-AH,\ + $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_ah \ +,55)) + +$(eval $(call KMOD_template,IP6_NF_MATCH_EUI64,ip6-nf-match-eui64,\ + $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_eui64 \ +,55)) + +$(eval $(call KMOD_template,IP6_NF_MATCH_FRAG,ip6-nf-match-frag,\ + $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_frag \ +,55)) + +$(eval $(call KMOD_template,IP6_NF_MATCH_OPTS,ip6-nf-match-opts,\ + $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_hbh \ +,55)) + +$(eval $(call KMOD_template,IP6_NF_MATCH_IPV6HEADER,ip6-nf-match-ipv6header,\ + $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_ipv6header \ +,55)) + +$(eval $(call KMOD_template,IP6_NF_MATCH_MH,ip6-nf-match-mh,\ + $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_mh \ +,55)) + +$(eval $(call KMOD_template,IP6_NF_MATCH_RT,ip6-nf-match-rt,\ + $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_rt \ +,55)) + +$(eval $(call KMOD_template,IP6_NF_TARGET_LOG,ip6-nf-target-log,\ + $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_LOG \ +,55)) + +# +# IPv6: Filtering +# +$(eval $(call KMOD_template,IP6_NF_FILTER,ip6-nf-filter,\ + $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6table_filter \ +,55)) + +$(eval $(call KMOD_template,IP6_NF_TARGET_REJECT,ip6-nf-target-reject,\ + $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_REJECT \ +,60)) + +# +# IPv6: Mangle +# +$(eval $(call KMOD_template,IP6_NF_MANGLE,ip6-nf-mangle,\ + $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6table_mangle \ +,60)) + +# # IPVS # diff --git a/mk/package.mk b/mk/package.mk index 6c58d4d4e..b4b02d8a5 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -43,6 +43,10 @@ else CONFIGURE_ARGS+= --disable-debug endif +ifeq ($(ADK_ENABLE_IPV6),y) +CONFIGURE_ARGS+= --enable-ipv6 +endif + CONFIGURE_ENV+= CONFIG_SHELL='$(strip ${SHELL})' \ CFLAGS='$(strip ${TCFLAGS})' \ CXXFLAGS='$(strip ${TCXXFLAGS})' \ diff --git a/mk/rootfs.mk b/mk/rootfs.mk index ef6fb031b..b91a58629 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -17,6 +17,7 @@ ROOTFS:= root=/dev/mmcblk0p2 rootwait endif $(eval $(call rootfs_template,ext2-block,EXT2_BLOCK,$(ROOTFS))) +$(eval $(call rootfs_template,usb,USB,root=/dev/sdb1 rootdelay=10)) $(eval $(call rootfs_template,archive,ARCHIVE)) $(eval $(call rootfs_template,initramfs,INITRAMFS)) $(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK)) diff --git a/package/Config.in b/package/Config.in index e5ffd2e07..37f1e4e92 100644 --- a/package/Config.in +++ b/package/Config.in @@ -3,6 +3,18 @@ menu "Package selection" +config ADK_ENABLE_IPV6 + prompt "enable IPv6 globally" + boolean + default y + # FIXME: selecting stuff here is ugly, better fix package flavours to + # support a symbol-value-based default (i.e., "default y if IPV6") + select ADK_PACKAGE_NFS_UTILS_WITH_TIRPC if ADK_PACKAGE_NFS_UTILS != n + help + This enables IPv6 support in all related applications. Basically this + just means passing --enable-ipv6 to the configure script, but the + exception proves the rule. ;) + menu "Basesystem" source "package/adkinstall/Config.in" source "package/base-files/Config.in" @@ -97,6 +109,7 @@ menu "Firewall / Routing / Bridging" source "package/arpd/Config.in" source "package/bridge-utils/Config.in" source "package/linux-atm/Config.in" +source "package/conntrack-tools/Config.in" source "package/cutter/Config.in" source "package/ebtables/Config.in" source "package/ether-wake/Config.in" @@ -157,6 +170,8 @@ source "package/cgilib/Config.in" source "package/curl/Config.in.lib" source "package/cxxtools/Config.in" source "package/dbus/Config.in" +source "package/dbus-glib/Config.in" +source "package/dbus-glib/Config.in.lib" source "package/e2fsprogs/Config.in.lib" source "package/fontconfig/Config.in" source "package/gettext/Config.in" @@ -213,6 +228,8 @@ source "package/libiconv/Config.in" source "package/libiconv/Config.in.lib" source "package/libid3tag/Config.in" source "package/libid3tag/Config.in.lib" +source "package/libIDL/Config.in" +source "package/libIDL/Config.in.lib" source "package/jpeg/Config.in" source "package/jpeg/Config.in.lib" source "package/krb5/Config.in.lib" @@ -220,6 +237,8 @@ source "package/lame/Config.in.lib" source "package/mpfr/Config.in" source "package/mysql/Config.in" source "package/mysql/Config.in.lib" +source "package/libnotify/Config.in" +source "package/libnotify/Config.in.lib" source "package/nspr/Config.in" source "package/nss/Config.in" source "package/libtool/Config.in.lib" @@ -587,6 +606,7 @@ source "package/xorg-server/Config.in" source "package/xf86-video-cirrus/Config.in" source "package/xf86-video-geode/Config.in" source "package/xf86-video-fbdev/Config.in" +source "package/xf86-video-intel/Config.in" source "package/xf86-video-siliconmotion/Config.in" |