From: kokkiemouse <kokkiemouse@fascode.net>
Date: Sun, 15 Nov 2020 05:19:46 +0000 (+0900)
Subject: fixed pacman key
X-Git-Tag: rc3-alpha1~9
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d2730b9bbc95e7e56752f62bee3c56cb98803c96;p=alterlinux%2Falterlinux.git

fixed pacman key

Signed-off-by: kokkiemouse <kokkiemouse@fascode.net>
---

diff --git a/build.sh b/build.sh
index acbbf3c3..635e9a60 100755
--- a/build.sh
+++ b/build.sh
@@ -684,7 +684,7 @@ make_packages_aur() {
 
     # prepare for yay
     cp -rf --preserve=mode "${script_path}/system/aur.sh" "${airootfs_dir}/root/aur.sh"
-    cp -f "${work_dir}/pacman-${arch}.conf" "${airootfs_dir}/etc/alteriso-pacman.conf"
+    cp -f "${work_dir}/aur_pacman-${arch}.conf" "${airootfs_dir}/etc/alteriso-pacman.conf"
 
     # Run aur script
     ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}"  -D "${install_dir}" -r "/root/aur.sh ${pkglist_aur[*]}" run
diff --git a/system/aur.sh b/system/aur.sh
index 739e9f9a..97eab3fb 100755
--- a/system/aur.sh
+++ b/system/aur.sh
@@ -48,7 +48,7 @@ echo "aurbuild ALL=(ALL) NOPASSWD:ALL" > "/etc/sudoers.d/aurbuild"
 
 # Build and install
 chmod +s /usr/bin/sudo
-sudo -u aurbuild yay -Sy  --nocleanmenu --nodiffmenu --noeditmenu --noupgrademenu --noprovides --config "/etc/alteriso-pacman.conf" ${*}
+yes | sudo -u aurbuild yay -Sy  --nocleanmenu --nodiffmenu --noeditmenu --noupgrademenu --noprovides --removemake --config "/etc/alteriso-pacman.conf" ${*}
 
 
 # remove user and file
diff --git a/system/aur_pacman-x86_64.conf b/system/aur_pacman-x86_64.conf
new file mode 100644
index 00000000..b6840f8b
--- /dev/null
+++ b/system/aur_pacman-x86_64.conf
@@ -0,0 +1,186 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2020 Fascode Network.
+#
+# This is only used at build time.
+# In the configuration for the build, the repository mirror is specified directly.
+# Alter-testing is enabled in the build settings.
+
+#
+# GENERAL OPTIONS
+#
+
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+Color
+#TotalDownload
+# We cannot check disk space from within a chroot environment
+#CheckSpace
+#VerbosePkgLists
+ILoveCandy
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = TrustAll
+LocalFileSigLevel = TrustAll
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+[alter-stable]
+Server = https://xn--d-8o2b.com/repo/$repo/$arch
+Server = https://osdn.net/projects/alterlinux/storage/repo/$repo/$arch
+Server = https://osdn.net/projects/serene/storage/repo/$repo/$arch
+#Server = https://h.0u0.biz/repo/$repo/$arch
+#Server = https://mirrors.tuna.tsinghua.edu.cn/osdn/storage/g/a/al/alterlinux/repo/$repo/$arch
+
+#[dvzrv]
+#Server = https://pkgbuild.com/~dvzrv/repo/$arch
+
+[alter-kernel]
+Server = https://xn--d-8o2b.com/repo/$repo/$arch
+Server = https://osdn.net/projects/alterlinux/storage/repo/$repo/$arch
+Server = https://osdn.net/projects/serene/storage/repo/$repo/$arch
+#Server = https://h.0u0.biz/repo/$repo/$arch
+#Server = https://mirrors.tuna.tsinghua.edu.cn/osdn/storage/g/a/al/alterlinux/repo/$repo/$arch
+
+#[alter-testing]
+#Server = https://xn--d-8o2b.com/repo/$repo/$arch
+#Server = https://osdn.net/projects/alterlinux/storage/repo/$repo/$arch
+#Server = https://osdn.net/projects/serene/storage/repo/$repo/$arch
+#Server = https://h.0u0.biz/repo/$repo/$arch
+#Server = https://mirrors.tuna.tsinghua.edu.cn/osdn/storage/g/a/al/alterlinux/repo/$repo/$arch
+
+#[testing]
+#Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
+#Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch
+#Server = http://mirror.archlinux.jp/$repo/os/$arch
+#Server = https://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
+#Server = http://mirrors.cat.net/archlinux/$repo/os/$arch
+#Server = https://mirrors.cat.net/archlinux/$repo/os/$arch
+#Server = https://jpn.mirror.pkgbuild.com/$repo/os/$arch
+
+[core]
+Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
+Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch
+Server = http://mirror.archlinux.jp/$repo/os/$arch
+Server = https://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
+Server = http://mirrors.cat.net/archlinux/$repo/os/$arch
+Server = https://mirrors.cat.net/archlinux/$repo/os/$arch
+Server = https://jpn.mirror.pkgbuild.com/$repo/os/$arch
+
+[extra]
+Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
+Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch
+Server = http://mirror.archlinux.jp/$repo/os/$arch
+Server = https://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
+Server = http://mirrors.cat.net/archlinux/$repo/os/$arch
+Server = https://mirrors.cat.net/archlinux/$repo/os/$arch
+Server = https://jpn.mirror.pkgbuild.com/$repo/os/$arch
+
+#[community-testing]
+#Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
+#Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch
+#Server = http://mirror.archlinux.jp/$repo/os/$arch
+#Server = https://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
+#Server = http://mirrors.cat.net/archlinux/$repo/os/$arch
+#Server = https://mirrors.cat.net/archlinux/$repo/os/$arch
+#Server = https://jpn.mirror.pkgbuild.com/$repo/os/$arch
+
+[community]
+Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
+Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch
+Server = http://mirror.archlinux.jp/$repo/os/$arch
+Server = https://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
+Server = http://mirrors.cat.net/archlinux/$repo/os/$arch
+Server = https://mirrors.cat.net/archlinux/$repo/os/$arch
+Server = https://jpn.mirror.pkgbuild.com/$repo/os/$arch
+
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the multilib repositories as required here.
+
+#[multilib-testing]
+#Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
+#Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch
+#Server = http://mirror.archlinux.jp/$repo/os/$arch
+#Server = https://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
+#Server = http://mirrors.cat.net/archlinux/$repo/os/$arch
+#Server = https://mirrors.cat.net/archlinux/$repo/os/$arch
+#Server = https://jpn.mirror.pkgbuild.com/$repo/os/$arch
+
+[multilib]
+Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
+Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch
+Server = http://mirror.archlinux.jp/$repo/os/$arch
+Server = https://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
+Server = http://mirrors.cat.net/archlinux/$repo/os/$arch
+Server = https://mirrors.cat.net/archlinux/$repo/os/$arch
+Server = https://jpn.mirror.pkgbuild.com/$repo/os/$arch
+
+# This is Yamada Hayao's personal repository.
+# It was used early but is now disabled.
+#[hayao]
+#Server = https://xn--d-8o2b.com/repo/$repo/$arch
+#Server = https://ja.osdn.net/projects/serene/storage/repo/$repo/$arch
+#Server = https://ja.osdn.jp/storage/g/a/al/alterlinux/repo/$repo/$arch
+#Server = https://h.0u0.biz/repo/$repo/$arch
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs