Merge branch 'master' of git+ssh://openadk.org/git/openadk

6 files changed, 105 insertions, 8 deletions

diff --git a/package/base-files/src/etc/mdev.conf b/package/base-files/src/etc/mdev.conf
index 173a851f3..4cc06251a 100644
--- a/package/base-files/src/etc/mdev.conf
+++ b/package/base-files/src/etc/mdev.conf
@@ -9,7 +9,7 @@ ttyS* 0:0 640
 rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc
 device-mapper 0:0 660 @test -d /dev/mapper || mkdir /dev/mapper
 tun 0:0 660 >net/tun
-fb? root:video 660
+fb0 root:video 660
 audio root:audio 660 >snd/audio
 dsp root:audio 660 >snd/dsp
 timer root:audio 660 >snd/timer
diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in
index cbdcca9ce..56a816b02 100644
--- a/package/busybox/config/miscutils/Config.in
+++ b/package/busybox/config/miscutils/Config.in
@@ -472,7 +472,7 @@ config BUSYBOX_FEATURE_LESS_LINENUMS
 config BUSYBOX_HDPARM
 	bool "hdparm"
 	depends on !ADK_PACKAGE_HDPARM
-	default y
+	default n
 	depends on BUSYBOX_PLATFORM_LINUX
 	help
 	  Get/Set hard drive parameters. Primarily intended for ATA
diff --git a/package/grep/Makefile b/package/grep/Makefile
index 5c14aa091..79a2328d2 100644
--- a/package/grep/Makefile
+++ b/package/grep/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		grep
 PKG_VERSION:=		2.7
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		e848f07e3e79aa7899345d17c7e4115e
 PKG_DESCR:=		global search for a regular expression and print out matched lines
 PKG_SECTION:=		utils
@@ -24,6 +24,6 @@ CONFIGURE_ARGS+=	--without-included-regex
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_GREP)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/{e,f,}grep $(IDIR_GREP)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/{e,f,}grep $(IDIR_GREP)/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/keyutils/Makefile b/package/keyutils/Makefile
new file mode 100644
index 000000000..d824afcf0
--- /dev/null
+++ b/package/keyutils/Makefile
@@ -0,0 +1,29 @@
+# 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:=		keyutils
+PKG_VERSION:=		1.5.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		4c89b350eab1c361af8cb5343961056a
+PKG_DESCR:=		set of utilities for managing the key retention facility in the kernel
+PKG_SECTION:=		libs
+PKG_SITES:=		http://people.redhat.com/dhowells/keyutils/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,KEYUTILS,keyutils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+INSTALL_TARGET:=	libinstall
+#INSTALL_STYLE:=		manual
+
+keyutils-install:
+	$(INSTALL_DIR) $(IDIR_KEYUTILS)/usr/lib
+	$(CP) $(WRKBUILD)/libkeyutils.so* \
+		$(IDIR_KEYUTILS)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/keyutils/patches/patch-Makefile b/package/keyutils/patches/patch-Makefile
new file mode 100644
index 000000000..c541f727c
--- /dev/null
+++ b/package/keyutils/patches/patch-Makefile
@@ -0,0 +1,67 @@
+--- keyutils-1.5.3.orig/Makefile	2011-08-11 15:24:09.000000000 +0200
++++ keyutils-1.5.3/Makefile	2011-09-19 21:52:31.000000000 +0200
+@@ -1,5 +1,5 @@
+ CPPFLAGS	:= -I.
+-CFLAGS		:= $(CPPFLAGS) -g -Wall -Werror
++CFLAGS		?= $(CPPFLAGS) -g -Wall -Werror
+ INSTALL		:= install
+ DESTDIR		:=
+ SPECFILE	:= keyutils.spec
+@@ -49,7 +49,7 @@ LIBNAME		:= libkeyutils.so.$(APIVERSION)
+ # Guess at the appropriate lib directory and word size
+ #
+ ###############################################################################
+-LIBDIR		:= $(shell ldd /usr/bin/make | grep '\(/libc\)' | sed -e 's!.*\(/.*\)/libc[.].*!\1!')
++LIBDIR		:= /usr/lib
+ USRLIBDIR	:= $(patsubst /lib/%,/usr/lib/%,$(LIBDIR))
+ BUILDFOR	:= $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit
+ 
+@@ -84,7 +84,7 @@ endif
+ # Normal build rule
+ #
+ ###############################################################################
+-all: $(DEVELLIB) keyctl request-key key.dns_resolver
++all: $(DEVELLIB)
+ 
+ ###############################################################################
+ #
+@@ -125,13 +125,13 @@ keyutils.os: keyutils.c keyutils.h Makef
+ %.o: %.c keyutils.h Makefile
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
+ 
+-keyctl: keyctl.o -lkeyutils
++keyctl: keyctl.o
+ 	$(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils
+ 
+-request-key: request-key.o -lkeyutils
++request-key: request-key.o
+ 	$(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils
+ 
+-key.dns_resolver: key.dns_resolver.o -lkeyutils
++key.dns_resolver: key.dns_resolver.o
+ 	$(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils -lresolv
+ 
+ ###############################################################################
+@@ -139,6 +139,13 @@ key.dns_resolver: key.dns_resolver.o -lk
+ # Install everything
+ #
+ ###############################################################################
++libinstall:
++	$(INSTALL) -d $(DESTDIR)$(LIBDIR)
++	$(INSTALL) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
++	$(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
++	$(INSTALL) -d $(DESTDIR)$(INCLUDEDIR)
++	$(INSTALL) -m 0644 keyutils.h $(DESTDIR)$(INCLUDEDIR)/keyutils.h
++
+ install: all
+ ifeq ($(NO_ARLIB),0)
+ 	$(INSTALL) -D -m 0644 $(ARLIB) $(DESTDIR)$(USRLIBDIR)/$(ARLIB)
+@@ -205,7 +212,7 @@ distclean: clean
+ TARBALL	:= keyutils-$(VERSION).tar.bz2
+ SRCBALL	:= rpmbuild/SOURCES/$(TARBALL)
+ 
+-dist	:= $(word 2,$(shell grep "%dist" /etc/rpm/macros.dist))
++dist	:= OpenADK
+ release	:= $(word 2,$(shell grep ^Release: $(SPECFILE)))
+ release	:= $(subst %{?dist},$(dist),$(release))
+ rpmver	:= $(VERSION)-$(release)
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index e277874c6..4aa720004 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -4,12 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		nfs-utils
-PKG_VERSION:=		1.2.3
-PKG_RELEASE:=		6
-PKG_MD5SUM:=		1131dc5f27c4f3905a6e7ee0d594fd4d
+PKG_VERSION:=		1.2.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		938dc0574f3eb9891a8ed4746f806277
 PKG_DESCR:=		Utilities for NFS kernel server implementation
 PKG_SECTION:=		net/fs
-PKG_DEPENDS:=		kmod-nfsd
+PKG_DEPENDS:=		kmod-nfsd keyutils
+PKG_BUILDDEP:=		keyutils
 PKG_URL:=		http://sourceforge.net/projects/nfs
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=nfs/}