Compare commits

..

4 Commits
0.19.5 ... 0.20

Author SHA1 Message Date
ceb83ff765 buildtree: fix replace invalid char 2020-08-25 21:26:01 +02:00
8b3f5899d3 disable arch extra 2020-07-31 00:24:08 +02:00
c1956b0139 start 0.20 2020-07-26 14:41:54 +02:00
4206fdeff1 buildiso: cp amd fw 2020-07-26 14:41:19 +02:00
11 changed files with 46 additions and 43 deletions

View File

@@ -1,4 +1,4 @@
VERSION=0.19 VERSION=0.20
CHROOT_VERSION=0.10 CHROOT_VERSION=0.10

View File

@@ -105,8 +105,8 @@ Include = /etc/pacman.d/mirrorlist
#[testing] #[testing]
#Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch
[extra] #[extra]
Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch
#[community-testing] #[community-testing]
#Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch

View File

@@ -114,17 +114,17 @@ Include = /etc/pacman.d/mirrorlist
# ARCHLINUX # ARCHLINUX
# #
[gnome-unstable] #[gnome-unstable]
Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch
[staging] #[staging]
Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch
[testing] #[testing]
Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch
[extra] #[extra]
Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch
[community-staging] [community-staging]
Include = /etc/pacman.d/mirrorlist-arch Include = /etc/pacman.d/mirrorlist-arch

View File

@@ -111,14 +111,14 @@ Include = /etc/pacman.d/mirrorlist
# ARCHLINUX # ARCHLINUX
# #
[staging] #[staging]
Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch
[testing] #[testing]
Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch
[extra] #[extra]
Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch
[community-staging] [community-staging]
Include = /etc/pacman.d/mirrorlist-arch Include = /etc/pacman.d/mirrorlist-arch

View File

@@ -102,11 +102,11 @@ Include = /etc/pacman.d/mirrorlist
# ARCHLINUX # ARCHLINUX
# #
[testing] #[testing]
Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch
[extra] #[extra]
Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch
[community-testing] [community-testing]
Include = /etc/pacman.d/mirrorlist-arch Include = /etc/pacman.d/mirrorlist-arch

View File

@@ -114,17 +114,17 @@ Include = /etc/pacman.d/mirrorlist
# ARCHLINUX # ARCHLINUX
# #
[kde-unstable] #[kde-unstable]
Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch
[staging] #[staging]
Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch
[testing] #[testing]
Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch
[extra] #[extra]
Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch
[community-staging] [community-staging]
Include = /etc/pacman.d/mirrorlist-arch Include = /etc/pacman.d/mirrorlist-arch

View File

@@ -111,14 +111,14 @@ Include = /etc/pacman.d/mirrorlist
# ARCHLINUX # ARCHLINUX
# #
[staging] #[staging]
Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch
[testing] #[testing]
Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch
[extra] #[extra]
Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch
[community-staging] [community-staging]
Include = /etc/pacman.d/mirrorlist-arch Include = /etc/pacman.d/mirrorlist-arch

View File

@@ -102,11 +102,11 @@ Include = /etc/pacman.d/mirrorlist
# ARCHLINUX # ARCHLINUX
# #
[testing] #[testing]
Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch
[extra] #[extra]
Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch
[community-testing] [community-testing]
Include = /etc/pacman.d/mirrorlist-arch Include = /etc/pacman.d/mirrorlist-arch

View File

@@ -105,8 +105,8 @@ Include = /etc/pacman.d/mirrorlist
#[testing] #[testing]
#Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch
[extra] #[extra]
Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch
#[community-testing] #[community-testing]
#Include = /etc/pacman.d/mirrorlist-arch #Include = /etc/pacman.d/mirrorlist-arch

View File

@@ -15,7 +15,9 @@
prepare_boot_extras(){ prepare_boot_extras(){
local src="$1" dest=${iso_root}/boot local src="$1" dest=${iso_root}/boot
cp $src/boot/intel-ucode.img $dest/intel-ucode.img for fw in intel amd; do
cp $src/boot/$fw-ucode.img $dest/$fw-ucode.img
done
cp $src/boot/memtest86+/memtest.bin $dest/memtest cp $src/boot/memtest86+/memtest.bin $dest/memtest
cp $src/usr/share/licenses/common/GPL2/license.txt $dest/memtest.COPYING cp $src/usr/share/licenses/common/GPL2/license.txt $dest/memtest.COPYING

View File

@@ -17,7 +17,8 @@ shopt -s extglob
get_compliant_name(){ get_compliant_name(){
local gitname="$1" local gitname="$1"
case "$gitname" in case "$gitname" in
*+) gitname=${gitname//+/plus} *+) gitname=${gitname//+/plus} ;;
*+*) gitname=${gitname//+/-} ;;
esac esac
echo "$gitname" echo "$gitname"
} }