summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/Config.in1
-rw-r--r--package/Depends.mk3
-rw-r--r--package/Makefile1
-rw-r--r--package/ca-certificates/Config.in17
-rw-r--r--package/ca-certificates/Makefile40
-rw-r--r--package/ca-certificates/cert.pem (renamed from package/openssl/cert.pem)0
-rw-r--r--package/ca-certificates/extra/update-ca-certificates80
-rw-r--r--package/ca-certificates/patches/patch-Makefile12
-rw-r--r--package/ca-certificates/patches/patch-sbin_Makefile9
-rw-r--r--package/ca-certificates/patches/patch-sbin_update-ca-certificates48
-rw-r--r--package/cryptsetup/Makefile17
-rw-r--r--package/cryptsetup/patches/patch-lib_libdevmapper_c14
-rw-r--r--package/cryptsetup/patches/patch-lib_setup_c17
-rw-r--r--package/cryptsetup/patches/patch-lib_utils_c16
-rw-r--r--package/iproute2/Config.in73
-rw-r--r--package/iproute2/Makefile105
-rw-r--r--package/iproute2/patches/patch-Makefile33
-rw-r--r--package/iproute2/patches/patch-configure30
-rw-r--r--package/iproute2/patches/patch-ip_Makefile10
-rw-r--r--package/iproute2/patches/patch-ip_iptunnel_c17
-rw-r--r--package/iproute2/patches/patch-misc_Makefile13
-rw-r--r--package/lvm/Makefile4
-rw-r--r--package/lvm/patches/patch-Makefile_in10
-rw-r--r--package/lvm/patches/patch-doc_Makefile_in7
-rw-r--r--package/lvm/patches/patch-libdm_Makefile_in33
-rw-r--r--package/lvm/patches/patch-tools_Makefile_in52
-rw-r--r--package/openssl/Config.in6
-rw-r--r--package/openssl/Makefile2
28 files changed, 511 insertions, 159 deletions
diff --git a/package/Config.in b/package/Config.in
index a563b9a75..ff123d48e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -316,6 +316,7 @@ menu "Security"
source "package/arpwatch/Config.in"
source "package/autossh/Config.in"
source "package/axtls/Config.in"
+source "package/ca-certificates/Config.in"
source "package/dropbear/Config.in"
source "package/httptunnel/Config.in"
source "package/ipsec-tools/Config.in"
diff --git a/package/Depends.mk b/package/Depends.mk
index 50f659263..fc07c3ade 100644
--- a/package/Depends.mk
+++ b/package/Depends.mk
@@ -74,6 +74,9 @@ ipcad-compile: libpcap-compile
ifeq (${ADK_COMPILE_IPERF_WITH_UCLIBCXX},y)
iperf-compile: uclibc++-compile
endif
+ifneq ($(strip ${ADK_PACKAGE_TC_ATM}),)
+iproute2-compile: linux-atm-compile
+endif
ipsec-tools-compile: openssl-compile
iptraf-compile: ncurses-compile
irssi-compile: glib-compile ncurses-compile
diff --git a/package/Makefile b/package/Makefile
index cb96c5adc..6af55aee0 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -32,6 +32,7 @@ package-$(ADK_COMPILE_AVAHI) += avahi
package-$(ADK_COMPILE_AXTLS) += axtls
package-$(ADK_PACKAGE_BASH) += bash
package-$(ADK_COMPILE_BC) += bc
+package-$(ADK_PACKAGE_CA_CERTS) += ca-certificates
package-$(ADK_PACKAGE_CFGFS) += cfgfs
package-$(ADK_PACKAGE_BIGREQSPROTO) += bigreqsproto
package-$(ADK_COMPILE_BIND) += bind
diff --git a/package/ca-certificates/Config.in b/package/ca-certificates/Config.in
new file mode 100644
index 000000000..bb9c6d3fe
--- /dev/null
+++ b/package/ca-certificates/Config.in
@@ -0,0 +1,17 @@
+config ADK_PACKAGE_CA_CERTS
+ prompt "ca-certificates................... Collection of common CA certificates"
+ tristate
+ default n
+ select ADK_PACKAGE_LIBOPENSSL
+ select ADK_PACKAGE_LIBOPENSSL_UTIL
+ help
+ Collection of CA certificates to validate internet certificates against.
+
+ http://packages.debian.org/sid/ca-certificates
+
+config ADK_DO_MINIMAL_CA_CERTS
+ prompt "save space........................ Install only a very minimal version"
+ boolean
+ default n
+ depends on ADK_PACKAGE_CA_CERTS
+
diff --git a/package/ca-certificates/Makefile b/package/ca-certificates/Makefile
new file mode 100644
index 000000000..020e0dfc7
--- /dev/null
+++ b/package/ca-certificates/Makefile
@@ -0,0 +1,40 @@
+# 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:= ca-certificates
+PKG_VERSION:= 20090814
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 307052c985bec7f9a00eb84293eef779
+PKG_DESCR:= Collection of common CA certificates
+PKG_SECTION:= shells
+PKG_URL:= http://packages.debian.org/sid/ca-certificates
+PKG_SITES:= http://ftp.debian.org/debian/pool/main/c/ca-certificates/
+
+DISTFILES:= ${PKG_NAME}_${PKG_VERSION}.tar.gz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,CA_CERTS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+BUILD_STYLE= auto
+INSTALL_STYLE= auto
+
+
+post-install:
+ifeq (${ADK_DO_MINIMAL_CA_CERTS},n)
+ $(INSTALL_DIR) $(IDIR_CA_CERTS)/{etc/ssl/certs,usr/share,usr/sbin}
+ $(CP) $(WRKINST)/usr/share/ca-certificates $(IDIR_CA_CERTS)/usr/share/
+ ( cd ${IDIR_CA_CERTS}/usr/share/ca-certificates && \
+ ls */*.crt >${IDIR_CA_CERTS}/etc/ca-certificates.conf \
+ )
+ ${INSTALL_BIN} ./extra/update-ca-certificates ${IDIR_CA_CERTS}/usr/sbin/
+ -DESTDIR=${IDIR_CA_CERTS} sh ./extra/update-ca-certificates
+else
+ ${INSTALL_DIR} ${IDIR_CA_CERTS}/etc/ssl
+ ${INSTALL_DATA} ./cert.pem ${IDIR_CA_CERTS}/etc/ssl/
+endif
+
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openssl/cert.pem b/package/ca-certificates/cert.pem
index 345629503..345629503 100644
--- a/package/openssl/cert.pem
+++ b/package/ca-certificates/cert.pem
diff --git a/package/ca-certificates/extra/update-ca-certificates b/package/ca-certificates/extra/update-ca-certificates
new file mode 100644
index 000000000..c86f7676f
--- /dev/null
+++ b/package/ca-certificates/extra/update-ca-certificates
@@ -0,0 +1,80 @@
+#!/bin/sh
+#
+# update-ca-certificates script for embedded systems.
+#
+# Copyright (C) 2009 Phil Sutter <phil@nwl.cc>
+#
+# This program 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.
+#
+# This program 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
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+CRTCONF=/etc/ca-certificates.conf
+CRTDIR=/usr/share/ca-certificates
+LNKDIR=/etc/ssl/certs
+OPENSSL="openssl"
+
+cert_type() { # (certfile)
+ grep -qE '^-----BEGIN (X509 |TRUSTED |)CERTIFICATE-----' $1 && {
+ echo "cert"
+ return 0
+ }
+ grep -qE '^-----BEGIN X509 CRL-----' $1 && {
+ echo "crl"
+ return 0
+ }
+ echo "unknown"
+ return 1
+}
+
+${OPENSSL} version >/dev/null 2>&1 || {
+ echo "Fatal: no openssl executable found, bailing out"
+ exit 1
+}
+
+for l in $(ls ${DESTDIR}${LNKDIR}/* 2>/dev/null); do
+ [ -L "$l" ] && rm -f "$l"
+done
+
+cat ${DESTDIR}$CRTCONF | while read crt; do
+ [ -n "$crt" ] || continue
+ [[ "$crt" = -* ]] && continue
+
+ cname="$(basename $crt)"
+
+ ln -s ${CRTDIR}/$crt ${DESTDIR}${LNKDIR}/$cname
+
+ ctype="$(cert_type ${DESTDIR}${CRTDIR}/$crt)"
+ case $ctype in
+ cert)
+ sslcmd="x509"
+ pfx=""
+ ;;
+ crl)
+ sslcmd="crl"
+ pfx="r"
+ ;;
+ *)
+ echo "Warning: ignoring unknown filetype ${DESTDIR}${CRTDIR}/$crt"
+ continue
+ ;;
+ esac
+
+ hsh="$(${OPENSSL} $sslcmd -hash -noout -in ${DESTDIR}${CRTDIR}/$crt)"
+ idx=0
+ while [ -e ${DESTDIR}${LNKDIR}/${hsh}.${pfx}${idx} ]; do
+ let "idx++"
+ done
+ ln -s ${CRTDIR}/$crt ${DESTDIR}${LNKDIR}/${hsh}.${pfx}${idx}
+done
+
+exit 0
diff --git a/package/ca-certificates/patches/patch-Makefile b/package/ca-certificates/patches/patch-Makefile
new file mode 100644
index 000000000..24e9fab9c
--- /dev/null
+++ b/package/ca-certificates/patches/patch-Makefile
@@ -0,0 +1,12 @@
+ fix for the completely empty DESTDIR
+--- ca-certificates-20090814.orig/Makefile 2009-07-08 23:18:57.000000000 +0200
++++ ca-certificates-20090814/Makefile 2009-08-22 20:36:42.614405912 +0200
+@@ -17,7 +17,7 @@ clean:
+
+ install:
+ for dir in $(SUBDIRS); do \
+- mkdir $(DESTDIR)/$(CERTSDIR)/$$dir; \
++ mkdir -p $(DESTDIR)/$(CERTSDIR)/$$dir; \
+ $(MAKE) -C $$dir install CERTSDIR=$(DESTDIR)/$(CERTSDIR)/$$dir; \
+ done
+ for dir in sbin; do \
diff --git a/package/ca-certificates/patches/patch-sbin_Makefile b/package/ca-certificates/patches/patch-sbin_Makefile
new file mode 100644
index 000000000..ff59e4856
--- /dev/null
+++ b/package/ca-certificates/patches/patch-sbin_Makefile
@@ -0,0 +1,9 @@
+ fix for the completely empty DESTDIR
+--- ca-certificates-20090814.orig/sbin/Makefile 2007-02-02 07:23:19.000000000 +0100
++++ ca-certificates-20090814/sbin/Makefile 2009-08-22 20:37:17.581921717 +0200
+@@ -8,4 +8,5 @@ all:
+ clean:
+
+ install:
++ mkdir -p $(DESTDIR)/usr/sbin
+ install -m755 update-ca-certificates $(DESTDIR)/usr/sbin/
diff --git a/package/ca-certificates/patches/patch-sbin_update-ca-certificates b/package/ca-certificates/patches/patch-sbin_update-ca-certificates
new file mode 100644
index 000000000..dd6288366
--- /dev/null
+++ b/package/ca-certificates/patches/patch-sbin_update-ca-certificates
@@ -0,0 +1,48 @@
+ - prefix absolute paths with $DESTDIR
+ - subtract DESTDIR from the link name when linking
+ - add DESTDIR again when catting certs together (Yay.)
+--- ca-certificates-20090814.orig/sbin/update-ca-certificates 2009-07-08 23:23:12.000000000 +0200
++++ ca-certificates-20090814/sbin/update-ca-certificates 2009-08-22 21:10:24.210186675 +0200
+@@ -37,11 +37,11 @@ do
+ shift
+ done
+
+-CERTSCONF=/etc/ca-certificates.conf
+-CERTSDIR=/usr/share/ca-certificates
+-LOCALCERTSDIR=/usr/local/share/ca-certificates
++CERTSCONF=${DESTDIR}/etc/ca-certificates.conf
++CERTSDIR=${DESTDIR}/usr/share/ca-certificates
++LOCALCERTSDIR=${DESTDIR}/usr/local/share/ca-certificates
+ CERTBUNDLE=ca-certificates.crt
+-ETCCERTSDIR=/etc/ssl/certs
++ETCCERTSDIR=${DESTDIR}/etc/ssl/certs
+
+ cleanup() {
+ rm -f "$TEMPBUNDLE"
+@@ -60,7 +60,7 @@ REMOVED="$(mktemp -t "ca-certificates.tm
+ # in /etc/ssl/certs to the certificate file and its inclusion into the
+ # bundle.
+ add() {
+- CERT="$1"
++ CERT="${1##${DESTDIR}}"
+ PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \
+ -e 's/[()]/=/g' \
+ -e 's/,/_/g').pem"
+@@ -69,7 +69,7 @@ add() {
+ ln -sf "$CERT" "$PEM"
+ echo +$PEM >> "$ADDED"
+ fi
+- cat "$CERT" >> "$TEMPBUNDLE"
++ cat "${DESTDIR}/$CERT" >> "$TEMPBUNDLE"
+ }
+
+ remove() {
+@@ -146,7 +146,7 @@ fi
+
+ echo "$ADDED_CNT added, $REMOVED_CNT removed; done."
+
+-HOOKSDIR=/etc/ca-certificates/update.d
++HOOKSDIR=${DESTDIR}/etc/ca-certificates/update.d
+ echo -n "Running hooks in $HOOKSDIR...."
+ VERBOSE_ARG=
+ [ "$verbose" = 0 ] || VERBOSE_ARG=--verbose
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index a7a93d139..76fdc98e4 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= cryptsetup
-PKG_VERSION:= 1.0.6
+PKG_VERSION:= 1.0.7
PKG_RELEASE:= 1
-PKG_MD5SUM:= 00d452eb7a76e39f5749545d48934a10
+PKG_MD5SUM:= 5eea2a77391a8a1a651b31cbaef59e22
PKG_DESCR:= LUKS cryptsetup tools
PKG_SECTION:= crypto
PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt
@@ -24,6 +24,19 @@ CONFIGURE_ARGS+= --disable-static
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
+# hackish way to although build the static libraries for cryptinit
+pre-configure:
+ (cd ${WRKBUILD}; \
+ env ${CONFIGURE_ENV} \
+ ./configure --enable-static \
+ --build=${GNU_HOST_NAME} \
+ --host=${GNU_TARGET_NAME} \
+ --target=${GNU_TARGET_NAME} \
+ );
+ $(MAKE) -C $(WRKBUILD) CC="$(TARGET_CC)"
+ $(MAKE) -C $(WRKBUILD) CC="$(TARGET_CC)" DESTDIR='${WRKINST}' install
+ $(MAKE) -C $(WRKBUILD) CC="$(TARGET_CC)" clean
+
post-install:
${INSTALL_DIR} ${IDIR_CRYPTSETUP}/usr/sbin ${IDIR_CRYPTSETUP}/usr/lib
${CP} ${WRKINST}/usr/lib/libcryptsetup.so.* \
diff --git a/package/cryptsetup/patches/patch-lib_libdevmapper_c b/package/cryptsetup/patches/patch-lib_libdevmapper_c
deleted file mode 100644
index 052241c92..000000000
--- a/package/cryptsetup/patches/patch-lib_libdevmapper_c
+++ /dev/null
@@ -1,14 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- cryptsetup-1.0.6.orig/lib/libdevmapper.c 2007-10-25 09:11:19.000000000 +0200
-+++ cryptsetup-1.0.6/lib/libdevmapper.c 2009-01-04 17:02:57.000000000 +0100
-@@ -192,7 +192,9 @@ static int dm_create_device(int reload,
- options->flags |= CRYPT_FLAG_READONLY;
-
- /* run udevsettle to avoid a race in libdevmapper causing busy dm devices */
-- run_udevsettle();
-+ /* do not run on mdev based systems
-+ run_udevsettle();
-+ */
-
- r = 0;
-
diff --git a/package/cryptsetup/patches/patch-lib_setup_c b/package/cryptsetup/patches/patch-lib_setup_c
new file mode 100644
index 000000000..97b356f68
--- /dev/null
+++ b/package/cryptsetup/patches/patch-lib_setup_c
@@ -0,0 +1,17 @@
+already added in svn upstream
+--- cryptsetup-1.0.7.orig/lib/setup.c 2009-07-22 13:12:44.000000000 +0200
++++ cryptsetup-1.0.7/lib/setup.c 2009-08-22 15:10:32.000000000 +0200
+@@ -542,7 +542,12 @@ static int __crypt_luks_open(int arg, st
+ start:
+ mk=NULL;
+
+- if(get_key(prompt, &password, &passwordLen, 0, options->key_file, options->passphrase_fd, options->timeout, options->flags))
++ if(options->passphrase) {
++ passwordLen = strlen(options->passphrase);
++ password = safe_alloc(passwordLen + 1);
++ strncpy(password, options->passphrase, passwordLen + 1);
++ tries = 0;
++ } else if(get_key(prompt, &password, &passwordLen, 0, options->key_file, options->passphrase_fd, options->timeout, options->flags))
+ tries--;
+ else
+ tries = 0;
diff --git a/package/cryptsetup/patches/patch-lib_utils_c b/package/cryptsetup/patches/patch-lib_utils_c
deleted file mode 100644
index 665620528..000000000
--- a/package/cryptsetup/patches/patch-lib_utils_c
+++ /dev/null
@@ -1,16 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
-
-* prevent segfault with uClibc
- http://www.spinics.net/lists/dm-crypt/msg01187.html
-
---- cryptsetup-1.0.6.orig/lib/utils.c 2007-12-01 17:29:27.000000000 +0100
-+++ cryptsetup-1.0.6/lib/utils.c 2008-12-25 14:18:46.523091272 +0100
-@@ -27,6 +27,8 @@ static char *error=NULL;
- void set_error_va(const char *fmt, va_list va)
- {
-
-+ if(!fmt) return;
-+
- if(error) {
- free(error);
- error=NULL;
diff --git a/package/iproute2/Config.in b/package/iproute2/Config.in
index a2f60f226..d431a5293 100644
--- a/package/iproute2/Config.in
+++ b/package/iproute2/Config.in
@@ -1,18 +1,79 @@
config ADK_COMPILE_IPROUTE2
+ prompt "iproute2.......................... iproute2 suite of networking utilities"
tristate
default n
config ADK_PACKAGE_IP
- prompt "ip................................ iproute2 routing control utility"
+ prompt "ip................................ ip utility"
tristate
- default n
- select ADK_COMPILE_IPROUTE2
+ default ADK_COMPILE_IPROUTE2
+ depends on ADK_COMPILE_IPROUTE2
+ help
+ IP routing control utility, well-known replacement for ifconfig and route.
config ADK_PACKAGE_TC
- prompt "tc................................ iproute2 traffic control utility"
+ prompt "tc................................ tc utility"
tristate
- default n
- select ADK_COMPILE_IPROUTE2
+ default m
+ depends on ADK_COMPILE_IPROUTE2
help
Traffic shaping control utility. Please choose the kmod-sched-* modules
you need.
+
+config ADK_PACKAGE_TC_ATM
+ prompt "atm support....................... atm support for tc"
+ tristate
+ default n
+ depends on ADK_PACKAGE_TC
+ select ADK_PACKAGE_LIBATM
+ help
+ ATM traffic control support library.
+
+# FIXME: WTF is this "genl" used for??
+# "ifcfg" is lame, just a simple 'ip addr {add|del}' frontend
+
+config ADK_PACKAGE_IFSTAT
+ prompt "ifstat............................ ifstat utility"
+ tristate
+ default m
+ depends on ADK_COMPILE_IPROUTE2
+ help
+ Interface statistics utility.
+
+config ADK_PACKAGE_LNSTAT
+ prompt "lnstat............................ lnstat, ctstat, rtstat, nstat and rtacct utilities"
+ tristate
+ default m
+ depends on ADK_COMPILE_IPROUTE2
+ help
+ Unified linux networking statistics. Lnstat is a replacement for the
+ old rstat program, nstat and rtacct are simple tools to monitor
+ kernel snmp counters and network interface statistics.
+
+
+config ADK_PACKAGE_ROUTEL
+ prompt "routel............................ routel/routef utilities"
+ tristate
+ default m
+ depends on ADK_COMPILE_IPROUTE2
+ help
+ List and flush routes.
+
+config ADK_PACKAGE_RTMON
+ prompt "rtmon............................. RTnetlink monitor"
+ tristate
+ default m
+ depends on ADK_COMPILE_IPROUTE2
+ help
+ Listen to and monitor RTnetlink.
+
+# "rtpr" converts back the output of 'ip -o' (quite useless I guess)
+
+config ADK_PACKAGE_SS
+ prompt "ss................................ socket statistics utility"
+ tristate
+ default m
+ depends on ADK_COMPILE_IPROUTE2
+ help
+ A utility to investigate sockets, similar to netstat.
+
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index ca71c53ab..5195693c0 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -5,49 +5,90 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= iproute2
PKG_VERSION:= 2.6.29-1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= c1bc258a6c345905e79935ac7a3cc582
PKG_DESCR:= iproute2 routing control utility
PKG_SECTION:= net
PKG_URL:= http://www.linuxfoundation.org/en/Net:Iproute2
PKG_SITES:= http://developer.osdl.org/dev/iproute2/download/
-PKG_DESCR_1:= iproute2 traffic control utility
-PKG_DEPENDS_1:= kmod-sched
+PKG_DESCR_TC:= iproute2 traffic control utility
+PKG_DEPENDS_TC:= kmod-sched
+PKG_DESCR_TC_ATM:= iproute2 traffic control ATM support library
+PKG_DEPENDS_TC_ATM:= tc
+PKG_DESCR_IFSTAT:= iproute2 interface statistics utility
+PKG_DESCR_LNSTAT:= iproute2 network statistics utilities
+PKG_DESCR_ROUTEL:= iproute2 route list and flush utilities
+PKG_DESCR_RTMON:= iproute2 RTnetlink monitor
+PKG_DESCR_SS:= iproute2 socket statistics utility
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,IP,ip,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,TC,tc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION}))
-
-do-configure:
- ${SED} "s:-O2:${TARGET_CFLAGS}:g" ${WRKBUILD}/Makefile
- ${SED} "s,-I/usr/include/db3,," ${WRKBUILD}/Makefile
- ${SED} "s,^KERNEL_INCLUDE.*,KERNEL_INCLUDE=${LINUX_DIR}/include," \
- ${WRKBUILD}/Makefile
- ${SED} "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=${STAGING_DIR}/include," \
- ${WRKBUILD}/Makefile
- # For now disable compiling of the misc directory because it seems to fail
- rm -rf ${WRKBUILD}/misc
- ${SED} "s, misc,," ${WRKBUILD}/Makefile
- # netem is 2.6 only stuff
- ${SED} "s, netem,," ${WRKBUILD}/Makefile
-
-do-build:
- ${MAKE} -C ${WRKBUILD}/netem \
- HOSTCC=${HOSTCC} \
- CCOPTS="-I${LINUX_DIR}" \
- ${MAKE} -C ${WRKBUILD} ${TARGET_CONFIGURE_OPTS} \
- CFLAGS="-D_GNU_SOURCE ${TARGET_CFLAGS} -I ../include -DRESOLVE_HOSTNAMES" \
- KERNEL_INCLUDE=${LINUX_DIR}/include all tc/tc ip/ip \
- CCOPTS="-I${LINUX_DIR}"
-
-do-install:
- ${INSTALL_DIR} ${IDIR_IP}/usr/sbin
- ${CP} ${WRKBUILD}/ip/ip ${IDIR_IP}/usr/sbin/
- ${INSTALL_DIR} ${IDIR_TC}/usr/sbin
- ${CP} ${WRKBUILD}/tc/tc ${IDIR_TC}/usr/sbin/
+$(eval $(call PKG_template,TC,tc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_TC},${PKG_DESCR_TC},${PKG_SECTION}))
+$(eval $(call PKG_template,TC_ATM,tc-atm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_TC_ATM},${PKG_DESCR_TC_ATM},${PKG_SECTION}))
+$(eval $(call PKG_template,IFSTAT,ifstat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_IFSTAT},${PKG_DESCR_IFSTAT},${PKG_SECTION}))
+$(eval $(call PKG_template,LNSTAT,lnstat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_LNSTAT},${PKG_DESCR_LNSTAT},${PKG_SECTION}))
+$(eval $(call PKG_template,ROUTEL,routel,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_ROUTEL},${PKG_DESCR_ROUTEL},${PKG_SECTION}))
+$(eval $(call PKG_template,RTMON,rtmon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_RTMON},${PKG_DESCR_RTMON},${PKG_SECTION}))
+$(eval $(call PKG_template,SS,ss,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_SS},${PKG_DESCR_SS},${PKG_SECTION}))
+
+CONFIGURE_STYLE= gnu
+CONFIGURE_FLAGS+= KERNEL_INCLUDE="${LINUX_DIR}/include"
+MAKE_FLAGS+= MFLAGS="CC=${TARGET_CC}"
+BUILD_STYLE= auto
+INSTALL_STYLE= auto
+
+INSTALL_y:=
+INSTALL_m:=
+INSTALL_${ADK_PACKAGE_IP}:= install-ip
+INSTALL_${ADK_PACKAGE_TC}:= install-tc
+INSTALL_${ADK_PACKAGE_TC_ATM}:= install-tc-atm
+INSTALL_${ADK_PACKAGE_IFSTAT}:= install-ifstat
+INSTALL_${ADK_PACKAGE_LNSTAT}:= install-lnstat
+INSTALL_${ADK_PACKAGE_ROUTEL}:= install-routel
+INSTALL_${ADK_PACKAGE_RTMON}:= install-rtmon
+INSTALL_${ADK_PACKAGE_SS}:= install-ss
+
+post-install: ${INSTALL_y} ${INSTALL_m}
+
+install-ip:
+ ${INSTALL_DIR} ${IDIR_IP}/{etc/iproute2,usr/sbin}
+ ${INSTALL_DATA} ${WRKINST}/etc/iproute2/* ${IDIR_IP}/etc/iproute2/
+ ${INSTALL_BIN} ${WRKINST}/sbin/ip ${IDIR_IP}/usr/sbin/ip
+
+install-tc:
+ ${INSTALL_DIR} ${IDIR_TC}/{lib/tc,usr/sbin}
+ ${INSTALL_DATA} ${WRKINST}/lib/tc/* ${IDIR_TC}/lib/tc/
+ ${INSTALL_BIN} ${WRKINST}/sbin/tc ${IDIR_TC}/usr/sbin/
+
+install-tc-atm:
+ ${INSTALL_DIR} ${IDIR_TC_ATM}/usr/lib/tc
+ ${INSTALL_DATA} ${WRKINST}/usr/lib/tc/q_atm.so ${IDIR_TC_ATM}/usr/lib/tc/
+
+install-ifstat:
+ ${INSTALL_DIR} ${IDIR_IFSTAT}/usr/sbin
+ ${INSTALL_BIN} ${WRKINST}/sbin/ifstat ${IDIR_IFSTAT}/usr/sbin
+
+install-lnstat:
+ ${INSTALL_DIR} ${IDIR_LNSTAT}/usr/sbin
+ ${INSTALL_BIN} ${WRKINST}/sbin/{ln,n}stat ${IDIR_LNSTAT}/usr/sbin
+ ln -sf lnstat ${IDIR_LNSTAT}/usr/sbin/rtstat
+ ln -sf lnstat ${IDIR_LNSTAT}/usr/sbin/ctstat
+ ${INSTALL_BIN} ${WRKINST}/sbin/rtacct ${IDIR_LNSTAT}/usr/sbin
+
+install-routel:
+ ${INSTALL_DIR} ${IDIR_ROUTEL}/usr/sbin
+ ${INSTALL_BIN} ${WRKINST}/sbin/route{l,f} ${IDIR_ROUTEL}/usr/sbin
+
+install-rtmon:
+ ${INSTALL_DIR} ${IDIR_RTMON}/usr/sbin
+ ${INSTALL_BIN} ${WRKINST}/sbin/rtmon ${IDIR_RTMON}/usr/sbin
+
+install-ss:
+ ${INSTALL_DIR} ${IDIR_SS}/usr/sbin
+ ${INSTALL_BIN} ${WRKINST}/sbin/ss ${IDIR_SS}/usr/sbin
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/iproute2/patches/patch-Makefile b/package/iproute2/patches/patch-Makefile
index bb7ba6a10..194162a87 100644
--- a/package/iproute2/patches/patch-Makefile
+++ b/package/iproute2/patches/patch-Makefile
@@ -1,19 +1,30 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- iproute2-2.6.26.orig/Makefile 2008-07-25 22:46:07.000000000 +0200
-+++ iproute2-2.6.26/Makefile 2008-10-09 17:08:16.000000000 +0200
-@@ -21,13 +21,13 @@ ADDLIB+=ipx_ntop.o ipx_pton.o
+ - allow variables to be overridden
+ - allow passing TARGET_CFLAGS
+ overriding CCOPTS instead wont work, as this variable is being
+ used to compile host-utils in netem/
+ - define LIBUTIL for misc/ss to compile correctly
+--- iproute2-2.6.29-1.orig/Makefile 2009-03-24 23:40:54.000000000 +0100
++++ iproute2-2.6.29-1/Makefile 2009-08-22 02:42:31.939603104 +0200
+@@ -20,10 +20,10 @@ ADDLIB+=dnet_ntop.o dnet_pton.o
+ #options for ipx
+ ADDLIB+=ipx_ntop.o ipx_pton.o
- CC = gcc
- HOSTCC = gcc
+-CC = gcc
+-HOSTCC = gcc
-CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
-+CCOPTS = -D_GNU_SOURCE -fwrapv -fno-ident -fwrapv -fno-ident -O2 -pipe -march=i586 -funit-at-a-time -pipe -march=i586 -funit-at-a-time -Wstrict-prototypes -Wall
- CFLAGS = $(CCOPTS) -I../include $(DEFINES)
+-CFLAGS = $(CCOPTS) -I../include $(DEFINES)
++CC := gcc
++HOSTCC := gcc
++CCOPTS := -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
++CFLAGS = $(CCOPTS) -I../include $(DEFINES) ${TARGET_CFLAGS}
YACCFLAGS = -d -t -v
LDLIBS += -L../lib -lnetlink -lutil
-
--SUBDIRS=lib ip tc misc netem genl
-+SUBDIRS=lib ip tc genl
+@@ -31,6 +31,7 @@ LDLIBS += -L../lib -lnetlink -lutil
+ SUBDIRS=lib ip tc misc netem genl
LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
++LIBUTIL=../lib/libutil.a
+ all: Config
+ @set -e; \
diff --git a/package/iproute2/patches/patch-configure b/package/iproute2/patches/patch-configure
new file mode 100644
index 000000000..38586090d
--- /dev/null
+++ b/package/iproute2/patches/patch-configure
@@ -0,0 +1,30 @@
+ use the compiler passed in $CC
+--- iproute2-2.6.29-1.orig/configure 2009-03-24 23:40:54.000000000 +0100
++++ iproute2-2.6.29-1/configure 2009-08-22 02:23:52.642364236 +0200
+@@ -16,7 +16,7 @@ int main(int argc, char **argv) {
+ return 0;
+ }
+ EOF
+-gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1
++$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1
+ if [ $? -eq 0 ]
+ then
+ echo "TC_CONFIG_ATM:=y" >>Config
+@@ -49,7 +49,7 @@ int main(int argc, char **argv) {
+ }
+
+ EOF
+-gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
++$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
+
+ if [ $? -eq 0 ]
+ then
+@@ -81,7 +81,7 @@ int main(int argc, char **argv) {
+ }
+
+ EOF
+-gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
++$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
+
+ if [ $? -eq 0 ]
+ then
diff --git a/package/iproute2/patches/patch-ip_Makefile b/package/iproute2/patches/patch-ip_Makefile
deleted file mode 100644
index d1f2cceec..000000000
--- a/package/iproute2/patches/patch-ip_Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- iproute2-2.6.26.orig/ip/Makefile 2008-07-25 22:46:07.000000000 +0200
-+++ iproute2-2.6.26/ip/Makefile 2008-10-09 17:07:10.000000000 +0200
-@@ -1,5 +1,5 @@
- IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o \
-- rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
-+ rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
- ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o \
- ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o \
- iplink_vlan.o link_veth.o
diff --git a/package/iproute2/patches/patch-ip_iptunnel_c b/package/iproute2/patches/patch-ip_iptunnel_c
deleted file mode 100644
index c9e6098fb..000000000
--- a/package/iproute2/patches/patch-ip_iptunnel_c
+++ /dev/null
@@ -1,17 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- iproute2-2.6.26.orig/ip/iptunnel.c 2008-07-25 22:46:07.000000000 +0200
-+++ iproute2-2.6.26/ip/iptunnel.c 2008-10-09 17:08:43.000000000 +0200
-@@ -478,13 +478,6 @@ int do_iptunnel(int argc, char **argv)
- break;
- case AF_INET:
- break;
-- /*
-- * This is silly enough but we have no easy way to make it
-- * protocol-independent because of unarranged structure between
-- * IPv4 and IPv6.
-- */
-- case AF_INET6:
-- return do_ip6tunnel(argc, argv);
- default:
- fprintf(stderr, "Unsupported family:%d\n", preferred_family);
- exit(-1);
diff --git a/package/iproute2/patches/patch-misc_Makefile b/package/iproute2/patches/patch-misc_Makefile
new file mode 100644
index 000000000..95dbe51ec
--- /dev/null
+++ b/package/iproute2/patches/patch-misc_Makefile
@@ -0,0 +1,13 @@
+ disable compiling of arpd since it needs berkeley db which we dont have
+ yet
+--- iproute2-2.6.29-1.orig/misc/Makefile 2009-03-24 23:40:54.000000000 +0100
++++ iproute2-2.6.29-1/misc/Makefile 2009-08-22 02:48:24.794861772 +0200
+@@ -1,7 +1,7 @@
+ SSOBJ=ss.o ssfilter.o
+ LNSTATOBJ=lnstat.o lnstat_util.o
+
+-TARGETS=ss nstat ifstat rtacct arpd lnstat
++TARGETS=ss nstat ifstat rtacct lnstat
+
+ include ../Config
+
diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index 6a9aa81a7..e4123aa82 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= lvm
-PKG_VERSION:= 2.02.45
+PKG_VERSION:= 2.02.51
PKG_RELEASE:= 1
-PKG_MD5SUM:= 440daa01b8f2ec4fe97b1cc621108220
+PKG_MD5SUM:= 725d07794007e021bfc592b1636100c7
PKG_DESCR:= logical volume management
PKG_SECTION:= misc
PKG_DEPENDS:= device-mapper
diff --git a/package/lvm/patches/patch-Makefile_in b/package/lvm/patches/patch-Makefile_in
index e22bc814b..d0e22571f 100644
--- a/package/lvm/patches/patch-Makefile_in
+++ b/package/lvm/patches/patch-Makefile_in
@@ -1,5 +1,5 @@
---- LVM2.2.02.45.orig/Makefile.in 2008-11-18 14:16:03.000000000 +0100
-+++ LVM2.2.02.45/Makefile.in 2009-06-11 23:21:31.000000000 +0200
+--- LVM2.2.02.51.orig/Makefile.in 2009-07-31 13:49:53.000000000 +0200
++++ LVM2.2.02.51/Makefile.in 2009-08-22 15:24:06.000000000 +0200
@@ -16,7 +16,7 @@ srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -7,9 +7,9 @@
-SUBDIRS = doc include man scripts
+SUBDIRS = doc include
- ifeq ("@INTL@", "yes")
- SUBDIRS += po
-@@ -49,7 +49,7 @@ po: tools daemons
+ ifeq ("@UDEV_RULES@", "yes")
+ SUBDIRS += udev
+@@ -60,7 +60,7 @@ po: tools daemons
libdm.device-mapper: include.device-mapper
daemons.device-mapper: libdm.device-mapper
tools.device-mapper: libdm.device-mapper
diff --git a/package/lvm/patches/patch-doc_Makefile_in b/package/lvm/patches/patch-doc_Makefile_in
index 758eb54e4..381e0ceea 100644
--- a/package/lvm/patches/patch-doc_Makefile_in
+++ b/package/lvm/patches/patch-doc_Makefile_in
@@ -1,7 +1,8 @@
---- LVM2.2.02.45.orig/doc/Makefile.in 2007-09-21 12:16:43.000000000 +0200
-+++ LVM2.2.02.45/doc/Makefile.in 2009-06-11 23:17:13.000000000 +0200
+bsd compatibility
+--- LVM2.2.02.51.orig/doc/Makefile.in 2009-05-11 12:28:46.000000000 +0200
++++ LVM2.2.02.51/doc/Makefile.in 2009-08-22 15:24:06.000000000 +0200
@@ -23,7 +23,8 @@ include $(top_srcdir)/make.tmpl
- install:
+ install_lvm2:
@if [ ! -e $(confdir)/$(CONFDEST) ]; then \
echo "Installing $(CONFSRC) as $(confdir)/$(CONFDEST)"; \
- @INSTALL@ -D $(OWNER) $(GROUP) -m 644 $(CONFSRC) \
diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in
index c6d63a3fe..02d029e48 100644
--- a/package/lvm/patches/patch-libdm_Makefile_in
+++ b/package/lvm/patches/patch-libdm_Makefile_in
@@ -1,6 +1,31 @@
---- LVM2.2.02.45.orig/libdm/Makefile.in 2008-11-14 21:59:56.000000000 +0100
-+++ LVM2.2.02.45/libdm/Makefile.in 2009-06-11 23:26:48.000000000 +0200
-@@ -70,7 +70,8 @@ install: $(INSTALL_TYPE) install_include
+always install static library
+--- LVM2.2.02.51.orig/libdm/Makefile.in 2009-04-08 16:04:35.000000000 +0200
++++ LVM2.2.02.51/libdm/Makefile.in 2009-08-22 15:37:53.000000000 +0200
+@@ -34,9 +34,9 @@ SOURCES =\
+
+ INCLUDES = -I$(interface) -I.
+
+-ifeq ("@STATIC_LINK@", "yes")
++#ifeq ("@STATIC_LINK@", "yes")
+ LIB_STATIC = $(interface)/libdevmapper.a
+-endif
++#endif
+
+ ifeq ("@LIB_SUFFIX@","dylib")
+ LIB_SHARED = $(interface)/libdevmapper.dylib
+@@ -59,9 +59,9 @@ device-mapper: all
+
+ INSTALL_TYPE = install_dynamic
+
+-ifeq ("@STATIC_LINK@", "yes")
++#ifeq ("@STATIC_LINK@", "yes")
+ INSTALL_TYPE += install_static
+-endif
++#endif
+
+ ifeq ("@PKGCONFIG@", "yes")
+ INSTALL_TYPE += install_pkgconfig
+@@ -72,7 +72,8 @@ install: $(INSTALL_TYPE) install_include
install_device-mapper: install
install_include:
@@ -10,7 +35,7 @@
$(includedir)/libdevmapper.h
install_dynamic: install_@interface@
-@@ -81,15 +82,17 @@ install_static: install_@interface@_stat
+@@ -83,15 +84,17 @@ install_static: install_@interface@_stat
$(LN_S) -f libdevmapper.a.$(LIB_VERSION_DM) $(libdir)/libdevmapper.a
install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX)
diff --git a/package/lvm/patches/patch-tools_Makefile_in b/package/lvm/patches/patch-tools_Makefile_in
index ed2a2c974..5dc0235e4 100644
--- a/package/lvm/patches/patch-tools_Makefile_in
+++ b/package/lvm/patches/patch-tools_Makefile_in
@@ -1,33 +1,24 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- LVM2.2.02.45.orig/tools/Makefile.in 2009-02-17 12:07:59.000000000 +0100
-+++ LVM2.2.02.45/tools/Makefile.in 2009-06-11 23:24:12.000000000 +0200
-@@ -62,19 +62,18 @@ SOURCES =\
- vgscan.c \
- vgsplit.c
-
--TARGETS =\
-- .commands \
-- lvm
--
--INSTALL_LVM_TARGETS = install_tools_dynamic
--INSTALL_DMSETUP_TARGETS = install_dmsetup_dynamic
--INSTALL_CMDLIB_TARGETS = install_cmdlib_dynamic
-+TARGETS = .commands
-
- ifeq ("@STATIC_LINK@", "yes")
- TARGETS += lvm.static
- INSTALL_LVM_TARGETS += install_tools_static
- INSTALL_DMSETUP_TARGETS += install_dmsetup_static
- INSTALL_CMDLIB_TARGETS += install_cmdlib_static
-+else
-+ TARGETS += lvm
-+ INSTALL_LVM_TARGETS = install_tools_dynamic
-+ INSTALL_DMSETUP_TARGETS = install_dmsetup_dynamic
-+ INSTALL_CMDLIB_TARGETS = install_cmdlib_dynamic
+--- LVM2.2.02.51.orig/tools/Makefile.in 2009-05-21 13:11:29.000000000 +0200
++++ LVM2.2.02.51/tools/Makefile.in 2009-08-22 15:30:31.000000000 +0200
+@@ -160,21 +160,24 @@ cflow: lvm.cflow lvm.xref lvm.tree lvm.r
endif
- LVMLIBS = -llvm
-@@ -170,7 +169,8 @@ install_cmdlib_static: liblvm2cmd-static
+ install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.$(LIB_SUFFIX) \
++ $(INSTALL) -d $(libdir)
++ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.$(LIB_SUFFIX) \
+ $(libdir)/liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION)
+ $(LN_S) -f liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) $(libdir)/liblvm2cmd.$(LIB_SUFFIX)
+ $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
+ $(includedir)/lvm2cmd.h
+
+ install_cmdlib_static: liblvm2cmd-static.a
+- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \
++ $(INSTALL) -d $(libdir)
++ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \
+ $(libdir)/liblvm2cmd.a.$(LIB_VERSION)
+ $(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a
+ $(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
$(includedir)/lvm2cmd.h
install_tools_dynamic: lvm .commands
@@ -37,20 +28,23 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
$(sbindir)/lvm
@echo Creating symbolic links for individual commands in $(sbindir)
@( \
-@@ -181,14 +181,14 @@ install_tools_dynamic: lvm .commands
+@@ -185,14 +188,17 @@ install_tools_dynamic: lvm .commands
)
install_tools_static: lvm.static
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
++ $(INSTALL) -d $(sbindir)
+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) lvm.static \
$(staticdir)/lvm.static
install_dmsetup_dynamic: dmsetup
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
++ $(INSTALL) -d $(sbindir)
+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
install_dmsetup_static: dmsetup.static
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
++ $(INSTALL) -d $(sbindir)
+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
install_device-mapper: $(INSTALL_DMSETUP_TARGETS)
diff --git a/package/openssl/Config.in b/package/openssl/Config.in
index 172fa1355..9774ea7f6 100644
--- a/package/openssl/Config.in
+++ b/package/openssl/Config.in
@@ -33,9 +33,3 @@ config ADK_PACKAGE_OPENSSL_UTIL
http://www.openssl.org/
This package contains the multi-purpose OpenSSL binary tool.
-
-config ADK_PACKAGE_CA_CERTS
- prompt "ca-certificates................... X.509 Root CA Certs of common CAs"
- tristate
- default n
- depends on ADK_COMPILE_OPENSSL
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index d17dd6163..47ab4ac56 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -72,7 +72,5 @@ post-install:
${INSTALL_DIR} ${IDIR_OPENSSL_UTIL}/etc/ssl/{,certs,private}
${CP} ${WRKSRC}/apps/openssl.cnf ${IDIR_OPENSSL_UTIL}/etc/ssl/
chmod 0700 ${IDIR_OPENSSL_UTIL}/etc/ssl/private
- ${INSTALL_DIR} ${IDIR_CA_CERTS}/etc/ssl
- ${INSTALL_DATA} cert.pem ${IDIR_CA_CERTS}/etc/ssl/
include ${TOPDIR}/mk/pkg-bottom.mk