From ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 30 May 2009 20:39:07 +0200
Subject: optimize ipkg package management

- generate ipkg control file from PKG_* variables
- automatically install init scripts from ./files/*.init
  set #PKG pkgname to set the binary package
- rename FWINIT -> INIT
- move postinst and conffiles meta data to ./files
- update the packages to the latest upstream version
- remove some unready or unused package (strongswan,..)

more cleanups needed after allmodconfig
---
 package/alsa-utils/Makefile                  | 12 +++++++-----
 package/alsa-utils/files/alsa-utils.postinst |  4 ++++
 package/alsa-utils/files/amixer.init         |  3 ++-
 package/alsa-utils/ipkg/alsa-utils.control   |  4 ----
 package/alsa-utils/ipkg/alsa-utils.postinst  |  4 ----
 5 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 package/alsa-utils/files/alsa-utils.postinst
 delete mode 100644 package/alsa-utils/ipkg/alsa-utils.control
 delete mode 100644 package/alsa-utils/ipkg/alsa-utils.postinst

(limited to 'package/alsa-utils')

diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 94719705f..5434bc399 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -9,13 +9,17 @@ PKG_NAME:=		alsa-utils
 PKG_VERSION:=		1.0.19
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		5ff0379c707c1a29083233edc9ab4e06
-MASTER_SITES:=		ftp://ftp.task.gda.pl/pub/linux/misc/alsa/utils/ \
+PKG_DESCR:=		ALSA mixer utility
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.alsa-project.org
+PKG_SITES:=		ftp://ftp.task.gda.pl/pub/linux/misc/alsa/utils/ \
 			ftp://ftp.alsa-project.org/pub/utils/
+
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,ALSA_UTILS,alsa-utils,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,ALSA_UTILS,alsa-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-alsamixer
@@ -23,9 +27,7 @@ BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_ALSA_UTILS}/etc/init.d
-	${INSTALL_BIN} ./files/amixer.init ${IDIR_ALSA_UTILS}/etc/init.d/amixer
-	${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin
+	${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin 
 	${CP} ${WRKINST}/usr/bin/amixer ${IDIR_ALSA_UTILS}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/alsa-utils/files/alsa-utils.postinst b/package/alsa-utils/files/alsa-utils.postinst
new file mode 100644
index 000000000..f18dbf62a
--- /dev/null
+++ b/package/alsa-utils/files/alsa-utils.postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf amixer
+
diff --git a/package/alsa-utils/files/amixer.init b/package/alsa-utils/files/amixer.init
index 5d5aa6e2b..d7f388892 100644
--- a/package/alsa-utils/files/amixer.init
+++ b/package/alsa-utils/files/amixer.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 60
+#PKG alsa-utils
+#INIT 60
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/alsa-utils/ipkg/alsa-utils.control b/package/alsa-utils/ipkg/alsa-utils.control
deleted file mode 100644
index 88e38c96c..000000000
--- a/package/alsa-utils/ipkg/alsa-utils.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: alsa-utils
-Priority: optional
-Section: libs
-Description: ALSA utilities
diff --git a/package/alsa-utils/ipkg/alsa-utils.postinst b/package/alsa-utils/ipkg/alsa-utils.postinst
deleted file mode 100644
index f18dbf62a..000000000
--- a/package/alsa-utils/ipkg/alsa-utils.postinst
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf amixer
-
-- 
cgit v1.2.3