diff options
author | Luke Shumaker <lukeshu@parabola.nu> | 2018-04-29 14:21:00 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@parabola.nu> | 2018-04-29 14:21:00 -0400 |
commit | b27f6fdadee4227ab32b8bf34fe609e5b44fdc35 (patch) | |
tree | 796033781bc02f37d24450a9560234f20872bc4b | |
parent | 3867f0435b2d98278657fc47558ff44c9f554247 (diff) | |
parent | bd49e1cc3f5e47de739a5864aabad987ba28614c (diff) |
Merge branch 'lukeshu/step-3'parabola/20180429
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | config | 14 | ||||
l--------- | config.local | 1 | ||||
-rw-r--r-- | config.local.archlinux32 | 5 | ||||
-rw-r--r-- | config.local.archlinuxarm | 5 | ||||
-rw-r--r-- | config.local.community | 5 | ||||
-rw-r--r-- | config.local.packages | 5 | ||||
-rw-r--r-- | config.local.parabola | 14 | ||||
-rwxr-xr-x | db-import-pkg | 3 |
9 files changed, 41 insertions, 12 deletions
@@ -2,7 +2,6 @@ \#*# .#* *.pyc -/config.local /.idea /coverage @@ -5,17 +5,9 @@ FTP_BASE="/srv/repo/main" -PKGREPOS=( - 'core' 'testing' 'extra' 'community' 'multilib' 'multilib-testing' - 'libre' 'libre-testing' 'libre-multilib' 'libre-multilib-testing' - '~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' - '~jorginho' '~coadde' '~drtan' 'nonsystemd' 'nonsystemd-testing' - 'nonprism' 'nonprism-testing' 'nonprism-multilib' - 'nonprism-multilib-testing' 'pcr' 'pcr-testing' 'pcr-multilib' - 'pcr-multilib-testing' 'pcr-testing' 'kernels' 'kernels-testing' - 'cross' 'java' 'unmaintained' 'build-support') -PKGPOOL='pool/parabola' -SRCPOOL='sources/parabola' +PKGREPOS=() +PKGPOOL='' +SRCPOOL='' CLEANUP_DESTDIR="/srv/repo/package-cleanup" CLEANUP_DRYRUN=false diff --git a/config.local b/config.local new file mode 120000 index 0000000..906ba68 --- /dev/null +++ b/config.local @@ -0,0 +1 @@ +config.local.parabola
\ No newline at end of file diff --git a/config.local.archlinux32 b/config.local.archlinux32 new file mode 100644 index 0000000..094bf6d --- /dev/null +++ b/config.local.archlinux32 @@ -0,0 +1,5 @@ +#!/hint/bash + +PKGREPOS=(build-support community community-staging community-testing core extra gnome-unstable kde-unstable staging testing) +PKGPOOL='pool/archlinux32' +SRCPOOL='sources/archlinux32' diff --git a/config.local.archlinuxarm b/config.local.archlinuxarm new file mode 100644 index 0000000..42861fe --- /dev/null +++ b/config.local.archlinuxarm @@ -0,0 +1,5 @@ +#!/hint/bash + +PKGREPOS=(alarm aur community core extra) +PKGPOOL='pool/alarm' +SRCPOOL='sources/alarm' diff --git a/config.local.community b/config.local.community new file mode 100644 index 0000000..b4a0f91 --- /dev/null +++ b/config.local.community @@ -0,0 +1,5 @@ +#!/hint/bash + +PKGREPOS=('community' 'community-testing' 'community-staging' 'multilib' 'multilib-testing' 'multilib-staging') +PKGPOOL='pool/community' +SRCPOOL='sources/community' diff --git a/config.local.packages b/config.local.packages new file mode 100644 index 0000000..017f034 --- /dev/null +++ b/config.local.packages @@ -0,0 +1,5 @@ +#!/hint/bash + +PKGREPOS=('core' 'extra' 'testing' 'staging' 'kde-unstable' 'gnome-unstable') +PKGPOOL='pool/packages' +SRCPOOL='sources/packages' diff --git a/config.local.parabola b/config.local.parabola new file mode 100644 index 0000000..ddfc4d7 --- /dev/null +++ b/config.local.parabola @@ -0,0 +1,14 @@ +#!/hint/bash + +PKGREPOS=( + 'core' 'testing' 'extra' 'community' 'multilib' 'multilib-testing' + 'libre' 'libre-testing' 'libre-multilib' 'libre-multilib-testing' + '~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' + '~jorginho' '~coadde' '~drtan' 'nonsystemd' 'nonsystemd-testing' + 'nonprism' 'nonprism-testing' 'nonprism-multilib' + 'nonprism-multilib-testing' 'pcr' 'pcr-testing' 'pcr-multilib' + 'pcr-multilib-testing' 'pcr-testing' 'kernels' 'kernels-testing' + 'cross' 'java' 'unmaintained' 'build-support' +) +PKGPOOL='pool/parabola' +SRCPOOL='sources/parabola' diff --git a/db-import-pkg b/db-import-pkg index ec4f88d..d319b1f 100755 --- a/db-import-pkg +++ b/db-import-pkg @@ -185,6 +185,8 @@ make_repo_dbs() { msg2 "Adding whitelisted packages to clean %s and %s ..." \ "${db_file##*/}" "${files_file##*/}" rm "$db_file" "$files_file" + local UMASK=$(umask) + umask 002 case "$UPSTREAM" in packages|community) LC_ALL=C repo-add "$db_file" \ @@ -196,6 +198,7 @@ make_repo_dbs() { sed -n 's/==> Adding/ -> Adding/p' ;; esac + umask "$UMASK" >/dev/null msg2 "Updating %s-%s databases" "$2" "$1" mkdir -p -- "$into" |