diff --git a/.gitmodules b/.gitmodules index 7d33b6a..f43a54b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -259,3 +259,15 @@ [submodule "build-pkg/pkg/youtube-dlp"] path = pkg/youtube-dlp url = https://aur.archlinux.org/youtube-dlp.git +[submodule "pkg/aosp-devel"] + path = pkg/aosp-devel + url = https://aur.archlinux.org/aosp-devel.git +[submodule "pkg/lineageos-devel"] + path = pkg/lineageos-devel + url = https://aur.archlinux.org/lineageos-devel.git +[submodule "pkg/lib32-ncurses5-compat-libs"] + path = pkg/lib32-ncurses5-compat-libs + url = https://aur.archlinux.org/lib32-ncurses5-compat-libs.git +[submodule "pkg/xml2"] + path = pkg/xml2 + url = https://aur.archlinux.org/xml2.git diff --git a/README.md b/README.md index 078b5bc..ab7ba34 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ See [build-pkg/pkglist-AUR.txt](build-pkg/pkglist-AUR.txt) for a full list. They were added in the following manner: ```shell -AUR_PKG=2048-qt +AUR_PKG=xml2 git submodule add "https://aur.archlinux.org/${AUR_PKG}.git" pkg/"${AUR_PKG}" # echo "Add ${AUR_PKG} to 'build-pkg/pkglist-AUR.txt'. Each line represents one build stage." ``` @@ -63,7 +63,7 @@ git submodule add "https://aur.archlinux.org/${AUR_PKG}.git" pkg/"${AUR_PKG}" And can be removed with: ```shell -AUR_PKG=2048-qt +AUR_PKG=xml2 git rm -f pkg/"${AUR_PKG}" # echo "Above command should remove ${AUR_PKG} from '.gitmodules'." ``` diff --git a/build-pkg/Dockerfile b/build-pkg/Dockerfile index be57e7a..f23295d 100644 --- a/build-pkg/Dockerfile +++ b/build-pkg/Dockerfile @@ -5,20 +5,26 @@ FROM archlinux:base-devel # 0. DisableDownloadTimeout -# 1. Add de-p1st mirror -# 2. Add home_ungoogled_chromium_Arch (ungoogled-chromium) mirror -# 3. Add signing key of home_ungoogled_chromium_Arch mirror -# 4. Enable parallel downloads +# 1. Enable parallel downloads # TODO: Wait until next baseimage update # && sed --in-place 's|^#ParallelDownloads\s*=.*$|ParallelDownloads = 4|' /etc/pacman.conf \ -# 5. Update mirrors + packages -# 6. Install svn for makepkg to handle svn sources +# 2. Add de-p1st mirror +# 3. Add home_ungoogled_chromium_Arch (ungoogled-chromium) mirror; see also (4) +# 4. Add signing key of home_ungoogled_chromium_Arch mirror +# 5. Enable multilib repository; see also (8) +# +# 6. Update mirrors + packages +# 7. Install svn for makepkg to handle svn sources +# 8. Install 'multilib-devel' group, see https://wiki.archlinux.org/index.php/Makepkg#Build_32-bit_packages_on_a_64-bit_system RUN printf '\n[options]\nDisableDownloadTimeout\n' >> /etc/pacman.conf && \ printf '\n[de-p1st]\nSigLevel = Optional TrustAll\nServer = https://arch.p1st.de\n' >> /etc/pacman.conf && \ printf '\n[home_ungoogled_chromium_Arch]\nSigLevel = Required TrustAll\nServer = https://download.opensuse.org/repositories/home:/ungoogled_chromium/Arch/$arch\n' >> /etc/pacman.conf && \ curl -s 'https://download.opensuse.org/repositories/home:/ungoogled_chromium/Arch/x86_64/home_ungoogled_chromium_Arch.key' | pacman-key --add - && \ + printf '\n[multilib]\nInclude = /etc/pacman.d/mirrorlist\n' >> /etc/pacman.conf && \ + \ pacman -Syu --noconfirm && \ - pacman -S --needed --noconfirm svn + pacman -S --needed --noconfirm svn && \ + pacman -S --needed --noconfirm multilib-devel # 1. Set packager # 2. Store built packages in /out/ diff --git a/build-pkg/pkglist-AUR.txt b/build-pkg/pkglist-AUR.txt index 7779a91..2110e74 100644 --- a/build-pkg/pkglist-AUR.txt +++ b/build-pkg/pkglist-AUR.txt @@ -1,3 +1,3 @@ -adwaita-qt amdgpu-pro-installer aurutils balena-etcher calindori-git chili-sddm-theme chromaprint-fftw crema davs2 decklink-sdk discord_arch_electron firefox-profile-switcher-connector flite1-patched forklift-git gnome-meta gnome-shell-extension-appindicator-git handbrake-full holo iio-sensor-proxy-git intellij-idea-ultimate-edition jellyfin-bin jexiftoolgui kirigami-addons-git lensfun-git libklvanc-git libopenmpt-svn librist libwacom-surface mauikit-git meta-group-base-devel mkcue mrwriter-git mozilla-common mugshot ncurses5-compat-libs nextcloud-client-git nordic-kde-git opencl-amd openh264 portfolio-file-manager pycharm-professional pyspread python-mpv qt4 qt-installer-framework sddm-theme-deepin-git shine signal-desktop-beta-bin softmaker-office-2021-bin sphinxbase tagspaces-bin timeshift toggle-bluetooth ttf-material-design-icons-git ttf-unifont uavs3d uavs3d-git umldesigner vo-amrwbenc vobcopy vulkan-headers-git wkhtmltopdf-static woeusb x264-git xavs xavs2 xfce4-meta xfce4-theme-switcher xorg-meta xournalpp-git yay youtube-dlp zoom zotero -adwaita-qt4 fedora-firefox-wayland-bin kclock pocketsphinx riseup-vpn youplay zoom-firejail -ffmpeg-amd-full riseup-vpn-terminal +adwaita-qt amdgpu-pro-installer aurutils balena-etcher calindori-git chili-sddm-theme chromaprint-fftw crema davs2 decklink-sdk discord_arch_electron firefox-profile-switcher-connector flite1-patched forklift-git gnome-meta gnome-shell-extension-appindicator-git handbrake-full holo iio-sensor-proxy-git intellij-idea-ultimate-edition jellyfin-bin jexiftoolgui kirigami-addons-git lensfun-git lib32-ncurses5-compat-libs libklvanc-git libopenmpt-svn librist libwacom-surface mauikit-git meta-group-base-devel mkcue mrwriter-git mozilla-common mugshot ncurses5-compat-libs nextcloud-client-git nordic-kde-git opencl-amd openh264 portfolio-file-manager pycharm-professional pyspread python-mpv qt4 qt-installer-framework sddm-theme-deepin-git shine signal-desktop-beta-bin softmaker-office-2021-bin sphinxbase tagspaces-bin timeshift toggle-bluetooth ttf-material-design-icons-git ttf-unifont uavs3d uavs3d-git umldesigner vo-amrwbenc vobcopy vulkan-headers-git wkhtmltopdf-static woeusb x264-git xavs xavs2 xfce4-meta xfce4-theme-switcher xml2 xorg-meta xournalpp-git yay youtube-dlp zoom zotero +adwaita-qt4 aosp-devel fedora-firefox-wayland-bin kclock pocketsphinx riseup-vpn youplay zoom-firejail +ffmpeg-amd-full lineageos-devel riseup-vpn-terminal diff --git a/pkg/aosp-devel b/pkg/aosp-devel new file mode 160000 index 0000000..705c734 --- /dev/null +++ b/pkg/aosp-devel @@ -0,0 +1 @@ +Subproject commit 705c734278589f4be21a50cb8694744ee5baf972 diff --git a/pkg/de-p1st-pacman/PKGBUILD b/pkg/de-p1st-pacman/PKGBUILD index e617625..473483d 100644 --- a/pkg/de-p1st-pacman/PKGBUILD +++ b/pkg/de-p1st-pacman/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=pacman _reponame=arch pkgname="de-p1st-$_pkgname" -pkgver=0.2.1 +pkgver=0.2.2 pkgrel=1 pkgdesc="pacman with configuration" arch=('any') diff --git a/pkg/de-p1st-pacman/pacman.conf.holoscript b/pkg/de-p1st-pacman/pacman.conf.holoscript index 359bd59..1b143ee 100644 --- a/pkg/de-p1st-pacman/pacman.conf.holoscript +++ b/pkg/de-p1st-pacman/pacman.conf.holoscript @@ -5,8 +5,14 @@ # Enable parallel downloads sed 's|^#ParallelDownloads\s*=.*$|ParallelDownloads = 4|' +# Assert multilib is not enabled +! echo "$stdin" | grep --quiet '^\[multilib\].*$' + +# Enable multilib repository +printf '[multilib]\nInclude = /etc/pacman.d/mirrorlist\n' + # de-p1st mirror -echo 'Include = /etc/pacman.d/de-p1st' +printf 'Include = /etc/pacman.d/de-p1st\n' # home_ungoogled_chromium_Arch mirror -echo 'Include = /etc/pacman.d/ungoogled-chromium' +printf 'Include = /etc/pacman.d/ungoogled-chromium\n' diff --git a/pkg/lib32-ncurses5-compat-libs b/pkg/lib32-ncurses5-compat-libs new file mode 160000 index 0000000..308ab06 --- /dev/null +++ b/pkg/lib32-ncurses5-compat-libs @@ -0,0 +1 @@ +Subproject commit 308ab06f308c3a9bdf85ecc55af957ff6b46f230 diff --git a/pkg/lineageos-devel b/pkg/lineageos-devel new file mode 160000 index 0000000..68917c5 --- /dev/null +++ b/pkg/lineageos-devel @@ -0,0 +1 @@ +Subproject commit 68917c521f0e0e6c0c102c1fe375d0c00ec032b8 diff --git a/pkg/xml2 b/pkg/xml2 new file mode 160000 index 0000000..ecbbbbd --- /dev/null +++ b/pkg/xml2 @@ -0,0 +1 @@ +Subproject commit ecbbbbdf8660f0b975682cdcf0d6c57e3c56d7db