| author | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2024-07-12 16:28:57 UTC |
| committer | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2024-07-12 16:28:57 UTC |
| parent | 6110ced5c4fd86c42b61ab61e1f498bf464ca82e |
| bc64-pamd-su.diff | +0 | -11 |
| build64-initial.sh | +0 | -33 |
| build64-pacman.conf | +0 | -80 |
| child-initial.sh | +0 | -21 |
| make-build64.sh | +0 | -62 |
| make-child.sh | +0 | -20 |
diff --git a/bc64-pamd-su.diff b/bc64-pamd-su.diff deleted file mode 100644 index 187a04f..0000000 --- a/bc64-pamd-su.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- /buildcore64-v2/etc/pam.d/su 2024-04-02 12:35:47.000000000 +0300 -+++ /buildcore64/etc/pam.d/su 2024-05-04 12:11:09.274000000 +0300 -@@ -1,7 +1,7 @@ - #%PAM-1.0 - auth sufficient pam_rootok.so - # Uncomment the following line to implicitly trust users in the "wheel" group. --#auth sufficient pam_wheel.so trust use_uid -+auth sufficient pam_wheel.so trust use_uid - # Uncomment the following line to require a user to be in the "wheel" group. - #auth required pam_wheel.so use_uid - auth required pam_unix.so diff --git a/build64-initial.sh b/build64-initial.sh deleted file mode 100755 index 2562e45..0000000 --- a/build64-initial.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -ldconfig -r . -echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen -echo "LANG=en_US.UTF-8" > /etc/locale.conf -locale-gen -export LANG="en_US.UTF-8" -# install all the packages -pacman -S --noconfirm base-devel nano which rust -# remove sudo (and the base-devel meta, since it's what pulled sudo in...) -pacman -R --noconfirm sudo base-devel - -systemd-machine-id-setup -systemctl preset-all -systemd-sysusers -setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx var/log/journal/ 2>/dev/null -# enable some services by default, but don't track them -systemctl enable \ - getty@tty1.service \ - remote-fs.target - -mkdir -m2755 var/log/journal/remote -chgrp systemd-journal-remote var/log/journal/remote - -# Add the builder user -useradd -U -G users,wheel -u 2000 -m builder - -# The root user could use the skel files, too. -cp /etc/skel/.bash* /root/ -echo "export VISUAL=nano" >> /root/.bashrc - -# Null out the passwords -passwd -d root -passwd -d builder diff --git a/build64-pacman.conf b/build64-pacman.conf deleted file mode 100644 index a9c833d..0000000 --- a/build64-pacman.conf +++ /dev/null @@ -1,80 +0,0 @@ -# -# /etc/pacman.conf -# -# See the pacman.conf(5) manpage for option and repository directives - -# -# 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 = /tmp/arm64-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 = aarch64 - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -IgnorePkg = linux-aarch64 -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog -#Color -#NoProgressBar -CheckSpace -#VerbosePkgLists -#ParallelDownloads = 5 - -# 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 = Never -#SigLevel = Required DatabaseOptional -LocalFileSigLevel = Optional -#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 ARM -# packagers with `pacman-key --populate archlinuxarm`. - -# -# 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. - -[core] -Server = file:///sources/pkg/$arch/core - -# 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 diff --git a/child-initial.sh b/child-initial.sh deleted file mode 100755 index 1858766..0000000 --- a/child-initial.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -ldconfig -r . -echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen -echo "LANG=en_US.UTF-8" > /etc/locale.conf -locale-gen -export LANG="en_US.UTF-8" -systemd-machine-id-setup -systemctl preset-all -# Only for VM: -if [ "$(uname -m)" = "armv8l" ]; then - mv /usr/bin/uname /usr/bin/uname.real - echo '#!/bin/sh' > /usr/bin/uname - echo "/usr/bin/uname.real \"\$@\" | sed 's/armv8l/armv7l/'" >> /usr/bin/uname - chmod +x /usr/bin/uname -fi -# VM hack end -mkdir -p /home/builder -chown builder:builder /home/builder -gpasswd -a builder wheel -sed -e 's:PREVENT_NO_AUTH superuser:PREVENT_NO_AUTH no:' -i etc/login.defs -make-ca -r diff --git a/make-build64.sh b/make-build64.sh deleted file mode 100755 index d9fd24c..0000000 --- a/make-build64.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash -set -e -BSN=buildcore64 -BS=/$BSN -MK="$(pwd)" -if [ -d $BS ]; then - echo "Will delete $BS, enter to continue" - read dummy - # Shh, just in case - umount $BS/sources/arm64-pkg 2>/dev/null || true - umount $BS/dev 2>/dev/null || true - umount $BS/proc 2>/dev/null || true - umount $BS/sys 2>/dev/null || true - umount $BS/var/cache/pacman/pkg 2>/dev/null || true - umount $BS 2>/dev/null || true - rm -r $BS -fi - -mkdir -p $BS - -# To allow pacman-in-chroot to believe that / is a mount point -mount --bind $BS $BS - -mkdir -p $BS/var/lib/pacman -pacman --config build64-pacman.conf -Sy -b $BS/var/lib/pacman -r $BS -pacman --config build64-pacman.conf -S --noconfirm --noscriptlet -b $BS/var/lib/pacman -r $BS base - -# Pacman/makepkg configuration - -cp build64-pacman.conf $BS/etc/pacman.conf -cp build64-initial.sh $BS/initial.sh - -# ARM32 clang & rustc helper scripts -cp -a bc64-usr-a32 $BS/usr/a32 - -# etc/pam.d/su -cd $BS/etc/pam.d -patch -Np4 -i $MK/bc64-pamd-su.diff - -# cd to target -cd $BS - -run_in_chroot() { -mkdir -p sources/arm64-pkg -mount --bind /sources/arm64-pkg sources/arm64-pkg -mount -t proc proc proc -mount -t sysfs sys sys -mount --bind /dev dev -mkdir -p var/cache/pacman/pkg -mkdir -p /tmp/ds{cache,work} -mount -t overlay -o lowerdir=/sources/arm64-pkg,upperdir=/tmp/dscache,workdir=/tmp/dswork overlay var/cache/pacman/pkg -chmod +x ./$1 -chroot . ./$1 -umount sources/arm64-pkg proc sys dev var/cache/pacman/pkg -rm ./$1 -return 0 -} -run_in_chroot initial.sh - -cd "$MK" -umount $BS -echo Done. diff --git a/make-child.sh b/make-child.sh deleted file mode 100755 index 8bbd367..0000000 --- a/make-child.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -set -e -cd /sources -PV=$$ -mkdir pkg-child-$PV -cp pkg-core/*.pkg.tar.xz pkg-child-$PV/ -rm pkg-child-$PV/*-debug-*.pkg.tar.xz -mkdir -p /child/var/lib/pacman -pacman -U --noconfirm --noscriptlet -b /child/var/lib/pacman -r /child pkg-child-$PV/*.pkg.tar.xz -rm -r pkg-child-$PV -cd /child -cp /etc/pacman.conf etc/ -mount -t proc proc proc -mount -t sysfs sys sys -mount --bind /dev dev -cp /sources/child-initial.sh initial.sh -chmod +x ./initial.sh -chroot . ./initial.sh -umount proc sys dev -rm ./initial.sh