From 5c2dd97a91421e6e5f7e920579fcb88bb71e7fa7 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sun, 13 Jan 2013 18:41:31 -0500
Subject: use /usr/share/devtools/makechrootpkg.sh instead of *.gpl2

---
 src/chroot-tools/libremakepkg | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

(limited to 'src/chroot-tools/libremakepkg')

diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg
index 2901b0d..a9e1fb7 100755
--- a/src/chroot-tools/libremakepkg
+++ b/src/chroot-tools/libremakepkg
@@ -24,31 +24,12 @@
 load_conf_libretools_chroot
 
 . "$(which libremessages)"
+. /usr/share/devtools/makechrootpkg.sh
 
 shopt -s nullglob
 
-# This file (libremakepkg) is GPLv3+, but I would like to use some code
-# modified from devtools' "makechrootpkg", which is GPLv2.
-. "$(dirname "$0")/libremakepkg.gpl2"
-# This gives us the functions:
-#  - chroot_init
-#  - chroot_exec
-#  - chroot_copy_in
-#  - chroot_copy_out
-#  - add_to_local_repo
-
 # Boring functions #############################################################
 
-##
-# copy logs if they exist
-##
-copy_logs() {
-	for l in "$copydir"/build/*.log; do
-		chown "$LIBREUSER" "$l"
-		mv "$l" .
-	done
-}
-
 ##
 # End inmediately but print a useful message
 ##
-- 
cgit v1.2.2