From d9730197219dda09ba7a0d5321c399e0d11d23e7 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 1 Dec 2010 22:42:20 +0100
Subject: fix ipkg and ipkg tools, consolidate mdev.conf

cpio under macosx or bsd creates tar archives via
stdin while using find . with leading ./.
heirloom cpio shipped with OpenADK does remove the
leading ./. Adopt ipkg busybox applet to work
without ./. Fix ipkg-build to be faster and to use
included cpio for inner tar creation.

Dependency to GNU tar can now be dropped.
---
 package/base-files/Makefile          | 10 ++--------
 package/base-files/src/etc/mdev.conf | 15 +++++++++++----
 2 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'package/base-files')

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 14a884bcf..dd500b592 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:=		34
+PKG_RELEASE:=		35
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 
@@ -43,18 +43,12 @@ endif
 ifneq (${ADK_PACKAGE_ZSH},)
 	echo /bin/zsh >>${IDIR_BASE_FILES}/etc/shells
 endif
-	mkdir -p $(IDIR_BASE_FILES)/dev
-	mkdir -p $(IDIR_BASE_FILES)/boot
-	mkdir -p $(IDIR_BASE_FILES)/root
-	mkdir -p $(IDIR_BASE_FILES)/sys
+	mkdir -p $(IDIR_BASE_FILES)/{dev,boot,root,sys,proc,tmp,mnt}
 	mkdir -p $(IDIR_BASE_FILES)/etc/crontabs
 	mkdir -p $(IDIR_BASE_FILES)/etc/network/if-pre-up.d
 	mkdir -p $(IDIR_BASE_FILES)/etc/network/if-up.d
 	mkdir -p $(IDIR_BASE_FILES)/etc/network/if-down.d
 	mkdir -p $(IDIR_BASE_FILES)/etc/network/if-post-down.d
-	mkdir -p $(IDIR_BASE_FILES)/mnt
-	mkdir -p $(IDIR_BASE_FILES)/proc
-	mkdir -p $(IDIR_BASE_FILES)/tmp
 	mkdir -p $(IDIR_BASE_FILES)/usr/lib
 	mkdir -p $(IDIR_BASE_FILES)/usr/bin
 	chmod 755 $(IDIR_BASE_FILES)/lib/mdev/init
diff --git a/package/base-files/src/etc/mdev.conf b/package/base-files/src/etc/mdev.conf
index 99c910d0b..69d9c0079 100644
--- a/package/base-files/src/etc/mdev.conf
+++ b/package/base-files/src/etc/mdev.conf
@@ -1,11 +1,18 @@
+rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc
+device-mapper 0:0 660 @mkdir /dev/mapper
 tun 0:0 660 >net/tun
 null 0:0 777
 zero 0:0 666
+u?random 0:0 644
 console 0:0 0600
-kmem 0:0 000
-mem 0:0 0640
-port 0:0 0640
 ptmx 0:0 666
-tty 0:0 0666
+tty 0:0 666
 ttyS* 0:0 640
+audio root:audio 660 >snd/audio
+dsp root:audio 660 >snd/dsp
+timer root:audio 660 >snd/timer
+controlC0 root:audio 660 >snd/controlC0
+pcmC0D0c root:audio 660 >snd/pcmC0D0c
+pcmC0D0p root:audio 660 >snd/pcmC0D0p
+msr0 root:root 660 @(mkdir -p /dev/cpu/0 && ln -sf /dev/msr0 /dev/cpu/0/msr)
 .* 0:0 644 @/lib/mdev/init
-- 
cgit v1.2.3