buildtree: fix replace invalid char

disable arch extra
start 0.20
2020-08-25 21:26:01 +02:00 · 2020-07-31 00:24:08 +02:00 · 2020-07-26 14:41:54 +02:00 · 2020-07-26 14:41:19 +02:00 · 2020-07-26 12:30:39 +02:00 · 2020-07-14 13:40:09 +02:00
12 changed files with 46 additions and 45 deletions
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-VERSION=0.19
+VERSION=0.20

 CHROOT_VERSION=0.10

--- a/bin/pkg/pkg2yaml.in
+++ b/bin/pkg/pkg2yaml.in
@@ -101,6 +101,7 @@ yaml_write_package() {

 yaml_write_fileinfo(){
    local version=$(get_full_version)
+    pkgbase=${pkgbase:-$pkgname}
    Yaml+=$(write_yaml_map 0 "version" "${version:-0}")
    Yaml+=$(write_empty_line)
    local pkgfile=$(print_all_package_names)
--- a/data/pacman/pacman-default.conf
+++ b/data/pacman/pacman-default.conf
@@ -105,8 +105,8 @@ Include = /etc/pacman.d/mirrorlist
 #[testing]
 #Include = /etc/pacman.d/mirrorlist-arch

-[extra]
-Include = /etc/pacman.d/mirrorlist-arch
+#[extra]
+#Include = /etc/pacman.d/mirrorlist-arch

 #[community-testing]
 #Include = /etc/pacman.d/mirrorlist-arch
--- a/data/pacman/pacman-gnome-wobble.conf
+++ b/data/pacman/pacman-gnome-wobble.conf
@@ -114,17 +114,17 @@ Include = /etc/pacman.d/mirrorlist
 # ARCHLINUX
 #

-[gnome-unstable]
-Include = /etc/pacman.d/mirrorlist-arch
+#[gnome-unstable]
+#Include = /etc/pacman.d/mirrorlist-arch

-[staging]
-Include = /etc/pacman.d/mirrorlist-arch
+#[staging]
+#Include = /etc/pacman.d/mirrorlist-arch

-[testing]
-Include = /etc/pacman.d/mirrorlist-arch
+#[testing]
+#Include = /etc/pacman.d/mirrorlist-arch

-[extra]
-Include = /etc/pacman.d/mirrorlist-arch
+#[extra]
+#Include = /etc/pacman.d/mirrorlist-arch

 [community-staging]
 Include = /etc/pacman.d/mirrorlist-arch
--- a/data/pacman/pacman-goblins.conf
+++ b/data/pacman/pacman-goblins.conf
@@ -111,14 +111,14 @@ Include = /etc/pacman.d/mirrorlist
 # ARCHLINUX
 #

-[staging]
-Include = /etc/pacman.d/mirrorlist-arch
+#[staging]
+#Include = /etc/pacman.d/mirrorlist-arch

-[testing]
-Include = /etc/pacman.d/mirrorlist-arch
+#[testing]
+#Include = /etc/pacman.d/mirrorlist-arch

-[extra]
-Include = /etc/pacman.d/mirrorlist-arch
+#[extra]
+#Include = /etc/pacman.d/mirrorlist-arch

 [community-staging]
 Include = /etc/pacman.d/mirrorlist-arch
--- a/data/pacman/pacman-gremlins.conf
+++ b/data/pacman/pacman-gremlins.conf
@@ -102,11 +102,11 @@ Include = /etc/pacman.d/mirrorlist
 # ARCHLINUX
 #

-[testing]
-Include = /etc/pacman.d/mirrorlist-arch
+#[testing]
+#Include = /etc/pacman.d/mirrorlist-arch

-[extra]
-Include = /etc/pacman.d/mirrorlist-arch
+#[extra]
+#Include = /etc/pacman.d/mirrorlist-arch

 [community-testing]
 Include = /etc/pacman.d/mirrorlist-arch
--- a/data/pacman/pacman-kde-wobble.conf
+++ b/data/pacman/pacman-kde-wobble.conf
@@ -114,17 +114,17 @@ Include = /etc/pacman.d/mirrorlist
 # ARCHLINUX
 #

-[kde-unstable]
-Include = /etc/pacman.d/mirrorlist-arch
+#[kde-unstable]
+#Include = /etc/pacman.d/mirrorlist-arch

-[staging]
-Include = /etc/pacman.d/mirrorlist-arch
+#[staging]
+#Include = /etc/pacman.d/mirrorlist-arch

-[testing]
-Include = /etc/pacman.d/mirrorlist-arch
+#[testing]
+#Include = /etc/pacman.d/mirrorlist-arch

-[extra]
-Include = /etc/pacman.d/mirrorlist-arch
+#[extra]
+#Include = /etc/pacman.d/mirrorlist-arch

 [community-staging]
 Include = /etc/pacman.d/mirrorlist-arch
--- a/data/pacman/pacman-lib32-goblins.conf
+++ b/data/pacman/pacman-lib32-goblins.conf
@@ -111,14 +111,14 @@ Include = /etc/pacman.d/mirrorlist
 # ARCHLINUX
 #

-[staging]
-Include = /etc/pacman.d/mirrorlist-arch
+#[staging]
+#Include = /etc/pacman.d/mirrorlist-arch

-[testing]
-Include = /etc/pacman.d/mirrorlist-arch
+#[testing]
+#Include = /etc/pacman.d/mirrorlist-arch

-[extra]
-Include = /etc/pacman.d/mirrorlist-arch
+#[extra]
+#Include = /etc/pacman.d/mirrorlist-arch

 [community-staging]
 Include = /etc/pacman.d/mirrorlist-arch
--- a/data/pacman/pacman-lib32-gremlins.conf
+++ b/data/pacman/pacman-lib32-gremlins.conf
@@ -102,11 +102,11 @@ Include = /etc/pacman.d/mirrorlist
 # ARCHLINUX
 #

-[testing]
-Include = /etc/pacman.d/mirrorlist-arch
+#[testing]
+#Include = /etc/pacman.d/mirrorlist-arch

-[extra]
-Include = /etc/pacman.d/mirrorlist-arch
+#[extra]
+#Include = /etc/pacman.d/mirrorlist-arch

 [community-testing]
 Include = /etc/pacman.d/mirrorlist-arch
--- a/data/pacman/pacman-lib32.conf
+++ b/data/pacman/pacman-lib32.conf
@@ -105,8 +105,8 @@ Include = /etc/pacman.d/mirrorlist
 #[testing]
 #Include = /etc/pacman.d/mirrorlist-arch

-[extra]
-Include = /etc/pacman.d/mirrorlist-arch
+#[extra]
+#Include = /etc/pacman.d/mirrorlist-arch

 #[community-testing]
 #Include = /etc/pacman.d/mirrorlist-arch
--- a/lib/iso/grub.sh
+++ b/lib/iso/grub.sh
@@ -15,9 +15,8 @@
 prepare_boot_extras(){
    local src="$1" dest=${iso_root}/boot

-    for u in intel amd;do
-        cp $src/boot/$u-ucode.img $dest/$u-ucode.img
-        cp $src/usr/share/licenses/$u-ucode/LICENSE $dest/$u-ucode.LICENSE
+    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
--- a/lib/pkg/util.sh
+++ b/lib/pkg/util.sh
@@ -17,7 +17,8 @@ shopt -s extglob
 get_compliant_name(){
    local gitname="$1"
    case "$gitname" in
-        *+) gitname=${gitname//+/plus}
+        *+) gitname=${gitname//+/plus} ;;
+        *+*) gitname=${gitname//+/-} ;;
    esac
    echo "$gitname"
 }
Author	SHA1	Message	Date
artoo	ceb83ff765	buildtree: fix replace invalid char	2020-08-25 21:26:01 +02:00
artoo	8b3f5899d3	disable arch extra	2020-07-31 00:24:08 +02:00
artoo	c1956b0139	start 0.20	2020-07-26 14:41:54 +02:00
artoo	4206fdeff1	buildiso: cp amd fw	2020-07-26 14:41:19 +02:00
artoo	ae41ba16c6	buildiso: rm ucode license copying, not present in latest firmware	2020-07-26 12:30:39 +02:00
artoo	cf87f88580	pkg2yaml: init pkgbase	2020-07-14 13:40:09 +02:00