From 3322feeae7d9bd6fc5b79f0d8a5ebb96e339009e Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Sat, 21 Jan 2012 13:49:22 -0500 Subject: Rename data directories in work area. Also, fix an 'rm' command in opkbuild. --- (limited to 'src/opkbuild') diff --git a/src/opkbuild b/src/opkbuild index 2c7e974..ec15c85 100644 --- a/src/opkbuild +++ b/src/opkbuild @@ -49,19 +49,19 @@ version=$(oh_get_field Version) # Build *-src package. printf 'opkbuild: Installing files for package "%s"...\n' "${srcpkg}-src" -mkdir -p ${srcpkg}-src/usr/src/${srcpkg}_${version} +mkdir -p ${srcpkg}-src.data/usr/src/${srcpkg}_${version} for file in ../*; do case ${file} in ../tmp) ;; ../*) - cp -R ${file} ${srcpkg}-src/usr/src/${srcpkg}_${version} + cp -R ${file} ${srcpkg}-src.data/usr/src/${srcpkg}_${version} ;; esac done oh-gencontrol -s oh-buildopk ${srcpkg}-src -rm -Rf dest +rm -Rf ${srcpkg}-src.data printf 'opkbuild: Package "%s" complete!\n\n' "${srcpkg}-src" # Build other binary packages. -- cgit v0.9.1