From e3c6c359916b2684d086a64f8d4fa72b546564c3 Mon Sep 17 00:00:00 2001 From: Yichao Yu Date: Sun, 29 May 2022 23:24:39 -0400 Subject: [PATCH 1/4] Add arm symlink --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 778c469..725e0be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,11 @@ install_build_script(archlinuxcn-staging-x86_64-build) install_build_script(archlinuxcn-kde-unstable-x86_64-build) install_build_script(multilib-archlinuxcn-build) +foreach(ARM_ARCH armv7h aarch64) + install_build_script("archlinuxcn-${ARM_ARCH}-build") + install_build_script("archlinuxcn-testing-${ARM_ARCH}-build") +endforeach() + install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/cmds/" DESTINATION "${CMAKE_INSTALL_BINDIR}") install(FILES From aa1b0a5dd162c8784393ea70a3352c017bac2298 Mon Sep 17 00:00:00 2001 From: Yichao Yu Date: Sun, 29 May 2022 23:25:06 -0400 Subject: [PATCH 2/4] Bump minimum cmake version requirement --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 725e0be..6888a0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ project(devtools-cn) ## Setup -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.0) set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake") From 44906fbe6b8a052f63815e07f6bd0305768394fe Mon Sep 17 00:00:00 2001 From: Yichao Yu Date: Sat, 4 Jun 2022 12:11:09 -0400 Subject: [PATCH 3/4] Add build script symlink for arm and armv6h Also remove testing for armv7h and aarch64 since they do not exist AFAICT --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6888a0e..de56147 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,9 +24,8 @@ install_build_script(archlinuxcn-staging-x86_64-build) install_build_script(archlinuxcn-kde-unstable-x86_64-build) install_build_script(multilib-archlinuxcn-build) -foreach(ARM_ARCH armv7h aarch64) +foreach(ARM_ARCH arm armv6h armv7h aarch64) install_build_script("archlinuxcn-${ARM_ARCH}-build") - install_build_script("archlinuxcn-testing-${ARM_ARCH}-build") endforeach() install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/cmds/" From e9050a0c405225340edae14623ae6bc4a2410a7f Mon Sep 17 00:00:00 2001 From: Yichao Yu Date: Sat, 4 Jun 2022 12:19:47 -0400 Subject: [PATCH 4/4] [arm] Fix pacman config * different base repo names * do not use auto arch --- CMakeLists.txt | 9 +++- pacman-archlinuxcn-arm.conf.in | 94 ++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 pacman-archlinuxcn-arm.conf.in diff --git a/CMakeLists.txt b/CMakeLists.txt index de56147..4f46049 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,8 +24,13 @@ install_build_script(archlinuxcn-staging-x86_64-build) install_build_script(archlinuxcn-kde-unstable-x86_64-build) install_build_script(multilib-archlinuxcn-build) -foreach(ARM_ARCH arm armv6h armv7h aarch64) - install_build_script("archlinuxcn-${ARM_ARCH}-build") +foreach(CARCH arm armv6h armv7h aarch64) + install_build_script("archlinuxcn-${CARCH}-build") + configure_file(pacman-archlinuxcn-arm.conf.in + "pacman-archlinuxcn-${CARCH}.conf" @ONLY) + install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/pacman-archlinuxcn-${CARCH}.conf" + DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/devtools/") endforeach() install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/cmds/" diff --git a/pacman-archlinuxcn-arm.conf.in b/pacman-archlinuxcn-arm.conf.in new file mode 100644 index 0000000..00efeb0 --- /dev/null +++ b/pacman-archlinuxcn-arm.conf.in @@ -0,0 +1,94 @@ +# +# /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 = /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 = @CARCH@ + +# 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 + +# 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 = 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 +# 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. + +[archlinuxcn] +Server = http://repo.archlinuxcn.org/$arch + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist + +[alarm] +Include = /etc/pacman.d/mirrorlist + +[aur] +Include = /etc/pacman.d/mirrorlist + +# 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