summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/build.mk1
-rw-r--r--mk/package.mk5
-rw-r--r--mk/perl.mk2
-rw-r--r--mk/vars.mk11
-rw-r--r--package/bind/Makefile24
-rw-r--r--package/gettext/Makefile4
-rw-r--r--package/gnutls/Makefile3
-rw-r--r--package/libX11/Makefile2
-rw-r--r--package/libXau/Makefile2
-rw-r--r--package/libXcomposite/Makefile2
-rw-r--r--package/libXdmcp/Makefile2
-rw-r--r--package/libXext/Makefile2
-rw-r--r--package/lynx/Makefile2
-rw-r--r--package/nfs-utils/files/nfs-utils.postinst1
-rw-r--r--package/nfs-utils/files/nfs.init34
-rw-r--r--package/p5-XML-Parser/Makefile35
-rw-r--r--package/portmap/Makefile6
-rw-r--r--scripts/scan-pkgs.sh9
-rw-r--r--target/linux/config/Config.in.fsnet2
-rw-r--r--target/linux/config/Config.in.network7
20 files changed, 123 insertions, 33 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 4fcce3ada..d324d6579 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -14,6 +14,7 @@ DEFCONFIG= ADK_DEBUG=n \
ADK_STATIC=n \
ADK_MAKE_PARALLEL=y \
ADK_MAKE_JOBS=4 \
+ ADK_USE_CCACHE=n \
ADK_PACKAGE_GRUB=n \
ADK_PACKAGE_BASE_FILES=y \
ADK_PACKAGE_PYTHON=n \
diff --git a/mk/package.mk b/mk/package.mk
index 68142df0e..9b2b77559 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -3,10 +3,6 @@
all: build-all-pkgs
-ifeq ($(ADK_HOST_CYGWIN),y)
-EXEEXT:= .exe
-endif
-
# does not change CONFIGURE_ARGS in minimal mode
ifeq ($(filter minimal,${CONFIG_STYLE}),)
ifneq ($(ADK_DEBUG),)
@@ -25,6 +21,7 @@ CONFIGURE_ENV+= GCC_HONOUR_COPTS=s \
PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig'
ifeq ($(ADK_NATIVE),)
CONFIGURE_ENV+= ${TARGET_CONFIGURE_OPTS} \
+ cross_compiling=yes \
ac_cv_func_realloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes
endif
diff --git a/mk/perl.mk b/mk/perl.mk
new file mode 100644
index 000000000..5fd0c65ed
--- /dev/null
+++ b/mk/perl.mk
@@ -0,0 +1,2 @@
+PERL_VERSION=5.12.2
+PERL_SITEDIR:=/usr/lib/perl5/site_perl/$(PERL_VERSION)/$(CPU_ARCH)-linux
diff --git a/mk/vars.mk b/mk/vars.mk
index 420e71248..61e71de1d 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -18,7 +18,14 @@ STAGING_PKG_DIR:= ${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC}
STAGING_PKG_DIR_PFX:= ${BASE_DIR}/pkg_*
STAGING_HOST_DIR:= ${BASE_DIR}/host_${CPU_ARCH}_${ADK_TARGET_LIBC}
STAGING_HOST_DIR_PFX:= ${BASE_DIR}/host_*
+# use headers and foo-config from system
+ifneq ($(ADK_NATIVE),)
+STAGING_TARGET_DIR:=
+SCRIPT_TARGET_DIR:= /usr/bin
+else
STAGING_TARGET_DIR:= ${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}
+SCRIPT_TARGET_DIR:= ${STAGING_TARGET_DIR}/scripts
+endif
STAGING_TARGET_DIR_PFX:=${BASE_DIR}/target_*
# relation from STAGING_HOST_DIR to STAGING_TARGET_DIR (for gcc to find
# its sysroot while staying relocatable)
@@ -191,4 +198,8 @@ QUIET:= --quiet
endif
FETCH_CMD?= wget --timeout=30 $(QUIET)
+ifeq ($(ADK_HOST_CYGWIN),y)
+EXEEXT:= .exe
+endif
+
include $(TOPDIR)/mk/mirrors.mk
diff --git a/package/bind/Makefile b/package/bind/Makefile
index 8e5a66e46..3daa17661 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -14,19 +14,25 @@ PKG_BUILDDEP:= openssl libxml2
PKG_URL:= https://www.isc.org/software/bind/
PKG_SITES:= ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/
-PKG_SUBPKGS:= BIND_SERVER BIND_NSUPDATE LIBBIND BIND_RNDC BIND_CHECK BIND_DNSSEC BIND_HOST BIND_DIG
+PKG_SUBPKGS:= BIND_SERVER BIND_NSUPDATE BIND_RNDC BIND_CHECK BIND_DNSSEC BIND_HOST BIND_DIG LIBBIND
PKGSD_BIND_NSUPDATE:= nsupdate utility
PKGSC_BIND_NSUPDATE:= dns
+PKGSS_BIND_NSUPDATE:= libbind
PKGSD_BIND_RNDC:= rndc & rndc-confgen utilities
PKGSC_BIND_RNDC:= dns
+PKGSS_BIND_RNDC:= libbind
PKGSD_BIND_CHECK:= check utilities
PKGSC_BIND_CHECK:= dns
+PKGSS_BIND_CHECK:= libbind
PKGSD_BIND_DNSSEC:= dnssec utilities
PKGSC_BIND_DNSSEC:= dns
+PKGSS_BIND_DNSSEC:= libbind
PKGSD_BIND_HOST:= host utility
PKGSC_BIND_HOST:= dns
+PKGSS_BIND_HOST:= libbind
PKGSD_BIND_DIG:= dig utility
PKGSC_BIND_DIG:= dns
+PKGSS_BIND_DIG:= libbind
PKGSD_LIBBIND:= library for the bind software suite
PKGSC_LIBBIND:= libs
@@ -36,18 +42,18 @@ PKGFD_WITH_IPV6:= enable IPv6 support
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,BIND_CLIENT,bind-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_NSUPDATE},${PKGSC_BIND_NSUPDATE}))
-$(eval $(call PKG_template,BIND_RNDC,bind-rndc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_RNDC},${PKGSC_BIND_RNDC}))
-$(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_CHECK},${PKGSC_BIND_CHECK}))
-$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_DNSSEC},${PKGSC_BIND_DNSSEC}))
-$(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_HOST},${PKGSC_BIND_HOST}))
-$(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_DIG},${PKGSC_BIND_DIG}))
+$(eval $(call PKG_template,BIND_NSUPDATE,bind-nsupdate,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_BIND_NSUPDATE},${PKGSD_BIND_NSUPDATE},${PKGSC_BIND_NSUPDATE}))
+$(eval $(call PKG_template,BIND_RNDC,bind-rndc,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_BIND_RNDC},${PKGSD_BIND_RNDC},${PKGSC_BIND_RNDC}))
+$(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_BIND_CHECK},${PKGSD_BIND_CHECK},${PKGSC_BIND_CHECK}))
+$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_BIND_DNSSEC},${PKGSD_BIND_DNSSEC},${PKGSC_BIND_DNSSEC}))
+$(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_BIND_HOST},${PKGSD_BIND_HOST},${PKGSC_BIND_HOST}))
+$(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_BIND_DIG},${PKGSD_BIND_DIG},${PKGSC_BIND_DIG}))
$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBIND},${PKGSC_LIBBIND}))
CONFIGURE_ARGS+= --with-randomdev=/dev/urandom \
--disable-threads \
- --with-openssl=${STAGING_TARGET_DIR}/usr/ \
- --with-libxml2=${STAGING_TARGET_DIR}/usr/ \
+ --with-openssl=${STAGING_TARGET_DIR}/usr \
+ --with-libxml2=${STAGING_TARGET_DIR}/usr \
--enable-epoll \
--with-libtool
diff --git a/package/gettext/Makefile b/package/gettext/Makefile
index e970b6510..8cafe4ebc 100644
--- a/package/gettext/Makefile
+++ b/package/gettext/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= ${MASTER_SITE_GNU:=gettext/}
PKG_SUBPKGS:= LIBINTL GETTEXT MSGFMT
PKGSD_GETTEXT:= gettext utility
-PKSSC_GETTEXT:= misc
+PKGSC_GETTEXT:= misc
PKGSS_GETTEXT:= libintl
PKGSD_MSGFMT:= msgfmt utility
PKGSC_MSGFMT:= misc
@@ -29,7 +29,7 @@ endif
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBINTL,libintl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,GETTEXT,gettext,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_GETTEXT},${PKGSD_GETTEXT},${PKSSC_GETTEXT}))
+$(eval $(call PKG_template,GETTEXT,gettext,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_GETTEXT},${PKGSD_GETTEXT},${PKGSC_GETTEXT}))
$(eval $(call PKG_template,MSGFMT,msgfmt,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_MSGFMT},${PKGSD_MSGFMT},${PKGSC_MSGFMT}))
CONFIGURE_ARGS+= --disable-java \
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index e75ae7f9f..2257a1596 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -17,6 +17,7 @@ PKG_SITES:= ${MASTER_SITE_GNU:=gnutls/}
PKG_SUBPKGS:= LIBGNUTLS GNUTLS_UTILS LIBGNUTLS_EXTRA LIBGNUTLS_OPENSSL
PKGSD_GNUTLS_UTILS:= GNU TLS utilities
PKGSS_GNUTLS_UTILS:= libgnutls libgnutls-extra
+PKGSC_GNUTLS_UTILS:= crypto
PKGSC_LIBGNUTLS:= libs
PKGSC_LIBGNUTLS_EXTRA:= libs
PKGSC_LIBGNUTLS_OPENSSL:= libs
@@ -26,7 +27,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS}))
-$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_GNUTLS_UTILS},${PKGSD_GNUTLS_UTILS},${PKG_SECTION}))
+$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_GNUTLS_UTILS},${PKGSD_GNUTLS_UTILS},${PKGSC_GNUTLS_UTILS}))
$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS_EXTRA}))
$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS_OPENSSL}))
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index 97d1e0b4b..c2118216f 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -16,7 +16,7 @@ PKG_SITES:= ${MASTER_SITE_XORG}
PKG_SUBPKGS:= LIBX11 LIBX11_DEV
PKGSD_LIBX11_DEV:= X11 headers
-PKGSC_LIBX11_DEV:= devel
+PKGSC_LIBX11_DEV:= x11/devel
ifeq ($(ADK_STATIC),y)
PKG_OPTS:= libonly
diff --git a/package/libXau/Makefile b/package/libXau/Makefile
index 5ca6c8107..469affdf7 100644
--- a/package/libXau/Makefile
+++ b/package/libXau/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= ${MASTER_SITE_XORG}
PKG_SUBPKGS:= LIBXAU LIBXAU_DEV
PKGSD_LIBXAU_DEV:= Xauth headers
-PKGSC_LIBXAU_DEV:= devel
+PKGSC_LIBXAU_DEV:= x11/devel
ifeq ($(ADK_STATIC),y)
PKG_OPTS:= libonly
diff --git a/package/libXcomposite/Makefile b/package/libXcomposite/Makefile
index a48137b64..b9f482c02 100644
--- a/package/libXcomposite/Makefile
+++ b/package/libXcomposite/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= ${MASTER_SITE_XORG}
PKG_SUBPKGS:= LIBXCOMPOSITE LIBXCOMPOSITE_DEV
PKGSD_LIBXCOMPOSITE_DEV:= X11 composite headers
-PKGSC_LIBXCOMPOSITE_DEV:= devel
+PKGSC_LIBXCOMPOSITE_DEV:= x11/devel
ifeq ($(ADK_STATIC),y)
PKG_OPTS:= libonly
diff --git a/package/libXdmcp/Makefile b/package/libXdmcp/Makefile
index ab547616d..449baf9c6 100644
--- a/package/libXdmcp/Makefile
+++ b/package/libXdmcp/Makefile
@@ -13,7 +13,7 @@ PKG_SITES:= ${MASTER_SITE_XORG}
PKG_SUBPKGS:= LIBXDMCP LIBXDMCP_DEV
PKGSD_LIBXDMCP_DEV:= XDMCP headers
-PKGSC_LIBXDMCP_DEV:= devel
+PKGSC_LIBXDMCP_DEV:= x11/devel
ifeq ($(ADK_STATIC),y)
PKG_OPTS:= libonly
diff --git a/package/libXext/Makefile b/package/libXext/Makefile
index af874c2d2..64fec7852 100644
--- a/package/libXext/Makefile
+++ b/package/libXext/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:= ${MASTER_SITE_XORG}
PKG_SUBPKGS:= LIBXEXT LIBXEXT_DEV
PKGSD_LIBXEXT_DEV:= X11 extension headers
-PKGSC_LIBXEXT_DEV:= devel
+PKGSC_LIBXEXT_DEV:= x11/devel
ifeq ($(ADK_STATIC),y)
PKG_OPTS:= libonly
diff --git a/package/lynx/Makefile b/package/lynx/Makefile
index 895a4e248..3f3e498a0 100644
--- a/package/lynx/Makefile
+++ b/package/lynx/Makefile
@@ -77,6 +77,8 @@ CONFIGURE_ARGS+= \
--with-screen=ncurses \
--disable-widec \
--disable-locale-charset \
+ --with-build-cc=$(CC_FOR_BUILD) \
+ --with-build-cflags="$(CFLAGS_FOR_BUILD)" \
--with-build-cppflags="-I/usr/include/ncurses"
MAKE_FILE:= makefile
diff --git a/package/nfs-utils/files/nfs-utils.postinst b/package/nfs-utils/files/nfs-utils.postinst
index 131ed1608..0334fcb40 100644
--- a/package/nfs-utils/files/nfs-utils.postinst
+++ b/package/nfs-utils/files/nfs-utils.postinst
@@ -1,6 +1,7 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
add_rcconf "kernel nfs server" nfs_server NO
+add_rcconf "kernel nfs client (v4)" nfs_client NO
add_rcconf "kernel nfs server version" nfs_server_version 3
add_service nfs 2049/tcp
add_service nfs 2049/udp
diff --git a/package/nfs-utils/files/nfs.init b/package/nfs-utils/files/nfs.init
new file mode 100644
index 000000000..8944ef2e2
--- /dev/null
+++ b/package/nfs-utils/files/nfs.init
@@ -0,0 +1,34 @@
+#!/bin/sh
+#PKG nfs-utils
+#INIT 70
+
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+ test x"${portmap:-NO}" = x"NO" && test x"${rpcbind:-NO}" = x"NO" && exit 0
+ test x"${nfs_client:-NO}" = x"NO" && exit 0
+ exec sh $0 start
+ ;;
+start)
+ mkdir -p /var/lib/nfs/rpc_pipefs
+ mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
+ /usr/sbin/idmapd
+ /usr/sbin/gssd
+ ;;
+stop)
+ kill $(pgrep -f /usr/sbin/idmapd)
+ kill $(pgrep -f /usr/sbin/gssd)
+ umount /var/lib/nfs/rpc_pipefs
+ ;;
+restart)
+ sh $0 stop
+ sh $0 start
+ ;;
+*)
+ echo "Usage: $0 {start | stop | restart}"
+ exit 1
+ ;;
+esac
+exit $?
diff --git a/package/p5-XML-Parser/Makefile b/package/p5-XML-Parser/Makefile
new file mode 100644
index 000000000..6a557dc60
--- /dev/null
+++ b/package/p5-XML-Parser/Makefile
@@ -0,0 +1,35 @@
+# 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:= p5-XML-Parser
+PKG_VERSION:= 2.40
+PKG_RELEASE:= 1
+PKG_MD5SUM:= c66e9adba003d0667cc40115ccd837a5
+PKG_DESCR:= XML::Parser
+PKG_SECTION:= lang
+PKG_DEPENDS:= libexpat
+PKG_BUILDDEP:= expat
+PKG_SITES:= http://search.cpan.org/CPAN/authors/id/C/CH/CHORNY/
+
+DISTFILES:= XML-Parser-${PKG_VERSION}.tar.gz
+WRKDIST= ${WRKDIR}/XML-Parser-${PKG_VERSION}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,P5_XML_PARSER,p5-xml-parser,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:= manual
+
+include $(TOPDIR)/mk/perl.mk
+
+pre-build:
+ (cd ${WRKSRC} && perl Makefile.PL)
+
+post-install:
+ $(INSTALL_DIR) $(IDIR_P5_XML_PARSER)$(PERL_SITEDIR)
+ $(CP) $(WRKINST)$(PERL_SITEDIR)/* \
+ $(IDIR_P5_XML_PARSER)$(PERL_SITEDIR)
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/portmap/Makefile b/package/portmap/Makefile
index 0e3eddb2c..2026c6670 100644
--- a/package/portmap/Makefile
+++ b/package/portmap/Makefile
@@ -22,11 +22,7 @@ $(eval $(call PKG_template,PORTMAP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${P
CONFIG_STYLE:= manual
INSTALL_STYLE:= manual
-ifneq ($(strip ${ADK_PACKAGE_PORTMAP_LIBWRAP}),)
-MAKE_FLAGS+= WRAP_LIB='-L${STAGING_TARGET_DIR}/usr/lib -lwrap'
-else
MAKE_FLAGS+= NO_TCP_WRAPPER=1
-endif
TARGET_CPPFLAGS+= -DDAEMON_UID=20 -DDAEMON_GID=20
TARGET_CFLAGS+= -fPIC
MAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS} \
@@ -34,6 +30,6 @@ MAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS} \
do-install:
${INSTALL_DIR} ${IDIR_PORTMAP}/usr/sbin
- ${INSTALL_BIN} ${WRKBUILD}/portmap ${IDIR_PORTMAP}/usr/sbin/
+ ${INSTALL_BIN} ${WRKBUILD}/portmap ${IDIR_PORTMAP}/usr/sbin
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index c92c6c107..948e8c0be 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -41,6 +41,9 @@ if [[ -n $ADK_NATIVE ]];then
if [[ -n $ADK_PACKAGE_WPA_SUPPLICANT_WITH_OPENSSL ]]; then
NEED_LIBSSLDEV="$NEED_LIBSSLDEV wpa_supplicant"
fi
+ if [[ -n $ADK_COMPILE_BIND ]]; then
+ NEED_LIBSSLDEV="$NEED_LIBSSLDEV bind"
+ fi
if [[ -n $ADK_PACKAGE_IW ]]; then
NEED_LIBNLDEV="$NEED_LIBNLDEV iw"
fi
@@ -305,14 +308,14 @@ fi
if [[ -n $NEED_FLEX ]]; then
if ! which flex >/dev/null 2>&1; then
- echo >&2 You need flex to to use $NEED_FLEX package
+ echo >&2 You need flex to build $NEED_FLEX
out=1
fi
fi
if [[ -n $NEED_XSLTPROC ]]; then
if ! which xsltproc >/dev/null 2>&1; then
- echo >&2 You need xsltproc to to use $NEED_XSLTPROC package
+ echo >&2 You need xsltproc to build $NEED_XSLTPROC
out=1
fi
fi
@@ -320,7 +323,7 @@ fi
if [[ -n $NEED_PYTHON ]]; then
if ! which python >/dev/null 2>&1; then
if ! test -x /usr/pkg/bin/python2.6 >/dev/null; then
- echo >&2 You need python to to use $NEED_PYTHON package
+ echo >&2 You need python to build $NEED_PYTHON
out=1
fi
fi
diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet
index be22397d2..fa90abfe2 100644
--- a/target/linux/config/Config.in.fsnet
+++ b/target/linux/config/Config.in.fsnet
@@ -126,7 +126,7 @@ config ADK_KERNEL_NFSD_V4
prompt "Enable NFSv4 and RPC Kerberos"
boolean
depends on !ADK_TARGET_ROOTFS_NFSROOT
- depends on ADK_KPACKAGE_KMOD_NFSD
+ depends on ADK_KPACKAGE_KMOD_NFSD || ADK_KPACKAGE_KMOD_NFS_FS
select ADK_KPACKAGE_KMOD_SUNRPC_GSS
select ADK_KPACKAGE_KMOD_RPCSEC_GSS_KRB5
select ADK_KERNEL_NFS_V4
diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network
index 1bbf681dc..6e4267857 100644
--- a/target/linux/config/Config.in.network
+++ b/target/linux/config/Config.in.network
@@ -214,12 +214,12 @@ config ADK_KPACKAGE_KMOD_PPP
config ADK_KPACKAGE_KMOD_PPP_MPPE
prompt "kmod-ppp-mppe................... PPP MPPE/MPPC module"
tristate
- default n
depends on ADK_KPACKAGE_KMOD_PPP
select ADK_KERNEL_CRYPTO
select ADK_KPACKAGE_KMOD_CRYPTO_ARC4
select ADK_KPACKAGE_KMOD_CRYPTO_SHA1
select ADK_KPACKAGE_KMOD_CRYPTO_ECB
+ default n
help
Support for the MPPE Encryption protocol, as employed by the
Microsoft Point-to-Point Tunneling Protocol.
@@ -230,23 +230,24 @@ config ADK_KPACKAGE_KMOD_PPP_MPPE
config ADK_KPACKAGE_KMOD_PPPOATM
prompt "kmod-pppoatm.................... PPPoA (PPP over ATM) kernel support"
tristate
- default n
depends on ADK_KPACKAGE_KMOD_PPP
select ADK_KPACKAGE_KMOD_ATM
+ default n
help
Support for PPP over ATM
config ADK_KPACKAGE_KMOD_PPPOE
prompt "kmod-pppoe...................... PPPoE (PPP over Ethernet) kernel support"
tristate
- default n
depends on ADK_KPACKAGE_KMOD_PPP
+ default n
help
Support for PPP over Ethernet
config ADK_KPACKAGE_KMOD_TUN
prompt "kmod-tun.......................... Universal TUN/TAP driver"
tristate
+ select ADK_KERNEL_NETDEVICES
default n
help
Kernel support for the TUN/TAP tunneling device
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 16:29:00 +0000