Commit 8df87306 authored by Bernhard Landauer's avatar Bernhard Landauer

add

parents
*.tar.gz
manjaro-tools/*
src/*
pkg/*
*.log
# Maintainer: Philip Müller <philm@manjaro.org>
# Maintainer: Bernhard Landauer <oberon@manjaro.org>
_pkgbase=manjaro-tools
_ver=0.15.6
_branch=stable-0.15.x
pkgbase=manjaro-tools-git
pkgname=('manjaro-tools-base-git'
'manjaro-tools-pkg-git'
'manjaro-tools-iso-git'
'manjaro-tools-yaml-git')
pkgver=r2674.3e80462
pkgrel=1
arch=('x86_64' 'i686')
pkgdesc='Development tools for Manjaro Linux'
license=('GPL')
groups=('manjaro-tools')
url='https://gitlab.manjaro.org/tools/development-tools/manjaro-tools'
makedepends=('git' 'docbook2x')
source=("manjaro-tools::git+$url.git#branch=$_branch")
sha256sums=('SKIP')
prepare() {
cd ${srcdir}/${_pkgbase}
# patches here
sed -e "s/^Version=.*/Version=$_ver/" -i Makefile
#sed -e "s/^Version=.*/Version=$pkgver/" -i Makefile
if [ "${CARCH}" = "i686" ]; then
patch -p2 -i ${srcdir}/manjaro-32.patch
fi
}
pkgver() {
cd ${srcdir}/${_pkgbase}
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
build() {
cd ${srcdir}/${_pkgbase}
make SYSCONFDIR=/etc PREFIX=/usr
}
package_manjaro-tools-base-git() {
pkgdesc='Development tools for Manjaro Linux (base tools)'
provides=("manjaro-tools-base=$_ver")
depends=('openssh' 'rsync' 'haveged' 'os-prober' 'gnupg' 'pacman-mirrorlist>=20160301')
optdepends=('manjaro-tools-pkg: Manjaro Linux package tools'
'manjaro-tools-iso: Manjaro Linux iso tools'
'manjaro-tools-yaml: Manjaro Linux yaml tools')
conflicts=('manjaro-tools-base')
backup=('etc/manjaro-tools/manjaro-tools.conf')
cd ${srcdir}/${_pkgbase}
make SYSCONFDIR=/etc PREFIX=/usr DESTDIR=${pkgdir} install_base
}
package_manjaro-tools-pkg-git() {
pkgdesc='Development tools for Manjaro Linux (packaging tools)'
provides=("manjaro-tools-pkg=$_ver")
depends=('namcap' 'manjaro-tools-base-git')
conflicts=('manjaro-tools-pkg' 'devtools')
cd ${srcdir}/${_pkgbase}
make SYSCONFDIR=/etc PREFIX=/usr DESTDIR=${pkgdir} install_pkg
}
package_manjaro-tools-yaml-git() {
pkgdesc='Development tools for Manjaro Linux (yaml tools)'
provides=("manjaro-tools-yaml=$_ver")
conflicts=('manjaro-tools-yaml')
depends=('manjaro-tools-base-git' 'calamares-tools' 'ruby-kwalify' 'manjaro-iso-profiles-base')
cd ${srcdir}/${_pkgbase}
make SYSCONFDIR=/etc PREFIX=/usr DESTDIR=${pkgdir} install_yaml
}
package_manjaro-tools-iso-git() {
pkgdesc='Development tools for Manjaro Linux (ISO tools)'
provides=("manjaro-tools-iso=$_ver")
depends=('dosfstools' 'libisoburn' 'squashfs-tools' 'manjaro-tools-yaml-git'
'mkinitcpio' 'mktorrent' 'grub')
conflicts=('manjaro-tools-iso')
optdepends=('qemu: quickly test isos')
cd ${srcdir}/${_pkgbase}
make SYSCONFDIR=/etc PREFIX=/usr DESTDIR=${pkgdir} install_iso
}
--- a/manjaro-tools/lib/util.sh 2017-11-01 14:15:59.293276152 -0400
+++ b/manjaro-tools/lib/util.sh 2017-12-31 12:45:22.599475136 -0500
@@ -66,7 +66,7 @@ get_pac_mirrors_conf(){
local conf="$tmp_dir/pacman-mirrors-$1.conf"
cp "${DATADIR}/pacman-mirrors.conf" "$conf"
sed -i "$conf" \
- -e "s|Branch = stable|Branch = $1|"
+ -e "s|Branch = x32-stable|Branch = $1|"
echo "$conf"
}
@@ -201,7 +201,7 @@ set_branch(){
}
init_common(){
- [[ -z ${target_branch} ]] && target_branch='stable'
+ [[ -z ${target_branch} ]] && target_branch='x32-stable'
[[ -z ${target_arch} ]] && target_arch=$(uname -m)
@@ -749,7 +749,7 @@ is_valid_arch_iso(){
is_valid_branch(){
case $1 in
- 'stable'|'testing'|'unstable') return 0 ;;
+ 'x32-stable'|'x32-testing'|'x32-unstable') return 0 ;;
*) return 1 ;;
esac
}
--- a/manjaro-tools/lib/util-iso.sh 2017-11-01 14:15:59.269942128 -0400
+++ b/manjaro-tools/lib/util-iso.sh 2017-12-31 12:58:11.425522151 -0500
@@ -221,7 +221,7 @@ gen_iso_fn(){
fi
[[ ${initsys} == 'openrc' ]] && vars+=("${initsys}")
vars+=("${dist_release}")
- vars+=("${target_branch}")
+ vars+=("${target_branch/x32-/}")
vars+=("${target_arch}")
for n in ${vars[@]};do
name=${name:-}${name:+-}${n}
diff --git a/manjaro-tools/data/pacman-mirrors.conf b/manjaro-tools/data/pacman-mirrors.conf
index 7141548..e33e526 100644
--- a/manjaro-tools/data/pacman-mirrors.conf
+++ b/manjaro-tools/data/pacman-mirrors.conf
@@ -2,8 +2,8 @@
## /etc/pacman-mirrors.conf
##
-## Branch Pacman should use (stable, testing, unstable)
-Branch = stable
+## Branch Pacman should use (x32-stable, x32-testing, x32-unstable)
+Branch = x32-stable
## Generation method
## 1) rank - rank mirrors depending on their access time
diff --git a/manjaro-tools/data/manjaro-tools.conf b/manjaro-tools/data/manjaro-tools.conf
index 52f5866..05b20d1 100644
--- a/manjaro-tools/data/manjaro-tools.conf
+++ b/manjaro-tools/data/manjaro-tools.conf
@@ -3,7 +3,7 @@
######################################################
# default target branch
-# target_branch=stable
+# target_branch=x32-stable
# default taget arch: auto detect
# target_arch=$(uname -m)
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