summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-01-21 10:11:03 +0100
committerErich Eckner <git@eckner.net>2019-01-21 10:11:03 +0100
commit250a3c2cbfd9a5b1ec17b6d5b9d5bf2c5949b6ab (patch)
tree48355a6e5a9217837376c2aaca402c72f217dc20
parent38f945d190be4e07b1613a42536b85b513658006 (diff)
parentd1ca62e03b8427d4c3e8bad6350df4321c3951d2 (diff)
downloadpackages-250a3c2cbfd9a5b1ec17b6d5b9d5bf2c5949b6ab.tar.xz
Merge branch 'master' into i486
-rw-r--r--community/rust/PKGBUILD9
-rw-r--r--community/rust/config.toml.patch9
-rw-r--r--community/stratisd/PKGBUILD6
-rw-r--r--core/linux-lts/PKGBUILD6
-rw-r--r--core/linux-lts/config5
-rw-r--r--core/linux/PKGBUILD8
-rw-r--r--core/linux/config.i4868
-rw-r--r--core/linux/config.i6868
-rw-r--r--extra/firefox/PKGBUILD7
-rw-r--r--extra/firefox/mozconfig.patch20
-rw-r--r--extra/lightdm/PKGBUILD7
-rw-r--r--extra/linux-pae/PKGBUILD6
-rw-r--r--extra/linux-pae/config2
-rw-r--r--extra/linux-zen/PKGBUILD6
-rw-r--r--extra/linux-zen/config13
-rw-r--r--extra/nasm/0001-Remove-invalid-pure_func-qualifiers.patch27
-rw-r--r--extra/nasm/PKGBUILD8
17 files changed, 89 insertions, 66 deletions
diff --git a/community/rust/PKGBUILD b/community/rust/PKGBUILD
new file mode 100644
index 0000000..221bfd4
--- /dev/null
+++ b/community/rust/PKGBUILD
@@ -0,0 +1,9 @@
+source+=(config.toml.patch)
+sha256sums+=('55d59786b6a24590951688c01910ac331996fc5ea5e20f10d227db24b93b1e74')
+
+eval "$(
+ declare -f prepare | \
+ sed '
+ $ i patch -p1 -i "$srcdir/config.toml.patch"
+ '
+)"
diff --git a/community/rust/config.toml.patch b/community/rust/config.toml.patch
new file mode 100644
index 0000000..f479499
--- /dev/null
+++ b/community/rust/config.toml.patch
@@ -0,0 +1,9 @@
+--- a/config.toml 2019-01-20 19:03:26.718067950 +0100
++++ b/config.toml 2019-01-20 19:03:52.614834201 +0100
+@@ -25,3 +25,6 @@
+
+ [target.x86_64-unknown-linux-gnu]
+ llvm-config = "/usr/bin/llvm-config"
++
++[target.i686-unknown-linux-gnu]
++llvm-config = "/usr/bin/llvm-config"
diff --git a/community/stratisd/PKGBUILD b/community/stratisd/PKGBUILD
new file mode 100644
index 0000000..b0518fe
--- /dev/null
+++ b/community/stratisd/PKGBUILD
@@ -0,0 +1,6 @@
+eval "$(
+ declare -f build | \
+ sed '
+ 2 a export TARGET="${CARCH}-unknown-linux-gnu"
+ '
+)"
diff --git a/core/linux-lts/PKGBUILD b/core/linux-lts/PKGBUILD
index c1e9e56..6d5b41f 100644
--- a/core/linux-lts/PKGBUILD
+++ b/core/linux-lts/PKGBUILD
@@ -1,9 +1,9 @@
-# upstream git revision: f0405d5a2107347d1a1a9779c70ed0007f0e0d36
+# upstream git revision: 239cfc1c7c6aad6e5996b7e0e6488d611b9d7283
# fail if upstream's .config changes
for ((i=0; i<${#sha256sums[@]}; i++)); do
- if [ "${sha256sums[${i}]}" = 'd0f62ce948ad58b96fea316b9cf1f08193c6b56e0ca4901d382494a071865dfd' ]; then
- sha256sums[${i}]='8a0459f6f03f7fab9a7d4f8bcdcb6b0fcbacdb21e465a1f3e87405e645223cf7'
+ if [ "${sha256sums[${i}]}" = '2dbe737dd5d186ca0b3b1753ad3d7a4a722b3eb03ec224dc24b49dd491c18cf1' ]; then
+ sha256sums[${i}]='7e1cd47b0f1607b255a06e77968275dc81f93ead08df463dfe3d7f007fa1531a'
fi
done
diff --git a/core/linux-lts/config b/core/linux-lts/config
index 18d0c5a..1eae217 100644
--- a/core/linux-lts/config
+++ b/core/linux-lts/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.13-1 Kernel Configuration
+# Linux/x86 4.19.16-1 Kernel Configuration
#
#
@@ -5971,6 +5971,7 @@ CONFIG_DRM_KMS_HELPER=m
CONFIG_DRM_KMS_FB_HELPER=y
CONFIG_DRM_FBDEV_EMULATION=y
CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM_DP_CEC=y
CONFIG_DRM_TTM=m
@@ -7259,10 +7260,10 @@ CONFIG_TYPEC_MUX_PI3USB30532=m
# USB Type-C Alternate Mode drivers
#
CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_USB_ROLE_SWITCH=m
CONFIG_USB_ROLES_INTEL_XHCI=m
CONFIG_USB_LED_TRIG=y
CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_ROLE_SWITCH=m
CONFIG_UWB=m
CONFIG_UWB_HWA=m
CONFIG_UWB_WHCI=m
diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD
index 692c6ad..9346e3e 100644
--- a/core/linux/PKGBUILD
+++ b/core/linux/PKGBUILD
@@ -1,12 +1,12 @@
-# upstream git revision: fb4c47a088b60d47933a0ca736a856a3ed6b80a2
+# upstream git revision: 409fb3f6d729c6bb78d9df1238165c800ba2eaba
source_i686=('config.i686')
source_i486=('config.i486')
# fail if upstream's .config changes
for ((i=0; i<${#sha256sums[@]}; i++)); do
- if [ "${sha256sums[${i}]}" = '3f72b50a40e98737a6195b6d2b3c8c301007d40730bc4ec37fdf9e57dceb6fb9' ]; then
- sha256sums_i686=('d8b66204940d6ec85cb99efb259454f92241aefa360a1603094e93d856746334')
- sha256sums_i486=('8c9a5b9706ae732cc941272ea96d80b14ed748016241e44e96b3ce79b1839415')
+ if [ "${sha256sums[${i}]}" = 'f863b3e9640161f61e859f22f2d1258c940101de8f007a207c1ede2f71d36206' ]; then
+ sha256sums_i686=('8a724a44a80fa2211cec89fa2e3908942f5e1cee1436c4f96cf7d692b32103a5')
+ sha256sums_i486=('fa296815a7e7246e5bf9bd014aa46809726016b0d0f385e92143eed147c50137')
fi
done
diff --git a/core/linux/config.i486 b/core/linux/config.i486
index 73ae148..1550d90 100644
--- a/core/linux/config.i486
+++ b/core/linux/config.i486
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.20.0-arch1 Kernel Configuration
+# Linux/x86 4.20.3-arch1 Kernel Configuration
#
#
@@ -886,7 +886,7 @@ CONFIG_MODULES=y
CONFIG_MODULE_FORCE_LOAD=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
+# CONFIG_MODVERSIONS is not set
CONFIG_MODULE_SRCVERSION_ALL=y
CONFIG_MODULE_SIG=y
# CONFIG_MODULE_SIG_FORCE is not set
@@ -7246,10 +7246,10 @@ CONFIG_TYPEC_TPS6598X=m
# USB Type-C Alternate Mode drivers
#
CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_USB_ROLE_SWITCH=m
# CONFIG_USB_ROLES_INTEL_XHCI is not set
CONFIG_USB_LED_TRIG=y
CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_ROLE_SWITCH=m
CONFIG_UWB=m
CONFIG_UWB_HWA=m
CONFIG_UWB_WHCI=m
@@ -9270,7 +9270,7 @@ CONFIG_CRYPTO_CBC=m
# CONFIG_CRYPTO_CFB is not set
CONFIG_CRYPTO_CTR=y
CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_ECB=m
CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_OFB=m
CONFIG_CRYPTO_PCBC=m
diff --git a/core/linux/config.i686 b/core/linux/config.i686
index a41c1ec..450ac30 100644
--- a/core/linux/config.i686
+++ b/core/linux/config.i686
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.20.0-arch1 Kernel Configuration
+# Linux/x86 4.20.3-arch1 Kernel Configuration
#
#
@@ -890,7 +890,7 @@ CONFIG_MODULES=y
CONFIG_MODULE_FORCE_LOAD=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
+# CONFIG_MODVERSIONS is not set
CONFIG_MODULE_SRCVERSION_ALL=y
CONFIG_MODULE_SIG=y
# CONFIG_MODULE_SIG_FORCE is not set
@@ -7294,10 +7294,10 @@ CONFIG_TYPEC_MUX_PI3USB30532=m
# USB Type-C Alternate Mode drivers
#
CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_USB_ROLE_SWITCH=m
CONFIG_USB_ROLES_INTEL_XHCI=m
CONFIG_USB_LED_TRIG=y
CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_ROLE_SWITCH=m
CONFIG_UWB=m
CONFIG_UWB_HWA=m
CONFIG_UWB_WHCI=m
@@ -9351,7 +9351,7 @@ CONFIG_CRYPTO_CBC=m
CONFIG_CRYPTO_CFB=m
CONFIG_CRYPTO_CTR=y
CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_ECB=m
CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_OFB=m
CONFIG_CRYPTO_PCBC=m
diff --git a/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD
index 81c2608..f886c6a 100644
--- a/extra/firefox/PKGBUILD
+++ b/extra/firefox/PKGBUILD
@@ -1,12 +1,15 @@
+source+=('mozconfig.patch')
+sha256sums+=('a9f99789801106d82ec48839d25c0b3358f6641a55d20b4d686f10197b14322d')
eval "$(
declare -f build | \
sed '
- /cd mozilla-unified/a sed -i "s/\\(cargo_rustc_flags += -C lto\\)/#\\1/" config/rules.mk
+ 2 a export RUSTFLAGS+=" -Cdebuginfo=0 -Clto=off"
+ 2 a export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
'
declare -f prepare | \
sed '
$ i export MOZ_SOURCE_CHANGESET="DEVEDITION_${pkgver//./_}_RELEASE"
- $ i LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+ $ i patch -p1 -i "$srcdir/mozconfig.patch"
'
)"
for ((i=0; i<${#source[@]}; i++)); do
diff --git a/extra/firefox/mozconfig.patch b/extra/firefox/mozconfig.patch
new file mode 100644
index 0000000..d36e553
--- /dev/null
+++ b/extra/firefox/mozconfig.patch
@@ -0,0 +1,20 @@
+--- a/.mozconfig 2019-01-21 09:21:00.221010326 +0100
++++ b/.mozconfig 2019-01-21 09:22:02.477911431 +0100
+@@ -6,12 +6,11 @@
+ ac_add_options --enable-optimize
+ ac_add_options --enable-rust-simd
+ ac_add_options --enable-lto
+-export MOZ_PGO=1
+-export CC=clang
+-export CXX=clang++
+-export AR=llvm-ar
+-export NM=llvm-nm
+-export RANLIB=llvm-ranlib
++export CC=gcc
++export CXX=g++
++export AR=gcc-ar
++export NM=gcc-nm
++export RANLIB=gcc-ranlib
+
+ # Branding
+ ac_add_options --enable-official-branding
diff --git a/extra/lightdm/PKGBUILD b/extra/lightdm/PKGBUILD
new file mode 100644
index 0000000..415ddd3
--- /dev/null
+++ b/extra/lightdm/PKGBUILD
@@ -0,0 +1,7 @@
+eval "$(
+ declare -f package_lightdm | \
+ sed '
+ /install.*lightdm.service/ a \
+ sed -i \"/.*Service.*/ a LimitMEMLOCK=infinity\" "${pkgdir}"/usr/lib/systemd/system/lightdm.service
+ '
+)"
diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD
index 2fc4126..7fae952 100644
--- a/extra/linux-pae/PKGBUILD
+++ b/extra/linux-pae/PKGBUILD
@@ -4,7 +4,7 @@
# Maintainer: Thomas Baechler <thomas@archlinux.org>
pkgbase=linux-pae # Build stock -ARCH kernel
-pkgver='4.20.1'
+pkgver='4.20.3'
_srcname=linux-${pkgver}
pkgrel='1'
arch=('i686')
@@ -24,9 +24,9 @@ validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-sha256sums=('45096f1ffbfbb4cdeef6eecfa6ca7eabbf534f04645fd0d849564a58ddd2198f'
+sha256sums=('b9c1bd128404a8e73b57f764256fcaca8eb09f9a892e292856dbeffafa187f45'
'SKIP'
- 'b5f3d1a14dce62f52c6cf4efb67751cc6080515b2c969912f724e280b9b78060'
+ 'a0ee4ea4736117b4e2e4c47edbfe5870777d3b543ccf7040d8b7a1a7ecc08419'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
diff --git a/extra/linux-pae/config b/extra/linux-pae/config
index e09adaa..4084a26 100644
--- a/extra/linux-pae/config
+++ b/extra/linux-pae/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.20.1-1 Kernel Configuration
+# Linux/x86 4.20.3-1 Kernel Configuration
#
#
diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD
index 6bb4429..70b1e14 100644
--- a/extra/linux-zen/PKGBUILD
+++ b/extra/linux-zen/PKGBUILD
@@ -1,9 +1,9 @@
-# upstream git revision: fb4c47a088b60d47933a0ca736a856a3ed6b80a2
+# upstream git revision: 409fb3f6d729c6bb78d9df1238165c800ba2eaba
# fail if upstream's .config changes
for ((i=0; i<${#sha256sums[@]}; i++)); do
- if [ "${sha256sums[${i}]}" = '071bdc3d814a56a80c4e40301bcd518662bd9374d6f73b1c9a97b705c5c82bc0' ]; then
- sha256sums[${i}]='d71c3aed22dca41b2398d187e2f30427b6f8643fcc16006bac46c11e9ff8f6f1'
+ if [ "${sha256sums[${i}]}" = 'bdf972dad118e0dd2ee1bb92f2a009d4c81eb11ff7f54b069d4331a23531af1d' ]; then
+ sha256sums[${i}]='e845b79f1110f1a6fc29b04d0cb6b3248eb0ef4765dbd97341bbe23744bdea3d'
fi
done
diff --git a/extra/linux-zen/config b/extra/linux-zen/config
index c5cbfe9..b8566dd 100644
--- a/extra/linux-zen/config
+++ b/extra/linux-zen/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.20.0-zen1 Kernel Configuration
+# Linux/x86 4.20.3-zen1 Kernel Configuration
#
#
@@ -17,6 +17,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
# General setup
#
CONFIG_ZEN_INTERACTIVE=y
+# CONFIG_SCHED_MUQSS is not set
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
CONFIG_LOCALVERSION="-zen"
@@ -65,6 +66,7 @@ CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_IRQ_FORCED_THREADING_DEFAULT=y
CONFIG_SPARSE_IRQ=y
# CONFIG_GENERIC_IRQ_DEBUGFS is not set
CONFIG_CLOCKSOURCE_WATCHDOG=y
@@ -379,6 +381,8 @@ CONFIG_NR_CPUS=8
CONFIG_SCHED_SMT=y
CONFIG_SCHED_MC=y
CONFIG_SCHED_MC_PRIO=y
+CONFIG_RQ_NONE=y
+CONFIG_SHARERQ=0
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
@@ -915,7 +919,7 @@ CONFIG_MODULES=y
CONFIG_MODULE_FORCE_LOAD=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
+# CONFIG_MODVERSIONS is not set
CONFIG_MODULE_SRCVERSION_ALL=y
CONFIG_MODULE_SIG=y
# CONFIG_MODULE_SIG_FORCE is not set
@@ -2413,7 +2417,6 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=m
CONFIG_SCSI_DMA=y
CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_MQ_DEFAULT=y
CONFIG_SCSI_PROC_FS=y
#
@@ -7313,10 +7316,10 @@ CONFIG_TYPEC_MUX_PI3USB30532=m
# USB Type-C Alternate Mode drivers
#
CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_USB_ROLE_SWITCH=m
CONFIG_USB_ROLES_INTEL_XHCI=m
CONFIG_USB_LED_TRIG=y
CONFIG_USB_ULPI_BUS=m
-CONFIG_USB_ROLE_SWITCH=m
CONFIG_UWB=m
CONFIG_UWB_HWA=m
CONFIG_UWB_WHCI=m
@@ -9372,7 +9375,7 @@ CONFIG_CRYPTO_CBC=m
CONFIG_CRYPTO_CFB=m
CONFIG_CRYPTO_CTR=y
CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_ECB=m
CONFIG_CRYPTO_LRW=m
CONFIG_CRYPTO_OFB=m
CONFIG_CRYPTO_PCBC=m
diff --git a/extra/nasm/0001-Remove-invalid-pure_func-qualifiers.patch b/extra/nasm/0001-Remove-invalid-pure_func-qualifiers.patch
deleted file mode 100644
index 87ec601..0000000
--- a/extra/nasm/0001-Remove-invalid-pure_func-qualifiers.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d0dabb46a821b2506681f882af0d5696d2c2bade Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Thu, 8 Feb 2018 14:47:08 +0100
-Subject: [PATCH] Remove invalid pure_func qualifiers
-
----
- include/nasmlib.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/nasmlib.h b/include/nasmlib.h
-index 79e866b..c93cef0 100644
---- a/include/nasmlib.h
-+++ b/include/nasmlib.h
-@@ -191,8 +191,8 @@ int64_t readstrnum(char *str, int length, bool *warn);
- * seg_init: Initialise the segment-number allocator.
- * seg_alloc: allocate a hitherto unused segment number.
- */
--void pure_func seg_init(void);
--int32_t pure_func seg_alloc(void);
-+void seg_init(void);
-+int32_t seg_alloc(void);
-
- /*
- * many output formats will be able to make use of this: a standard
---
-2.14.3
-
diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD
index 7af19ef..f1a34d1 100644
--- a/extra/nasm/PKGBUILD
+++ b/extra/nasm/PKGBUILD
@@ -1,11 +1,3 @@
-# see FS#60380
-source+=('0001-Remove-invalid-pure_func-qualifiers.patch')
-sha512sums+=('3bf974c067d16144d1457c0ef4d63bab511e6949923338cc7555169b297617ed0ec3de5825faf85afd5da735aa46f7d2e603319badead7e8bc1f6a4d58f1bd2d')
-prepare() {
- cd $pkgname-$pkgver
- patch -Np1 -i "$srcdir/0001-Remove-invalid-pure_func-qualifiers.patch"
-}
-
# remove ttf-liberation on i486 (X packages missing for installing the font)
makedepends=(${makedepends[@]//ttf-liberation/})
makedepends_i686+=(ttf-liberation)