diff options
-rw-r--r-- | system/adelie-base/APKBUILD | 26 | ||||
-rw-r--r-- | system/easy-kernel-power8-64k/APKBUILD | 6 | ||||
-rw-r--r-- | system/easy-kernel-power8/APKBUILD | 6 | ||||
-rw-r--r-- | system/easy-kernel/APKBUILD | 14 | ||||
-rw-r--r-- | system/easy-kernel/config-aarch64 | 11 | ||||
-rw-r--r-- | system/easy-kernel/config-pmmx | 2 | ||||
-rw-r--r-- | system/easy-kernel/config-x86_64 | 2 | ||||
-rw-r--r-- | user/pciutils/APKBUILD | 18 |
8 files changed, 48 insertions, 37 deletions
diff --git a/system/adelie-base/APKBUILD b/system/adelie-base/APKBUILD index fecfdbe3e..22eeeba55 100644 --- a/system/adelie-base/APKBUILD +++ b/system/adelie-base/APKBUILD @@ -1,24 +1,23 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=adelie-base -pkgver=0.9.0 +pkgver=0.9.1 pkgrel=1 pkgdesc="The Adélie Linux Base System" -url="http://adelielinux.org/" +url="https://www.adelielinux.org/" arch="noarch" options="!check !fhs" license="NCSA" _core_depends="apk-tools adelie-keys musl-utils shadow shimmy grep procps bash - coreutils diffutils findutils sharutils + coreutils diffutils findutils util-linux net-tools - sysklogd - patch sed nvi psmisc less" -depends="adelie-core debianutils libarchive-tools file zsh binutils - console-setup sysklogd man-db tzdata gettys-openrc" + nvi sed psmisc less tzdata" +depends="adelie-core binutils console-setup debianutils file gettys-openrc + libarchive-tools man-db patch sed sharutils sysklogd zsh" makedepends="" makedepends_host="$depends" -subpackages="adelie-core:core $pkgname-doc $pkgname-posix $pkgname-lsb dev-kit:devkit" +subpackages="adelie-core:core $pkgname-doc $pkgname-posix $pkgname-lsb dev-kit:devkit docs" provides="alpine-base" source="https://distfiles.adelielinux.org/source/$pkgname/$pkgname-$pkgver.tar.xz group @@ -44,6 +43,7 @@ package() { install -m644 "$srcdir"/group "$pkgdir"/etc/group install -m644 "$srcdir"/passwd "$pkgdir"/etc/passwd install -m640 -g shadow "$builddir"/tree/etc/shadow "$pkgdir"/etc/shadow + echo '' > "$pkgdir"/etc/shells # stupid inflatable stupid busybox local i @@ -87,13 +87,19 @@ lsb() { } devkit() { - depends="build-tools fakeroot gzip libarchive-tools mawk xz" + depends="build-tools libarchive-tools" pkgdesc="The Adélie Linux Development Kit" mkdir -p "$subpkgdir" return 0 } -sha512sums="6afa6750162d91d005fa1a0a789e06e9599be7063ed6847376c3b740a22afb273d405760f52249de233476c8b578c469a6e2d17b8f01d7f7ef8dd7b4fc5f9a4c adelie-base-0.9.0.tar.xz +docs() { + pkgdesc="Metapackage that will magically install all documentation for your system" + mkdir -p "$subpkgdir" + return 0 +} + +sha512sums="be6f4375d4bc3f014b33a536c24c84ab288c6d3fb525a7a069723e8e522342ce6c6cd800417ada28ecb6f31550c73c12075e2e1eb9e7734fc0d37bb3e9471434 adelie-base-0.9.1.tar.xz 37260d9315fd8d8b0df3dfb5bd3e1035a47ba1e43f33aa195e3feca6d169da282c1b067ef4603e7e9acaedbfef8b58cf490c00bdca444d43c9d570355ad29eac group 1288d9d1ee77e1159bacbc94a44b2ae9c6dff94c5001be6e560cd5859f86181c47341317025d4999bc7d57cfcebb7974804514d981b7bd66ffd00c5edaf5360c passwd 5b87e0c73e7d73715467b09c9c228b14abfdc1567b3d8a3e6ef86694a9d016c798c22411c9c8ccf41920fbe185199f6d6dbd45d4bceb6652ab4a7bea87c4fe51 addgroup diff --git a/system/easy-kernel-power8-64k/APKBUILD b/system/easy-kernel-power8-64k/APKBUILD index 16ddcd148..ebc1c1c9d 100644 --- a/system/easy-kernel-power8-64k/APKBUILD +++ b/system/easy-kernel-power8-64k/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> _pkgname=easy-kernel-power8-64k -pkgver=4.14.76 -pkgrel=11 +pkgver=4.14.88 +pkgrel=13 pkgname=$_pkgname-$pkgver-mc$pkgrel _kflavour=power8-64k pkgdesc="The Linux kernel, packaged for POWER8 and POWER9 computers (with 64K page size)" @@ -77,7 +77,7 @@ modules() { } sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz -d8bfe29549e0a1a7e86d8ead682e93e704c8d0b4b454f8a75306aa7ef5d628cab3a65847e27502866ed5901aff189eb440d47d8e07c2c34ebb7d2d82b717a64b linux-4.14-mc11.patch.xz +b9ec95e20b8ef1f99ab393c285f99c8630915ad688ea1f6eaf170b180f0aea65a24a8875f7a7ccc0c1a35b1e54a0b1ff2e6d04fb5f0fc2cbd5857082128a04a8 linux-4.14-mc13.patch.xz e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch 6e155f1109666ee907baf7f586d856366ba8afb6f008d48489c0bc269438a8280534266d3e37b449e44ce964688ea48f041bb36214eb495d59b84e55cdf49c19 config-ppc64 64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e futex-cmpxchg.patch" diff --git a/system/easy-kernel-power8/APKBUILD b/system/easy-kernel-power8/APKBUILD index 638ad465d..40f504084 100644 --- a/system/easy-kernel-power8/APKBUILD +++ b/system/easy-kernel-power8/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> _pkgname=easy-kernel-power8 -pkgver=4.14.76 -pkgrel=11 +pkgver=4.14.88 +pkgrel=13 pkgname=$_pkgname-$pkgver-mc$pkgrel pkgdesc="The Linux kernel, packaged for POWER8 and POWER9 computers" url="https://kernel.org/" @@ -83,7 +83,7 @@ src() { mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux-$pkgver-mc$pkgrel-p8 } sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz -d8bfe29549e0a1a7e86d8ead682e93e704c8d0b4b454f8a75306aa7ef5d628cab3a65847e27502866ed5901aff189eb440d47d8e07c2c34ebb7d2d82b717a64b linux-4.14-mc11.patch.xz +b9ec95e20b8ef1f99ab393c285f99c8630915ad688ea1f6eaf170b180f0aea65a24a8875f7a7ccc0c1a35b1e54a0b1ff2e6d04fb5f0fc2cbd5857082128a04a8 linux-4.14-mc13.patch.xz e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch 7eaa8840cbcb78afcc95a2e57a0fe92d6016f0ee6b5e1530e647ddb2799dae709ff57ac86bdfdefd32be1f3b1aec789cdc6b49f81c3186291672a8945bc474dd config-ppc64 64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e futex-cmpxchg.patch" diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD index 56cf73ae5..3e20840fd 100644 --- a/system/easy-kernel/APKBUILD +++ b/system/easy-kernel/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> _pkgname=easy-kernel -pkgver=4.14.76 -pkgrel=11 +pkgver=4.14.88 +pkgrel=13 pkgname=$_pkgname-$pkgver-mc$pkgrel pkgdesc="The Linux kernel, packaged for your convenience" url="https://kernel.org/" @@ -10,7 +10,7 @@ arch="all" options="!check !dbg !strip !tracedeps" license="GPL-2.0-only" depends="" -makedepends="bc gzip lzop openssl-dev xz" +makedepends="bc gzip kmod lzop openssl-dev xz" install="" provides="easy-kernel=$pkgver-r$pkgrel" subpackages="$_pkgname-modules-$pkgver-mc$pkgrel:modules @@ -107,13 +107,13 @@ src() { mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux-$pkgver-mc$pkgrel } sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz -d8bfe29549e0a1a7e86d8ead682e93e704c8d0b4b454f8a75306aa7ef5d628cab3a65847e27502866ed5901aff189eb440d47d8e07c2c34ebb7d2d82b717a64b linux-4.14-mc11.patch.xz +bfe606f208894cc572fb98f323e26956c69b4f75febd4a9b500514cbb2aa70bddb2aba05b3f16a5fe52535236b215335f73974324065f80643265f17f281faa6 linux-4.14-mc13.patch.xz e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch cfa1c2b523875967c42bfd8fcfeeb80b1c4c9887c4399b4767f0ac0525769a9e8c5cddaec831e1adfa546ac2d66f68ef23dc594a286532f4b9890401efd75c67 config-ppc64 1112f6c3fcfd7fdc0ef4d5e85df5d3adea430a9c7b4c2b34508a215f7ba14c863ccd7a5e17f13ed46c518bafec30cfb3ced70c465137c14ef5fc998b6cbcca1f config-ppc -438a66561200d570b3bf6ab0481d9725a9f482b1fcf852a90f99c6db5aa4ee02d2b67b57235bb7afc01515a79289407cbe111536340824d7a391ce1a658c9a76 config-x86_64 -e8f7749877c5b2574e7e853b757477b8f99d757b43225d4f83d611c20215b8b2690cc85369608c2dc8f7d6a619136a2d7dde4648031e37d2ae4dcc5ba85652c8 config-pmmx -0174e758ea318171c8036426ed0ad22aaafbdbac755732a46397686ec8dd24e977447f6fc275d59eed43ea047fc8a36061b7ad0d5862d522222455a60c943027 config-aarch64 +d72613826070cfab9cea882419c13985109200b387bd96614628e5eadb25f8da8b64c4844e345b724c29f7e6cf0619c649e536cb6cfe552a878d3a977cbb31fe config-x86_64 +40402578479993f78310459dcba783c806e0d2ebf6ad54854ffa338d3332f718ea4e8cf2c2f542584e1672504074122bba70a7ef918be7926f4a97abc20416d3 config-pmmx +231c346e601c1d032a03d6cb19ed3d6e0f538f84d6c9980e3f47236ba9dc3f076ea23f91d68813b7d5c9eea40200f69cef31697f89f514112c09c5762ab2c48a config-aarch64 64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e futex-cmpxchg.patch fdd94b9de7b374f1812dec0f9971c05f5e52177ca4a16c8071daa620c18265b38f656f528e7045a24f30af01f05e53e54546fb0a9e93773cf191866e87de505d kernel.h af093e91e8c8371629948e2e574f8764078564bc027ba5b2f87886f8827d9a63ba7a43717552fe7e3cc9212b2fd55b8633b12900c3d8cdc6c035d52b389c39e5 uapi-ether.patch" diff --git a/system/easy-kernel/config-aarch64 b/system/easy-kernel/config-aarch64 index 05764460a..69fbd943c 100644 --- a/system/easy-kernel/config-aarch64 +++ b/system/easy-kernel/config-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.33-mc6 Kernel Configuration +# Linux/arm64 4.14.88-mc13 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -495,6 +495,7 @@ CONFIG_ARM64_ERRATUM_832075=y CONFIG_ARM64_ERRATUM_834220=y CONFIG_ARM64_ERRATUM_845719=y CONFIG_ARM64_ERRATUM_843419=y +CONFIG_ARM64_ERRATUM_1024718=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23144=y CONFIG_CAVIUM_ERRATUM_23154=y @@ -596,6 +597,7 @@ CONFIG_XEN=y CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_HARDEN_BRANCH_PREDICTOR=y +CONFIG_ARM64_SSBD=y # CONFIG_ARMV8_DEPRECATED is not set # CONFIG_ARM64_SW_TTBR0_PAN is not set @@ -1867,6 +1869,7 @@ CONFIG_DWMAC_GENERIC=m CONFIG_DWMAC_IPQ806X=m CONFIG_DWMAC_MESON=m CONFIG_DWMAC_ROCKCHIP=m +# CONFIG_DWMAC_SOCFPGA is not set CONFIG_DWMAC_SUNXI=m CONFIG_DWMAC_SUN8I=m # CONFIG_STMMAC_PCI is not set @@ -2925,6 +2928,12 @@ CONFIG_ROCKCHIP_THERMAL=m CONFIG_MTK_THERMAL=y # +# Broadcom thermal drivers +# +# CONFIG_BCM2835_THERMAL is not set +CONFIG_BCM_NS_THERMAL=y + +# # Samsung thermal drivers # CONFIG_EXYNOS_THERMAL=y diff --git a/system/easy-kernel/config-pmmx b/system/easy-kernel/config-pmmx index 3eba58ce7..1484fc1b2 100644 --- a/system/easy-kernel/config-pmmx +++ b/system/easy-kernel/config-pmmx @@ -416,7 +416,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y CONFIG_X86_MPPARSE=y CONFIG_X86_BIGSMP=y # CONFIG_GOLDFISH is not set -CONFIG_RETPOLINE=y +CONFIG_RETPOLINE=n # CONFIG_INTEL_RDT is not set CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_GOLDFISH is not set diff --git a/system/easy-kernel/config-x86_64 b/system/easy-kernel/config-x86_64 index 22db9c048..ba0b3beeb 100644 --- a/system/easy-kernel/config-x86_64 +++ b/system/easy-kernel/config-x86_64 @@ -440,7 +440,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y # CONFIG_X86_X2APIC is not set CONFIG_X86_MPPARSE=y # CONFIG_GOLDFISH is not set -CONFIG_RETPOLINE=y +CONFIG_RETPOLINE=n # CONFIG_INTEL_RDT is not set CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_VSMP is not set diff --git a/user/pciutils/APKBUILD b/user/pciutils/APKBUILD index 92964b95f..f198c08c8 100644 --- a/user/pciutils/APKBUILD +++ b/user/pciutils/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: pkgname=pciutils pkgver=3.6.2 -pkgrel=0 +pkgrel=1 pkgdesc="PCI bus configuration space access library and tools" url="http://mj.ucw.cz/pciutils.html" arch="all" options="!check" # No test suite. license="GPL-2.0-only" -depends="hwdata-pci" -makedepends="linux-headers" +depends="hwids-pci" +makedepends="eudev-dev kmod-dev linux-headers cmd:which" subpackages="$pkgname-doc $pkgname-dev $pkgname-libs" source="https://www.kernel.org/pub/software/utils/$pkgname/$pkgname-$pkgver.tar.gz fix-linking-pci-malloc-Makefile.patch @@ -33,15 +33,11 @@ package() { SHARED=yes \ SHAREDIR="$pkgdir"/usr/share/hwdata \ MANDIR="$pkgdir"/usr/share/man \ - install - - install -d "$pkgdir"/usr/lib - ln -s libpci.so.${pkgver%%.*} "$pkgdir"/usr/lib/libpci.so - install -D -m 644 lib/libpci.pc "$pkgdir"/usr/lib/pkgconfig/libpci.pc - for i in config.h header.h pci.h types.h; do - install -D -m 644 lib/${i} "$pkgdir"/usr/include/pci/${i} - done + install install-lib + rm "$pkgdir"/usr/sbin/update-pciids + rm "$pkgdir"/usr/share/man/man8/update-pciids.8 + rm -r "$pkgdir"/usr/share/hwdata } sha512sums="a9332f07755ab8af6ba99a5fa3cf739b0f3688276902673b9fe981955c4fa732c3d0ccaa150942ecaf4b263a10c2653f5454aa87492cac1dd805f33500fac489 pciutils-3.6.2.tar.gz |