diff options
| -rwxr-xr-x | bin/seed-build-list | 9 | ||||
| -rwxr-xr-x | bin/update-pacman-dbs | 2 | ||||
| -rwxr-xr-x | bin/wtf | 4 | ||||
| -rwxr-xr-x | lib/common-functions | 2 | ||||
| -rw-r--r-- | misc/pacman-pentium4.conf | 64 |
5 files changed, 75 insertions, 6 deletions
diff --git a/bin/seed-build-list b/bin/seed-build-list index 566be63..5f964e1 100755 --- a/bin/seed-build-list +++ b/bin/seed-build-list @@ -183,7 +183,7 @@ if [ -s "${tmp_dir}/mirrors" ]; then N s/^.*\n// /^lib32-/d - s/^\(.*-\)x86_64\(\.pkg\.tar\.xz\)$/\1i486\2\n\1i686\2/ + s/^\(.*-\)x86_64\(\.pkg\.tar\.xz\)$/\1i486\2\n\1i686\2\n\1pentium4\2/ ' | \ sed ' s/^\(.*\)-\([^-]\+-[^-]\+\)-\([^-]\+\)$/theirs \2 \3 \1/ @@ -204,7 +204,7 @@ if [ -s "${tmp_dir}/mirrors" ]; then mysql_run_query | \ sed ' s/^\(.*\)-\([^-]\+-[^-.]\+\)\(\.[^-.]\+\)\?-\([^-]\+\)$/ours \2 \4 \1/ - s/^\(.* \)any\(\.\S\+ \S\+\)$/\0\n\1i486\2\n\1i686\2\n/ + s/^\(.* \)any\(\.\S\+ \S\+\)$/\0\n\1i486\2\n\1i686\2\n\1pentium4\2/ ' } | \ expand_version 2 | \ @@ -240,7 +240,7 @@ if [ -s "${tmp_dir}/undelete-mirrors" ]; then N s/^.*\n// /^lib32-/d - s/^\(.*-\)x86_64\(\.pkg\.tar\.xz\)$/\1i486\2\n\1i686\2/ + s/^\(.*-\)x86_64\(\.pkg\.tar\.xz\)$/\1i486\2\n\1i686\2\n\1pentium4\2/ ' | \ sed ' s/^\(.*\)\(-[^-]\+\)\{3\}$/\1/ @@ -397,7 +397,8 @@ fi printf ' ON `binary_packages`.`id`=`least_stable_bp`.`id`' # 1) printf ' WHERE `least_stable_bp`.`is_on_build_list`' - # TODO: care about i486 and any here, too - if it is complete enough + # TODO: care about i486 and pentium4 and any here, too - if it is + # complete enough # shellcheck disable=SC2154 printf ' OR `binary_packages`.`architecture`!=%s;\n' \ "${architecture_ids__i686}" diff --git a/bin/update-pacman-dbs b/bin/update-pacman-dbs index ea601c9..49a4af6 100755 --- a/bin/update-pacman-dbs +++ b/bin/update-pacman-dbs @@ -6,7 +6,7 @@ base_dir=$( pacman -Syy -for arch in i486 i686; do +for arch in i486 i686 pentium4; do pacman --config "${base_dir}/misc/pacman-${arch}.conf" -Syy su master -c 'pkgfile -C '"${base_dir}"'/misc/pacman-'"${arch}"'.conf -D '"${base_dir}"'/work/pkgfile-'"${arch}"'.cache -u' @@ -27,6 +27,10 @@ case ${search%% *} in arch='i686' search="${search#* }" ;; + 'pentium4') + arch='pentium4' + search="${search#* }" + ;; *) arch='i686' ;; diff --git a/lib/common-functions b/lib/common-functions index e0ba40b..e87e6ef 100755 --- a/lib/common-functions +++ b/lib/common-functions @@ -553,7 +553,7 @@ download_sources_by_hash() { makepkg --printsrcinfo > "${tmp_dir}/.SRCINFO" - for arch_suffix in '' '_i486' '_i686'; do + for arch_suffix in '' '_i486' '_i686' '_pentium4'; do for sum_type in 'md5sum' 'sha1sum' 'sha256sum' 'sha512sum'; do grep '^\s*'"${sum_type}s${arch_suffix}"' = ' "${tmp_dir}/.SRCINFO" | \ sed 's|^.* = ||' | \ diff --git a/misc/pacman-pentium4.conf b/misc/pacman-pentium4.conf new file mode 100644 index 0000000..37c7683 --- /dev/null +++ b/misc/pacman-pentium4.conf @@ -0,0 +1,64 @@ +# +# /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 = /home/master/builder/work/pacman-pentium4.db/ +CacheDir = /home/master/builder/work/pacman-pentium4.cache/ +LogFile = /dev/null +#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 +#UseDelta = 0.7 +Architecture = pentium4 + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +#Color +#TotalDownload +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 + +[staging] +Include = /etc/pacman.d/mirrorlist32 + +[community-staging] +Include = /etc/pacman.d/mirrorlist32 + +[testing] +Include = /etc/pacman.d/mirrorlist32 + +[community-testing] +Include = /etc/pacman.d/mirrorlist32 + +[core] +Include = /etc/pacman.d/mirrorlist32 + +[extra] +Include = /etc/pacman.d/mirrorlist32 + +[community] +Include = /etc/pacman.d/mirrorlist32 |