Commit d5ca21fc authored by Luca Giambonini's avatar Luca Giambonini

makepkg patch to include chakra changes

parent d8fa5efa
--- /usr/bin/makepkg
+++ makepkg-chakra
@@ -2,6 +2,12 @@
#
# makepkg - make packages compatible for use with pacman
# Generated from makepkg.sh.in; do not edit by hand.
+# Modified by the Chakra Linux team
+#
+# Copyright (c) 2012-2017 by Samir Benmendil <ram-z@chakralinux.org>
+# Copyright (c) 2011 by Manuel Tortosa
+# Copyright (c) 2010 by Phil Miller
+# Copyright (c) 2006-2010 by Jan Mette
#
# Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>
# Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
@@ -41,8 +47,8 @@ unset CDPATH
# Ensure GREP_OPTIONS doesn't screw with our grep calls
unset GREP_OPTIONS
-declare -r makepkg_version='5.0.2'
-declare -r confdir='/etc'
+declare -r makepkg_version='5.0.2-chakra'
+declare -r confdir="$HOME"
declare -r BUILDSCRIPT='PKGBUILD'
declare -r startdir="$PWD"
@@ -51,7 +57,7 @@ LIBRARY=${LIBRARY:-'/usr/share/makepkg'}
build_options=('ccache' 'distcc' 'buildflags' 'makeflags')
splitpkg_overrides=('pkgdesc' 'arch' 'url' 'license' 'groups' 'depends'
'optdepends' 'provides' 'conflicts' 'replaces' 'backup'
- 'options' 'install' 'changelog')
+ 'options' 'install' 'changelog' 'hooks' 'screenshot' 'categories')
readonly -a build_options splitpkg_overrides
known_hash_algos=('md5' 'sha1' 'sha224' 'sha256' 'sha384' 'sha512' 'whirlpool')
@@ -1147,10 +1153,13 @@ write_pkginfo() {
printf "pkgdesc = %s\n" "$spd"
printf "url = %s\n" "$url"
+ printf "screenshot = %s\n" "$screenshot"
printf "builddate = %s\n" "$builddate"
printf "packager = %s\n" "$packager"
printf "size = %s\n" "$size"
printf "arch = %s\n" "$pkgarch"
+ printf "gitrepo = %s\n" "$(basename $(git rev-parse --show-toplevel))"
+ printf "gitfolder = %s\n" "$(basename $(dirname $(realpath "$BUILDFILE")))"
mapfile -t provides < <(find_libprovides)
mapfile -t depends < <(find_libdepends)
@@ -1163,8 +1172,10 @@ write_pkginfo() {
[[ $backup ]] && printf "backup = %s\n" "${backup[@]}"
[[ $depends ]] && printf "depend = %s\n" "${depends[@]}"
[[ $optdepends ]] && printf "optdepend = %s\n" "${optdepends[@]//+([[:space:]])/ }"
+ [[ $categories ]] && printf "categories = %s\n" "${categories[@]}"
[[ $makedepends ]] && printf "makedepend = %s\n" "${makedepends[@]}"
[[ $checkdepends ]] && printf "checkdepend = %s\n" "${checkdepends[@]}"
+ [[ $hooks ]] && printf "hooks = %s\n" "${hooks[@]}"
}
write_buildinfo() {
@@ -1272,6 +1283,8 @@ create_package() {
rm -f "${pkg_file/$PKGDEST/$startdir}.sig"
ln -s "$pkg_file.sig" "${pkg_file/$PKGDEST/$startdir}.sig"
fi
+ msg2 "Updating local repository"
+ repo-add "$PKGDEST/local-$CHROOT.db.tar" "$pkg_file" > /dev/null
fi
if (( ret )); then
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment