From 8568521d18473853fc0b6461a78a0990ac85d6b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Sat, 7 Sep 2013 12:36:18 +0000 Subject: [PATCH] It appears that "pkg create" works correctly, even though it complains loudly about unresolved library dependencies. git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/trunk@734 185d5e19-27fe-0310-9dcf-9bff6b9f3609 --- mkpkgng.in | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/mkpkgng.in b/mkpkgng.in index 6fe5069..6b18c3f 100644 --- a/mkpkgng.in +++ b/mkpkgng.in @@ -154,18 +154,13 @@ info "Generating the file list." done )>>"$manifest" -# As of pkg 1.1.4, the shlib detection logic in "pkg create" only -# works when tmproot == "/", so instead of creating a package directly -# from the contents of $tmproot, we have to install to / and package -# that. -info "Packaging." -if [ "$pkgver" \< "1.1.5" ] ; then - info "pkg 1.1.4 or older detected." - yesno "We must now install to /. Proceed?" || error "Chicken." - $make install - pkg create -m "$tmproot" -o "$builddir" -else - pkg create -r "$tmproot" -m "$tmproot" -o "$builddir" -fi +# +# Create the package +# +info "Creating the package." +pkg create -r "$tmproot" -m "$tmproot" -o "$builddir" -echo "Package created for $package-$version." +# +# Done +# +info "Package created for $package-$version."