From 8d132b0ea8c179afbe165d4c4f7414d4ef7ddd10 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Wed, 26 Sep 2018 20:30:01 +0200 Subject: core/p11-kit: temporary disable for gtk-doc on i486 --- core/p11-kit/PKGBUILD | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 core/p11-kit/PKGBUILD (limited to 'core') diff --git a/core/p11-kit/PKGBUILD b/core/p11-kit/PKGBUILD new file mode 100644 index 00000000..22f7065f --- /dev/null +++ b/core/p11-kit/PKGBUILD @@ -0,0 +1,11 @@ +# 486-specific +if [ "${CARCH}" = "i486" ]; then + # no gtk yet + makedepends=(${makedepends[@]//gtk-doc/}) + eval "$( + declare -f build | \ + sed ' + s@--enable-doc@--disable-doc@ + ' + )" +fi -- cgit v1.2.3-70-g09d2 From d2ab9fcfe0cb1ac15e27fe3b2fb7119f05881eb3 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Wed, 26 Sep 2018 20:32:09 +0200 Subject: core/shadow: disable gnoe for documentation on i486 --- core/shadow/PKGBUILD | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 core/shadow/PKGBUILD (limited to 'core') diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD new file mode 100644 index 00000000..ef3f908c --- /dev/null +++ b/core/shadow/PKGBUILD @@ -0,0 +1,26 @@ +# i486-specific +if [ "${CARCH}" = "i486" ]; then + # remove dependency on Gnome's xml2po (needed for building the man pages, + # draws in far too many dependencies) + makedepends=(${makedepends[@]//gnome-doc-utils/}) + + eval "$( + declare -f prepare | \ + sed ' + /autoreconf/ i \ sed -i "/SUBDIRS/s/man//g" Makefile.am + ' + )" + eval "$( + declare -f build | \ + sed ' + s/--enable-man/--disable-man/ + ' + )" + eval "$( + declare -f package | \ + sed ' + /find.*man/d + /rmdir.*man/d + ' + )" +fi -- cgit v1.2.3-70-g09d2 From eb6c2d79af846d5691b0b84abdd23946c1cd5876 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Wed, 26 Sep 2018 20:34:25 +0200 Subject: core/libpsl: disabling gtk-doc docu on i486 for now --- core/libpsl/PKGBUILD | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 core/libpsl/PKGBUILD (limited to 'core') diff --git a/core/libpsl/PKGBUILD b/core/libpsl/PKGBUILD new file mode 100644 index 00000000..bfccdc03 --- /dev/null +++ b/core/libpsl/PKGBUILD @@ -0,0 +1,11 @@ +# i486-specific +if [ "${CARCH}" = "i486" ]; then + # no documentation + makedepends=(${makedepends[@]//gtk-doc/}) + eval "$( + declare -f build | \ + sed ' + s/--enable-gtk-doc/--disable-gtk-doc/ + ' + )" +fi -- cgit v1.2.3-70-g09d2 From b4004bb2425f9a282c4d5f8cf326c4a59dd47558 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Wed, 26 Sep 2018 21:28:47 +0200 Subject: core/linux: new version => new configs => new checksums --- core/linux/PKGBUILD | 8 ++++---- core/linux/config.i486 | 43 ++++++++++++++++++++++++++++++++++++++----- core/linux/config.i686 | 49 +++++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 83 insertions(+), 17 deletions(-) (limited to 'core') diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD index f7b7b3fb..6254ac8e 100644 --- a/core/linux/PKGBUILD +++ b/core/linux/PKGBUILD @@ -1,12 +1,12 @@ -# upstream git revision: 2edc3f8d648d3f161a9593c0a41332dae246cdfd +# upstream git revision: 43d12d0306ae85803a356caabd0b384eb917c80e # fail if upstream's .config changes for ((i=0; i<${#sha256sums[@]}; i++)); do - if [ "${sha256sums[${i}]}" = '83d768f19193f6795b8159d81c6775b9f62f4994f2a0d8371ac243e7b0890db8' ]; then + if [ "${sha256sums[${i}]}" = '1fc23bd2613b821d8bdca1a33dc421e21de296221108ce047176d27d37ce397f' ]; then source_i686=('config.i686') - sha256sums_i686=('fac358ec445aaeafe13b3d5916c2c01304588578632f4d74186f8691acd0419b') + sha256sums_i686=('fc137a9706f7b1e2f9deb49f3a750834320fceee0944ce584e2c4341bb9ca2c6') source_i486=('config.i486') - sha256sums_i486=('8bb140f3f672d6e10bfb652a617d0c161b24980c750d2358cece2b82f8897dcb') + sha256sums_i486=('08f9a17d9237ddeea7b2612b72c4f86b1929532e9e3c9ba7d1fab86bc7b432e0') fi done diff --git a/core/linux/config.i486 b/core/linux/config.i486 index ef6ba599..fd520452 100644 --- a/core/linux/config.i486 +++ b/core/linux/config.i486 @@ -344,7 +344,6 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y -# CONFIG_MODULE_SIG is not set CONFIG_MODULE_COMPRESS=y # CONFIG_MODULE_COMPRESS_GZIP is not set CONFIG_MODULE_COMPRESS_XZ=y @@ -9115,7 +9114,6 @@ CONFIG_EARLY_PRINTK_EFI=y # CONFIG_EARLY_PRINTK_USB_XDBC is not set # CONFIG_X86_PTDUMP is not set # CONFIG_EFI_PGT_DUMP is not set -# CONFIG_DEBUG_WX is not set CONFIG_DOUBLEFAULT=y # CONFIG_DEBUG_TLBFLUSH is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y @@ -9164,10 +9162,8 @@ CONFIG_FORTIFY_SOURCE=y # CONFIG_STATIC_USERMODEHELPER is not set # CONFIG_SECURITY_SMACK is not set # CONFIG_SECURITY_TOMOYO is not set -# CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_YAMA=y -# CONFIG_INTEGRITY is not set CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_DEFAULT_SECURITY="" CONFIG_XOR_BLOCKS=m @@ -9266,7 +9262,6 @@ CONFIG_CRYPTO_RMD256=m CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_TGR192=m @@ -9501,3 +9496,41 @@ CONFIG_ARCH_HAS_SG_CHAIN=y CONFIG_SBITMAP=y CONFIG_PARMAN=m # CONFIG_STRING_SELFTEST is not set +# Linux/x86 4.18.8-arch1 Kernel Configuration +# Compiler: gcc (GCC) 8.2.1 20180831 +CONFIG_GCC_VERSION=80201 +CONFIG_HAVE_RCU_TABLE_INVALIDATE=y +CONFIG_MODULE_SIG=y +# CONFIG_MODULE_SIG_FORCE is not set +CONFIG_MODULE_SIG_ALL=y +# CONFIG_MODULE_SIG_SHA1 is not set +# CONFIG_MODULE_SIG_SHA224 is not set +# CONFIG_MODULE_SIG_SHA256 is not set +# CONFIG_MODULE_SIG_SHA384 is not set +CONFIG_MODULE_SIG_SHA512=y +CONFIG_MODULE_SIG_HASH="sha512" +CONFIG_X86_PTDUMP_CORE=y +CONFIG_DEBUG_WX=y +CONFIG_LSM_MMAP_MIN_ADDR=65536 +CONFIG_SECURITY_SELINUX=y +CONFIG_SECURITY_SELINUX_BOOTPARAM=y +CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 +# CONFIG_SECURITY_SELINUX_DISABLE is not set +CONFIG_SECURITY_SELINUX_DEVELOP=y +CONFIG_SECURITY_SELINUX_AVC_STATS=y +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 +CONFIG_SECURITY_APPARMOR_HASH=y +CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y +# CONFIG_SECURITY_APPARMOR_DEBUG is not set +CONFIG_INTEGRITY=y +# CONFIG_INTEGRITY_SIGNATURE is not set +CONFIG_INTEGRITY_AUDIT=y +# CONFIG_IMA is not set +# CONFIG_EVM is not set +# CONFIG_DEFAULT_SECURITY_SELINUX is not set +# CONFIG_DEFAULT_SECURITY_APPARMOR is not set +CONFIG_CRYPTO_SHA512=y +# CONFIG_CRYPTO_SPECK is not set +CONFIG_MODULE_SIG_KEY="certs/signing_key.pem" diff --git a/core/linux/config.i686 b/core/linux/config.i686 index 5e61428f..1c811e9b 100644 --- a/core/linux/config.i686 +++ b/core/linux/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.18.7-arch1 Kernel Configuration +# Linux/x86 4.18.9-arch1 Kernel Configuration # # @@ -76,8 +76,11 @@ CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y CONFIG_CROSS_MEMORY_ATTACH=y # CONFIG_USELIB is not set -# CONFIG_AUDIT is not set +CONFIG_AUDIT=y CONFIG_HAVE_ARCH_AUDITSYSCALL=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y +CONFIG_AUDIT_TREE=y # # IRQ subsystem @@ -351,7 +354,15 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y -# CONFIG_MODULE_SIG is not set +CONFIG_MODULE_SIG=y +# CONFIG_MODULE_SIG_FORCE is not set +CONFIG_MODULE_SIG_ALL=y +# CONFIG_MODULE_SIG_SHA1 is not set +# CONFIG_MODULE_SIG_SHA224 is not set +# CONFIG_MODULE_SIG_SHA256 is not set +# CONFIG_MODULE_SIG_SHA384 is not set +CONFIG_MODULE_SIG_SHA512=y +CONFIG_MODULE_SIG_HASH="sha512" CONFIG_MODULE_COMPRESS=y # CONFIG_MODULE_COMPRESS_GZIP is not set CONFIG_MODULE_COMPRESS_XZ=y @@ -1162,6 +1173,7 @@ CONFIG_NETFILTER_XT_SET=m # # Xtables targets # +# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m @@ -9252,9 +9264,10 @@ CONFIG_EARLY_PRINTK=y # CONFIG_EARLY_PRINTK_DBGP is not set CONFIG_EARLY_PRINTK_EFI=y # CONFIG_EARLY_PRINTK_USB_XDBC is not set +CONFIG_X86_PTDUMP_CORE=y # CONFIG_X86_PTDUMP is not set # CONFIG_EFI_PGT_DUMP is not set -# CONFIG_DEBUG_WX is not set +CONFIG_DEBUG_WX=y CONFIG_DOUBLEFAULT=y # CONFIG_DEBUG_TLBFLUSH is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y @@ -9295,18 +9308,36 @@ CONFIG_SECURITY_INFINIBAND=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y # CONFIG_INTEL_TXT is not set +CONFIG_LSM_MMAP_MIN_ADDR=65536 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y CONFIG_HARDENED_USERCOPY=y CONFIG_HARDENED_USERCOPY_FALLBACK=y # CONFIG_HARDENED_USERCOPY_PAGESPAN is not set CONFIG_FORTIFY_SOURCE=y # CONFIG_STATIC_USERMODEHELPER is not set +CONFIG_SECURITY_SELINUX=y +CONFIG_SECURITY_SELINUX_BOOTPARAM=y +CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 +# CONFIG_SECURITY_SELINUX_DISABLE is not set +CONFIG_SECURITY_SELINUX_DEVELOP=y +CONFIG_SECURITY_SELINUX_AVC_STATS=y +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0 # CONFIG_SECURITY_SMACK is not set # CONFIG_SECURITY_TOMOYO is not set -# CONFIG_SECURITY_APPARMOR is not set +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 +CONFIG_SECURITY_APPARMOR_HASH=y +CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y +# CONFIG_SECURITY_APPARMOR_DEBUG is not set # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_YAMA=y -# CONFIG_INTEGRITY is not set +CONFIG_INTEGRITY=y +# CONFIG_INTEGRITY_SIGNATURE is not set +CONFIG_INTEGRITY_AUDIT=y +# CONFIG_IMA is not set +# CONFIG_EVM is not set +# CONFIG_DEFAULT_SECURITY_SELINUX is not set +# CONFIG_DEFAULT_SECURITY_APPARMOR is not set CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_DEFAULT_SECURITY="" CONFIG_XOR_BLOCKS=m @@ -9410,7 +9441,7 @@ CONFIG_CRYPTO_RMD256=m CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_TGR192=m @@ -9440,7 +9471,7 @@ CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_SERPENT_SSE2_586=m CONFIG_CRYPTO_SM4=m -CONFIG_CRYPTO_SPECK=m +# CONFIG_CRYPTO_SPECK is not set CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH_COMMON=m @@ -9505,6 +9536,7 @@ CONFIG_SIGNED_PE_FILE_VERIFICATION=y # # Certificates for signature checking # +CONFIG_MODULE_SIG_KEY="certs/signing_key.pem" CONFIG_SYSTEM_TRUSTED_KEYRING=y CONFIG_SYSTEM_TRUSTED_KEYS="" # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set @@ -9563,6 +9595,7 @@ CONFIG_CRC7=m CONFIG_LIBCRC32C=m CONFIG_CRC8=m CONFIG_XXHASH=m +CONFIG_AUDIT_GENERIC=y # CONFIG_RANDOM32_SELFTEST is not set CONFIG_842_COMPRESS=m CONFIG_842_DECOMPRESS=m -- cgit v1.2.3-70-g09d2 From d2e2ecaa1c18c47f29e588e602a6c10adc534692 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 27 Sep 2018 08:02:40 +0200 Subject: core/btrfs-progs: removed empty PKGBUILD and FS#58237.patch is uptream already --- core/btrfs-progs/FS#58237.patch | 16 ---------------- core/btrfs-progs/PKGBUILD | 0 2 files changed, 16 deletions(-) delete mode 100644 core/btrfs-progs/FS#58237.patch delete mode 100644 core/btrfs-progs/PKGBUILD (limited to 'core') diff --git a/core/btrfs-progs/FS#58237.patch b/core/btrfs-progs/FS#58237.patch deleted file mode 100644 index 21a11fc3..00000000 --- a/core/btrfs-progs/FS#58237.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/utils.c b/utils.c -index e9cb3a82f..f867e5a7f 100644 ---- a/utils.c -+++ b/utils.c -@@ -2484,11 +2484,6 @@ const char *subvol_strip_mountpoint(const char *mnt, const char *full_path) - if (!len) - return full_path; - -- if ((strncmp(mnt, full_path, len) != 0) || (full_path[len] != '/')) { -- error("not on mount point: %s", mnt); -- exit(1); -- } -- - if (mnt[len - 1] != '/') - len += 1; - diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD deleted file mode 100644 index e69de29b..00000000 -- cgit v1.2.3-70-g09d2 From 0c6e0b9097f9b53dd6ced279df0105c64af79fb6 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 27 Sep 2018 08:03:50 +0200 Subject: core/dbus: temporary i486 fix (no documentation) --- core/dbus/PKGBUILD | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 core/dbus/PKGBUILD (limited to 'core') diff --git a/core/dbus/PKGBUILD b/core/dbus/PKGBUILD new file mode 100644 index 00000000..f2ad0e68 --- /dev/null +++ b/core/dbus/PKGBUILD @@ -0,0 +1,16 @@ +# i486-specific +if [ "${CARCH}" = "i486" ]; then + # no documentation + makedepends=(${makedepends[@]//docbook-xsl/}) + makedepends=(${makedepends[@]//yelp-tools/}) + makedepends=(${makedepends[@]//doxygen/}) + makedepends=(${makedepends[@]//graphviz/}) + + eval "$( + declare -f build | \ + sed ' + s/configure/configure --disable-xml-docs --disable-doxygen-docs --disable-ducktype-docs/ + ' + )" +fi + -- cgit v1.2.3-70-g09d2 From aab40ae9a019d2a96971239f7ef6c45f21d42c9a Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 27 Sep 2018 08:08:53 +0200 Subject: core/gpgme: disable bindings and qt5 dependencies for i486 --- core/gpgme/PKGBUILD | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 core/gpgme/PKGBUILD (limited to 'core') diff --git a/core/gpgme/PKGBUILD b/core/gpgme/PKGBUILD new file mode 100644 index 00000000..f35e9323 --- /dev/null +++ b/core/gpgme/PKGBUILD @@ -0,0 +1,23 @@ +# i486-specific +if [ "${CARCH}" = "i486" ]; then + # we only build the library + pkgname=(gpgme) + + # no Qt library + makedepends=(${makedepends[@]//qt5-base/}) + + # no language bindings + makedepends=(${makedepends[@]//swig/}) + eval "$( + declare -f build | \ + sed ' + s@./configure@./configure --enable-languages=no@ + ' + )" + eval "$( + declare -f package_gpgme | \ + sed ' + /rm /d + ' + )" +fi -- cgit v1.2.3-70-g09d2 From 4a24158dc5a9bc39f93bab43fc0d121f85b52c09 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 27 Sep 2018 09:13:13 +0200 Subject: core/kbd: download links are fixed upstream --- core/kbd/PKGBUILD | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 core/kbd/PKGBUILD (limited to 'core') diff --git a/core/kbd/PKGBUILD b/core/kbd/PKGBUILD deleted file mode 100644 index 07c900a8..00000000 --- a/core/kbd/PKGBUILD +++ /dev/null @@ -1,3 +0,0 @@ -# we still get the FTP links, though trunk uses the proper URLs?! -source[0]=https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgname}-${pkgver}.tar.gz -source[1]=https://www.kernel.org/pub/linux/utils/kbd/${pkgname}-${pkgver}.tar.sign -- cgit v1.2.3-70-g09d2 From 5d25a1a812a8c6d05f54a10c0c5c770ab30be975 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 27 Sep 2018 09:18:26 +0200 Subject: core/krb5: removed download location patch (FS#59284) --- core/krb5/PKGBUILD | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 core/krb5/PKGBUILD (limited to 'core') diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD deleted file mode 100644 index 66407452..00000000 --- a/core/krb5/PKGBUILD +++ /dev/null @@ -1,3 +0,0 @@ -# reported as FS#59284 -source[0]="https://kerberos.org/dist/krb5/1.16/${pkgname}-${pkgver}.tar.gz" -source[1]="https://kerberos.org/dist/krb5/1.16/${pkgname}-${pkgver}.tar.gz.asc" -- cgit v1.2.3-70-g09d2 From ed7192fa90ced459e89183b0bbe59e4caaae8270 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 29 Sep 2018 10:25:20 +0200 Subject: core/systemd: fix for FS#60239 (debug option collition with meson) --- core/systemd/PKGBUILD | 9 ++++++++ .../meson-rename-Ddebug-to-Ddebug-extra.patch | 26 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 core/systemd/PKGBUILD create mode 100644 core/systemd/meson-rename-Ddebug-to-Ddebug-extra.patch (limited to 'core') diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD new file mode 100644 index 00000000..02cee487 --- /dev/null +++ b/core/systemd/PKGBUILD @@ -0,0 +1,9 @@ +source+=('meson-rename-Ddebug-to-Ddebug-extra.patch') +sha512sums+=('d310e7ea099bd371eb12fb4f474f1518ddc1013612d6a53c3f5777e6a3509eb58c4b5989d31bb04784be70db5d8ca39bff47414456c3fe322194cd7b341ae70c') + +eval "$( + declare -f prepare | \ + sed ' + /patch.*0001.*/a patch -Np1 -i ../meson-rename-Ddebug-to-Ddebug-extra.patch + ' +)" diff --git a/core/systemd/meson-rename-Ddebug-to-Ddebug-extra.patch b/core/systemd/meson-rename-Ddebug-to-Ddebug-extra.patch new file mode 100644 index 00000000..12607f2a --- /dev/null +++ b/core/systemd/meson-rename-Ddebug-to-Ddebug-extra.patch @@ -0,0 +1,26 @@ +diff --git a/meson.build b/meson.build +index 88a470a..1d864e3 100644 +--- a/meson.build ++++ b/meson.build +@@ -765,7 +765,7 @@ substs.set('DEBUGTTY', get_option('debug-tty')) + + enable_debug_hashmap = false + enable_debug_mmap_cache = false +-foreach name : get_option('debug') ++foreach name : get_option('debug-extra') + if name == 'hashmap' + enable_debug_hashmap = true + elif name == 'mmap-cache' +diff --git a/meson_options.txt b/meson_options.txt +index 16c1f2b..dc7951b 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -46,7 +46,7 @@ option('debug-shell', type : 'string', value : '/bin/sh', + description : 'path to debug shell binary') + option('debug-tty', type : 'string', value : '/dev/tty9', + description : 'specify the tty device for debug shell') +-option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], ++option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], + description : 'enable extra debugging') + option('memory-accounting-default', type : 'boolean', + description : 'enable MemoryAccounting= by default') -- cgit v1.2.3-70-g09d2 From 5752df693f7d20139680ec947136c687de4532dd Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Sun, 30 Sep 2018 20:32:49 +0200 Subject: linux: new config + use tarballer --- core/linux/PKGBUILD | 61 +++++++++++++++++++++++++++++++++++++++++++++++++- core/linux/config.i686 | 2 +- 2 files changed, 61 insertions(+), 2 deletions(-) (limited to 'core') diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD index 6254ac8e..3c60539e 100644 --- a/core/linux/PKGBUILD +++ b/core/linux/PKGBUILD @@ -4,7 +4,7 @@ for ((i=0; i<${#sha256sums[@]}; i++)); do if [ "${sha256sums[${i}]}" = '1fc23bd2613b821d8bdca1a33dc421e21de296221108ce047176d27d37ce397f' ]; then source_i686=('config.i686') - sha256sums_i686=('fc137a9706f7b1e2f9deb49f3a750834320fceee0944ce584e2c4341bb9ca2c6') + sha256sums_i686=('60e271f357e05ced3767c39cd5e49ad3b1cfdae6162846455ea375d224a6e764') source_i486=('config.i486') sha256sums_i486=('08f9a17d9237ddeea7b2612b72c4f86b1929532e9e3c9ba7d1fab86bc7b432e0') fi @@ -24,3 +24,62 @@ eval "$( } ' )" + +# use our tarballer instead of cloning from git +for ((i=0; i<${#source[@]}; i++)); do + infos=$( + printf '%s\n' "${source[${i}]}" | \ + sed -n ' + s@^\(\([^:]\+\)::\)\?\(git\|hg\)+\([^#?]\+\)\(?signed\)\?#\(\(tag\|commit\)=\S\+\)$@\3 \2 \4 \5 \6@ + T + p + ' + ) + if [ -n "${infos}" ]; then + source[${i}]=$( + type="${infos%% *}" + infos="${infos#* }" + if [ -n "${infos%% *}" ]; then + prefix="${infos%% *}" + else + prefix='' + fi + infos="${infos#* }" + repo="${infos%% *}" + repo64=$( + printf '%s' "${repo}" | \ + base64 -w0 | \ + sed 's/=/%3D/g' + ) + infos="${infos#* }" + if [ "${infos%% *}" = '?signed' ]; then + key_check=$( + printf '&valid_keys=' + printf '%s,' "${validpgpkeys[@]}" | \ + sed 's/,$//' + ) + else + key_check='' + fi + infos="${infos#* }" + if [ -z "${prefix}" ]; then + prefix="${repo%.git}" + prefix="${prefix##*/}" + fi + prefix_64=$( + printf '%s/' "${prefix}" | \ + base64 -w0 | \ + sed 's/=/%3D/g' + ) + + printf '%s-%s.tar.gz::https://archive-server.archlinux32.org/?t=%s&p=%s&r=%s%s&%s\n' \ + "${prefix}" \ + "${pkgver}" \ + "${type}" \ + "${prefix_64}" \ + "${repo64}" \ + "${key_check}" \ + "${infos}" + ) + fi +done diff --git a/core/linux/config.i686 b/core/linux/config.i686 index 1c811e9b..f2938cd9 100644 --- a/core/linux/config.i686 +++ b/core/linux/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.18.9-arch1 Kernel Configuration +# Linux/x86 4.18.10-arch1 Kernel Configuration # # -- cgit v1.2.3-70-g09d2