From 0417faa1797e2cbe1793386bfc159391f919357d Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Sat, 21 Jan 2012 11:40:36 -0500
Subject: Adjust oh-buildopk and opkbuild for oh-gencontrol.

---
(limited to 'src')

diff --git a/src/oh-buildopk b/src/oh-buildopk
index d743824..bcea2c0 100644
--- a/src/oh-buildopk
+++ b/src/oh-buildopk
@@ -39,13 +39,7 @@ while [ ${#} -gt 0 ]; do
 	tar -czf ../data.tar.gz .
 	cd ..
 	# Pack control.tar.gz.
-	mkdir control
-	cp ../${1}.pkg/control control
-	[ -f ../${1}.pkg/preinst ] && cp ../${1}.pkg/preinst control
-	[ -f ../${1}.pkg/postinst ] && cp ../${1}.pkg/postinst control
-	[ -f ../${1}.pkg/prerm ] && cp ../${1}.pkg/prerm control
-	[ -f ../${1}.pkg/postrm ] && cp ../${1}.pkg/postrm control
-	cd control
+	cd ${1}.control
 	tar -czf ../control.tar.gz .
 	cd ..
 	# Pack opk file.
diff --git a/src/opkbuild b/src/opkbuild
index 6bb702a..5d73092 100644
--- a/src/opkbuild
+++ b/src/opkbuild
@@ -46,7 +46,7 @@ for file in ../*; do
 			;;
 	esac
 done
-# TODO: Generate control file.
+oh-gencontrol -s
 oh-buildopk ${pkgname}-src
 rm -Rf dest
 
--
cgit v0.9.1