Verified Commit 83323daa authored by Dan Johansen's avatar Dan Johansen
Browse files

Rename branches to arm- throughout tools

parent 48f76586
......@@ -58,10 +58,10 @@ Options inside `[` `]` are optional. Use `-h` to see what the defaults are.
sudo buildarmpkg -p package [-a architecture] [-k] [-i package file] [-b branch]
```
To build an aarch64 package against unstable branch use the following command:
To build an aarch64 package against arm-unstable branch use the following command:
```
sudo buildarmpkg -p package -a aarch64 -b unstable
sudo buildarmpkg -p package -a aarch64 -b arm-unstable
```
You can also build `any` packages, which will use the aarch64 architecture to build from.
......@@ -113,10 +113,10 @@ Profiles that gets used are from this [Gitlab](https://gitlab.manjaro.org/manjar
sudo buildarmimg [-d device] [-e edition] [-v version] [-n] [-x] [-i package-file.pkg.tar.xz] [-b branch]
```
To build a minimal image version 18.07 for the raspberry pi 3 on unstable branch:
To build a minimal image version 18.07 for the raspberry pi 3 on arm-unstable branch:
```
sudo buildarmimg -d rpi3 -e minimal -v 18.07 -b unstable
sudo buildarmimg -d rpi3 -e minimal -v 18.07 -b arm-unstable
```
To build a minimal version 18.08 RC1 for the odroid-c2 with a new rootfs downloaded:
......
......@@ -70,8 +70,8 @@ if [ ! -d "$PROFILES/arm-profiles" ]; then
fi
#Make sure only a known branch is used
if [[ "$BRANCH" != "stable" && "$BRANCH" != "testing" && "$BRANCH" != "unstable" ]]; then
msg "Unknown branch. Please use either, stable, testing or unstable!"
if [[ "$BRANCH" != "arm-stable" && "$BRANCH" != "arm-testing" && "$BRANCH" != "arm-unstable" ]]; then
msg "Unknown branch. Please use either, arm-stable, arm-testing or arm-unstable!"
exit 1
fi
......
......@@ -60,8 +60,8 @@ if [ $ARCH == "any" ]; then
fi
#Make sure only a known branch is used
if [[ "$BRANCH" != "stable" && "$BRANCH" != "testing" && "$BRANCH" != "unstable" ]]; then
msg "Unknown branch. Please use either, stable, testing or unstable!"
if [[ "$BRANCH" != "arm-stable" && "$BRANCH" != "arm-testing" && "$BRANCH" != "arm-unstable" ]]; then
msg "Unknown branch. Please use either, arm-stable, arm-testing or arm-unstable!"
exit 1
fi
# start the timer
......
#! /bin/bash
#variables
BRANCH='stable'
BRANCH='arm-stable'
LIBDIR=/usr/share/manjaro-arm-tools/lib
BUILDDIR=/var/lib/manjaro-arm-tools/pkg
PACKAGER=$(cat /etc/makepkg.conf | grep PACKAGER)
......@@ -44,7 +44,7 @@ usage_build_pkg() {
echo " -a <arch> Architecture. [Default = aarch64. Options = any or aarch64]"
echo " -p <pkg> Package to build"
echo " -k Keep the previous rootfs for this build"
echo " -b <branch> Set the branch used for the build. [Default = stable. Options = stable, testing or unstable]"
echo " -b <branch> Set the branch used for the build. [Default = arm-stable. Options = arm-stable, arm-testing or arm-unstable]"
echo " -i <package> Install local package into rootfs."
echo ' -h This help'
echo ''
......@@ -58,7 +58,7 @@ usage_build_img() {
echo " -e <edition> Edition of the image. [Default = minimal. Options = $(ls -m --width=0 "$PROFILES/arm-profiles/editions/")]"
echo " -v <version> Define the version the resulting image should be named. [Default is current YY.MM]"
echo " -i <package> Install local package into image rootfs."
echo " -b <branch> Set the branch used in the image. [Default = stable. Options = stable, testing or unstable]"
echo " -b <branch> Set the branch used in the image. [Default = arm-stable. Options = arm-stable, arm-testing or arm-unstable]"
echo " -n Force download of new rootfs."
echo " -x Don't compress the image."
echo ' -h This help'
......@@ -159,7 +159,7 @@ create_rootfs_pkg() {
mkdir -p $BUILDDIR/$ARCH
# basescrap the rootfs filesystem
basestrap -G -C $LIBDIR/pacman.conf.$ARCH $BUILDDIR/$ARCH base-devel
sed -i s/"# Branch = stable"/"Branch = $BRANCH"/g $BUILDDIR/$ARCH/etc/pacman-mirrors.conf
sed -i s/"# Branch = arm-stable"/"Branch = $BRANCH"/g $BUILDDIR/$ARCH/etc/pacman-mirrors.conf
# Enable cross architecture Chrooting
cp /usr/bin/qemu-aarch64-static $BUILDDIR/$ARCH/usr/bin/
......@@ -219,7 +219,7 @@ create_rootfs_img() {
$NSPAWN $ROOTFS_IMG/rootfs_$ARCH pacman-key --populate archlinux archlinuxarm manjaro manjaro-arm 1> /dev/null 2>&1
info "Setting branch to $BRANCH..."
sed -i s/"# Branch = stable"/"Branch = $BRANCH"/g $ROOTFS_IMG/rootfs_$ARCH/etc/pacman-mirrors.conf
sed -i s/"# Branch = arm-stable"/"Branch = $BRANCH"/g $ROOTFS_IMG/rootfs_$ARCH/etc/pacman-mirrors.conf
$NSPAWN $ROOTFS_IMG/rootfs_$ARCH pacman-mirrors -f10
msg "Installing packages for $EDITION edition on $DEVICE..."
......
......@@ -68,15 +68,15 @@ LocalFileSigLevel = Optional
[core]
#Include = /etc/pacman.d/mirrorlist
Server = https://manjaro.moson.eu/stable/$repo/$arch
Server = https://manjaro.moson.eu/arm-stable/$repo/$arch
[extra]
#Include = /etc/pacman.d/mirrorlist
Server = https://manjaro.moson.eu/stable/$repo/$arch
Server = https://manjaro.moson.eu/arm-stable/$repo/$arch
[community]
#Include = /etc/pacman.d/mirrorlist
Server = https://manjaro.moson.eu/stable/$repo/$arch
Server = https://manjaro.moson.eu/arm-stable/$repo/$arch
# An example of a custom package repository. See the pacman manpage for
# tips on creating your own repositories.
......
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