summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2018-06-25 21:12:30 -0400
committerDavid P <megver83@parabola.nu>2018-06-25 21:12:30 -0400
commitaec092ced4ae422d7b4bb4afe69f5a45b66dcdca (patch)
tree297502d292a00a0b3e9e46705ed2f8680d6b7046
parent398eaae14c1cd45286c6f01ad252c562a2dc126b (diff)
downloadabslibre-aec092ced4ae422d7b4bb4afe69f5a45b66dcdca.tar.gz
abslibre-aec092ced4ae422d7b4bb4afe69f5a45b66dcdca.tar.bz2
abslibre-aec092ced4ae422d7b4bb4afe69f5a45b66dcdca.zip
linux-libre-pck: disable tuxonice on x86_64
could not find a way to fix this :'( Signed-off-by: David P <megver83@parabola.nu>
-rw-r--r--libre/linux-libre-pck/PKGBUILD9
-rw-r--r--libre/linux-libre-pck/config.x86_6424
2 files changed, 2 insertions, 31 deletions
diff --git a/libre/linux-libre-pck/PKGBUILD b/libre/linux-libre-pck/PKGBUILD
index c6210bffc..5060570a7 100644
--- a/libre/linux-libre-pck/PKGBUILD
+++ b/libre/linux-libre-pck/PKGBUILD
@@ -78,7 +78,7 @@ sha512sums=('a09014005d64839e958cabb20dbd50e051907b1afea2f517f41f0a9312fa1bc8447
'7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78'
'SKIP'
'8481004fc8bc75ac9cbca943ef9533f8d62c89c2084912c88bb8819ed1f3ebf49ddbad0a48bf6e32b5fe0189735a81b4c6855ed57bb4e1590c3a0fa9e2a3d722'
- 'c11e3a1d7938cc3af87f46b10bbf90496d006a54af7541475e1f711cb79c930781500877f70a86f4ab051dd16bc4b7e0e5ebabec0798a64d730c13190d4d8e82'
+ '0f861fa05e1ce0f06107551e72b7d0eace144d841903d6c4e43aa488b9cfd8db0bbdea38bd2be780f82d020240b69fd50f3903c32f364f23ae472658df299cba'
'0e85482ec0c4f2adecbc3cdfddae26b8666477bb85cadfa21e21472c82ac1798af5f0d98009ae73b8aa3530360c6e2bcf9b64f10af05e3db3ad2d0f2017399be'
'7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
'4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
@@ -122,13 +122,6 @@ prepare() {
# add PCK patch
patch -p1 -i ../patch-${_pkgver}-${_pckpatchver}.patch
- if [ "${CARCH}" = "x86_64" ]; then
- # workaround to fix tuxonice_builtin.c warnings being treated as errors
- sed -i \
- 's|sys_open|ksys_open|;s|sys_ioctl|ksys_ioctl|;s|sys_read|ksys_read|;s|sys_close|ksys_close|' \
- kernel/power/tuxonice_builtin.c
- fi
-
if [ "${CARCH}" = "armv7h" ]; then
# RCN patch (CM3 firmware deblobbed and AUFS/WireGuard removed)
# Note: For stability reasons, AUFS has been removed in the RCN patch.
diff --git a/libre/linux-libre-pck/config.x86_64 b/libre/linux-libre-pck/config.x86_64
index cb2110174..5d70d1413 100644
--- a/libre/linux-libre-pck/config.x86_64
+++ b/libre/linux-libre-pck/config.x86_64
@@ -733,29 +733,7 @@ CONFIG_SUSPEND_FREEZER=y
CONFIG_HIBERNATE_CALLBACKS=y
CONFIG_HIBERNATION=y
CONFIG_PM_STD_PARTITION=""
-CONFIG_TOI_CORE=y
-
-#
-# Image Storage (you need at least one allocator)
-#
-CONFIG_TOI_FILE=y
-CONFIG_TOI_SWAP=y
-
-#
-# General Options
-#
-CONFIG_TOI_CRYPTO=y
-CONFIG_TOI_USERUI=y
-CONFIG_TOI_USERUI_DEFAULT_PATH="/usr/local/sbin/tuxoniceui_text"
-CONFIG_TOI_DEFAULT_IMAGE_SIZE_LIMIT=-2
-# CONFIG_TOI_KEEP_IMAGE is not set
-CONFIG_TOI_REPLACE_SWSUSP=y
-# CONFIG_TOI_IGNORE_LATE_INITCALL is not set
-CONFIG_TOI_DEFAULT_WAIT=25
-CONFIG_TOI_DEFAULT_EXTRA_PAGES_ALLOWANCE=2000
-# CONFIG_TOI_CHECKSUM is not set
-CONFIG_TOI=y
-CONFIG_TOI_ZRAM_SUPPORT=y
+# CONFIG_TOI_CORE is not set
CONFIG_PM_SLEEP=y
CONFIG_PM_SLEEP_SMP=y
CONFIG_PM_AUTOSLEEP=y