summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-02-13 19:24:08 -0600
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-02-13 19:24:08 -0600
commitf0f502d7f40111271a70815a3e5c3dbd0935fe54 (patch)
tree623564913d58074fc5e6b47c1d87ca36dded2722 /system
parent1377839255595ae4d2b493ad0c7d42e5e6afcb64 (diff)
downloadpackages-f0f502d7f40111271a70815a3e5c3dbd0935fe54.tar.gz
packages-f0f502d7f40111271a70815a3e5c3dbd0935fe54.tar.bz2
packages-f0f502d7f40111271a70815a3e5c3dbd0935fe54.tar.xz
packages-f0f502d7f40111271a70815a3e5c3dbd0935fe54.zip
system/easy-kernel: enter mc3 (ppc only)
Diffstat (limited to 'system')
-rw-r--r--system/easy-kernel/APKBUILD42
-rw-r--r--system/easy-kernel/config-ppc21
-rw-r--r--system/easy-kernel/config-ppc645
3 files changed, 50 insertions, 18 deletions
diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD
index 75b891551..cff5f365a 100644
--- a/system/easy-kernel/APKBUILD
+++ b/system/easy-kernel/APKBUILD
@@ -1,17 +1,20 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
-pkgname=easy-kernel
-pkgver=4.14.8
-pkgrel=2
+_pkgname=easy-kernel
+pkgver=4.14.12
+pkgrel=3
+pkgname=$_pkgname-$pkgver-mc$pkgrel
pkgdesc="The Linux kernel, packaged for your convenience"
url="https://kernel.org/"
arch="all"
options="!check !dbg !strip"
license="GPL-2.0"
depends=""
-makedepends="lzop openssl-dev"
+makedepends="gzip lzop openssl-dev xz"
install=""
-subpackages="$pkgname-modules"
+provides="easy-kernel=$pkgver-r$pkgrel"
+subpackages="$_pkgname-modules-$pkgver-mc$pkgrel:modules
+ $_pkgname-src-$pkgver-mc$pkgrel:src"
source="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
https://mirrormaster.adelielinux.org/source/linux-4.14-mc$pkgrel.patch.xz
config-ppc64
@@ -42,22 +45,43 @@ package() {
make INSTALL_PATH="$pkgdir"/boot \
INSTALL_MOD_PATH="$pkgdir" \
install modules_install
+
+ if [ -f "$pkgdir"/boot/vmlinuz ]; then
+ mv "$pkgdir"/boot/vmlinuz \
+ "$pkgdir"/boot/vmlinuz-$pkgver-mc$pkgrel-easy
+ fi
+ if [ -f "$pkgdir"/boot/vmlinux ]; then
+ mv "$pkgdir"/boot/vmlinux \
+ "$pkgdir"/boot/vmlinux-$pkgver-mc$pkgrel-easy
+ fi
+
+ install -D "$builddir"/include/config/kernel.release \
+ "$pkgdir"/usr/share/kernel/easy-$pkgver-mc$pkgrel/kernel.release
}
modules() {
pkgdesc="Modules / device drivers for easy-kernel"
+ provides="easy-kernel-modules=$pkgver-r$pkgrel"
+ autodeps=0 # modules should not depend on src just for symlink
mkdir -p "$subpkgdir"/lib
mv "$pkgdir"/lib/modules "$subpkgdir"/lib/
+ rm "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy/build
+ rm "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy/source
+ ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel" \
+ "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy/build
+ ln -s "../../../usr/src/linux-$pkgver-mc$pkgrel" \
+ "$subpkgdir"/lib/modules/$pkgver-mc$pkgrel-easy/source
}
src() {
- pkgdesc="Kernel source code used to build THIS kernel"
+ pkgdesc="Kernel source code used to build the kernel"
+ provides="easy-kernel-src=$pkgver-r$pkgrel"
mkdir -p "$subpkgdir"/usr/src
- mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux
+ mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux-$pkgver-mc$pkgrel
}
sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz
-ea893dbb34129691d766cd2a80319448a99d022474878147cc90da4bf7364f747e1d2a68bc5cd70e701bccb5f5ba48d628678cd4d95afbdb9b0c128137e1c437 linux-4.14-mc2.patch.xz
-15513dd39075d5b3b27adc193995ffef9d0bad2a5b128f04f8952b0b056a97e15a143f2f3b06de1c6eaa56e6034f28c528aa69786563e2bda6bf35e3182acfaa config-ppc64
+02d851fda8f46471e9e18393fe4ed46a145327dc153f7b9e7c354aa56b1484199f833b228f5a948d9ec974d706139ba13669a0557633bd01e9d117963f655826 linux-4.14-mc3.patch.xz
+9308029118547be983e3e510ede93e8277c3343f3c6828dfd39c8029341fe099b7cc7338d7603d21a3a69a6c1dd749889ea65ea9f5a94a3fae3e59f76ef33a98 config-ppc64
4580119dbbb8abb7cf3d433deee76264bc772f7710e75850483181f3d82e58a12e9045c663ae46a4f8633357790a8776d04826ae1f3954c556fa32ff9dade31f config-ppc
4fdfbbd63b0f6dc1f9988c752d2bfaa51038d1d6f3f9bdf968809acce50c047ad5a82734ab8d37e57008ff43f483b5734cbefa85c564fda25eccdb867e5949b8 config-x86_64
34baf5fb4a75bd9aa196313fa38ccf7d591b581d47a61be50b61e88ddaecf0f25992f1579e6fe73c73e1e6b11d7beabf05e6d778cc0de09b048252bedc271bc2 config-pmmx"
diff --git a/system/easy-kernel/config-ppc b/system/easy-kernel/config-ppc
index ac3d41e82..371a4de1a 100644
--- a/system/easy-kernel/config-ppc
+++ b/system/easy-kernel/config-ppc
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.14.8-mc2 Kernel Configuration
+# Linux/powerpc 4.14.12-mc3 Kernel Configuration
#
# CONFIG_PPC64 is not set
@@ -132,7 +132,10 @@ CONFIG_VIRT_CPU_ACCOUNTING=y
CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y
CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BSD_PROCESS_ACCT_V3=y
-# CONFIG_TASKSTATS is not set
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
#
# RCU Subsystem
@@ -151,13 +154,16 @@ CONFIG_LOG_BUF_SHIFT=14
CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
CONFIG_CGROUPS=y
-# CONFIG_MEMCG is not set
+CONFIG_PAGE_COUNTER=y
+CONFIG_MEMCG=y
+# CONFIG_MEMCG_SWAP is not set
CONFIG_BLK_CGROUP=y
# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_CGROUP_WRITEBACK=y
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUP_PIDS=y
-# CONFIG_CGROUP_RDMA is not set
-# CONFIG_CGROUP_FREEZER is not set
+CONFIG_CGROUP_RDMA=y
+CONFIG_CGROUP_FREEZER=y
CONFIG_CPUSETS=y
CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_DEVICE=y
@@ -227,6 +233,7 @@ CONFIG_HAVE_PERF_EVENTS=y
CONFIG_PERF_EVENTS=y
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_SLUB_DEBUG=y
+# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
# CONFIG_COMPAT_BRK is not set
# CONFIG_SLAB is not set
CONFIG_SLUB=y
@@ -4214,7 +4221,9 @@ CONFIG_QUOTACTL=y
CONFIG_AUTOFS4_FS=m
CONFIG_FUSE_FS=m
# CONFIG_CUSE is not set
-# CONFIG_OVERLAY_FS is not set
+CONFIG_OVERLAY_FS=y
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+# CONFIG_OVERLAY_FS_INDEX is not set
#
# Caches
diff --git a/system/easy-kernel/config-ppc64 b/system/easy-kernel/config-ppc64
index d2a2dff3a..5b0319d98 100644
--- a/system/easy-kernel/config-ppc64
+++ b/system/easy-kernel/config-ppc64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.14.4-mc1 Kernel Configuration
+# Linux/powerpc 4.14.12-mc3 Kernel Configuration
#
CONFIG_PPC64=y
@@ -3876,7 +3876,7 @@ CONFIG_HFSPLUS_FS=m
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
-CONFIG_CRAMFS=y
+CONFIG_CRAMFS=m
CONFIG_SQUASHFS=y
CONFIG_SQUASHFS_FILE_CACHE=y
# CONFIG_SQUASHFS_FILE_DIRECT is not set
@@ -4304,7 +4304,6 @@ CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
# CONFIG_HARDENED_USERCOPY is not set
# CONFIG_FORTIFY_SOURCE is not set
# CONFIG_STATIC_USERMODEHELPER is not set
-# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
CONFIG_DEFAULT_SECURITY_DAC=y
CONFIG_DEFAULT_SECURITY=""
CONFIG_XOR_BLOCKS=m