diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/easy-kernel/APKBUILD | 4 | ||||
| -rw-r--r-- | system/easy-kernel/config-pmmx | 14 | ||||
| -rw-r--r-- | system/easy-kernel/config-x86_64 | 2 | ||||
| -rw-r--r-- | system/iproute2/APKBUILD | 7 | ||||
| -rw-r--r-- | system/kbd/APKBUILD | 11 | ||||
| -rw-r--r-- | system/ruby/APKBUILD | 6 | ||||
| -rw-r--r-- | system/ruby/libedit-compat.patch | 22 |
7 files changed, 50 insertions, 16 deletions
diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD index 057bf2177..7fccf2f76 100644 --- a/system/easy-kernel/APKBUILD +++ b/system/easy-kernel/APKBUILD @@ -202,8 +202,8 @@ f81ad5ed82bc1141b97be22c3767d3c1984bed50ff847f3596609bdece05a70ba8e73fb7d5aa3163 e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch 169bfc8cf7463e22e67477907ba2f02593178db8a04d1d0f4f52d834087cbd3d504328960849e90532e95d16dc7f29fdbcc55d231696dcd6dbb0df4b0a337ce6 config-ppc64 d939115ee69713efd4ac47fa75e30536fbefe90dcfdfcba38ec31ed97afe53a4cdacb4750946bf2841ddd5d8d1fa34ec2c6c0207a9efef5110a23cae67ff34c8 config-ppc -692502b2d6dd8b7d30e1afca6f5f3d61adb7e0d51c35c01235db5ea13aa348bfad91c11ea2f66436ad922ec383dd21ee7bcc87bc2c5b6db9e1baa12a80a892b0 config-x86_64 -187f79df3a282adb693f58e3b4d3ce5f508e8d4d230ee0404984475cc273908eaaee77167d459da0849584ceff1666c072717532c04fc53aa271b0867078af8e config-pmmx +dbda29dd1dba54713d27e73e25b67fcd54ca9af1e18b50fd174628dccf15af7a8a604bf795d8da381f9c299889ce5cfb8fd3cefddf7cbbbaad78fb028c04facb config-x86_64 +85aef081cefb13ab319e5fbccc47b90a439dbb7be00895681569420339dc34c55e42278c471ca15144e84e6fc8a57a3a0899c2caee7e00dab9e369a5dea90e3b config-pmmx 378120b61b6809a44a5bde9049b2f90345df8fe93caf2091887a5278bcd7bf002ba57565b73ec618e6029543f251d12136ef5094b594a78be652a2273ecc31b3 config-aarch64 93456f06225ac67edd697dfa46e4ec38293e8da4dd67fe6cd3f4a7f961956fe35e27d506ef3481f2a49ad73f2b736a88b37ceaa17e9e8c94f99346268bc1ea9d config-sparc64 9be2ec1b09cf233c4259fb1dd1a9afa89b873ebc51bea9f15443180cba1968a905c6333cb2ed5a7976120a67e1b9848cd0aaaf7596a88f2c388328c48a487134 config-m68k diff --git a/system/easy-kernel/config-pmmx b/system/easy-kernel/config-pmmx index 8cc4ba3d2..61164a973 100644 --- a/system/easy-kernel/config-pmmx +++ b/system/easy-kernel/config-pmmx @@ -4251,16 +4251,16 @@ CONFIG_DVB_AF9033=m # Graphics support # CONFIG_AGP=m -# CONFIG_AGP_ALI is not set -# CONFIG_AGP_ATI is not set -# CONFIG_AGP_AMD is not set +CONFIG_AGP_ALI=m +CONFIG_AGP_ATI=m +CONFIG_AGP_AMD=m CONFIG_AGP_AMD64=m CONFIG_AGP_INTEL=m -# CONFIG_AGP_NVIDIA is not set +CONFIG_AGP_NVIDIA=m CONFIG_AGP_SIS=m -# CONFIG_AGP_SWORKS is not set +CONFIG_AGP_SWORKS=m CONFIG_AGP_VIA=m -# CONFIG_AGP_EFFICEON is not set +CONFIG_AGP_EFFICEON=m CONFIG_INTEL_GTT=m CONFIG_VGA_ARB=y CONFIG_VGA_ARB_MAX_GPUS=16 @@ -6075,7 +6075,7 @@ CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y CONFIG_STRICT_DEVMEM=y CONFIG_IO_STRICT_DEVMEM=y -CONFIG_X86_VERBOSE_BOOTUP=y +# CONFIG_X86_VERBOSE_BOOTUP is not set CONFIG_EARLY_PRINTK=y # CONFIG_EARLY_PRINTK_DBGP is not set # CONFIG_EARLY_PRINTK_EFI is not set diff --git a/system/easy-kernel/config-x86_64 b/system/easy-kernel/config-x86_64 index 8c7272646..4c2a419c2 100644 --- a/system/easy-kernel/config-x86_64 +++ b/system/easy-kernel/config-x86_64 @@ -6281,7 +6281,7 @@ CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y CONFIG_STRICT_DEVMEM=y CONFIG_IO_STRICT_DEVMEM=y -CONFIG_X86_VERBOSE_BOOTUP=y +# CONFIG_X86_VERBOSE_BOOTUP is not set CONFIG_EARLY_PRINTK=y # CONFIG_EARLY_PRINTK_DBGP is not set # CONFIG_EARLY_PRINTK_EFI is not set diff --git a/system/iproute2/APKBUILD b/system/iproute2/APKBUILD index e42fb126f..8c7c1a64b 100644 --- a/system/iproute2/APKBUILD +++ b/system/iproute2/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=iproute2 pkgver=5.2.0 -pkgrel=0 +pkgrel=1 pkgdesc="IP configuration, routing, and traffic control utilities" url="https://wiki.linuxfoundation.org/networking/iproute2" arch="all" @@ -36,6 +36,11 @@ build() { package() { make -j1 DESTDIR="$pkgdir" install + mkdir "$pkgdir"/bin + mv "$pkgdir"/sbin/ip "$pkgdir"/bin/ip + mkdir "$pkgdir"/usr/share/man/man1 + mv "$pkgdir"/usr/share/man/man8/ip.8 \ + "$pkgdir"/usr/share/man/man1/ip.1 } bashcomp() { diff --git a/system/kbd/APKBUILD b/system/kbd/APKBUILD index aa784cf0c..a5a12605a 100644 --- a/system/kbd/APKBUILD +++ b/system/kbd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbd -pkgver=2.2.0 +pkgver=2.2.0_git20190823 pkgrel=0 pkgdesc="Console keyboard and font management utilities" url=" " @@ -13,7 +13,12 @@ makedepends="linux-headers linux-pam-dev" checkdepends="check-dev" subpackages="$pkgname-doc $pkgname-fonts::noarch $pkgname-keymaps::noarch $pkgname-lang" -source="https://mirrors.kernel.org/pub/linux/utils/kbd/kbd-$pkgver.tar.xz" +source="https://dev.sick.bike/dist/$pkgname-$pkgver.tar.xz" + +prepare() { + default_prepare + autoreconf -vif +} build() { ./configure \ @@ -47,4 +52,4 @@ keymaps() { mv "$pkgdir"/usr/share/unimaps "$subpkgdir"/usr/share/ } -sha512sums="5f407c20739487e423e8390e429d30838a1a69a0a50db083803ce56da919e25ce480b63fd1bcfac9eb362095f17e575783b09eaa55e26b442bfa3ed838e04f13 kbd-2.2.0.tar.xz" +sha512sums="7f6202aeb17d6224095447a92d999478220457e1e7cadb90a7c40ca7f3b0c5b1f672db1995fb69652ca37558a75df582bfb5fea5772f3b1e040fe39f8f54504e kbd-2.2.0_git20190823.tar.xz" diff --git a/system/ruby/APKBUILD b/system/ruby/APKBUILD index 1a26b65b3..e608e4637 100644 --- a/system/ruby/APKBUILD +++ b/system/ruby/APKBUILD @@ -35,7 +35,7 @@ pkgname=ruby pkgver=2.5.5 _abiver="${pkgver%.*}.0" -pkgrel=1 +pkgrel=2 pkgdesc="An object-oriented language for quick and easy programming" url="https://www.ruby-lang.org/" arch="all" @@ -68,6 +68,7 @@ source="https://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/$pkgname-$pkgver.tar.x rubygems-avoid-platform-specific-gems.patch test_insns-lower-recursion-depth.patch fix-get_main_stack.patch + libedit-compat.patch " replaces="ruby-etc ruby-gems" @@ -309,4 +310,5 @@ _mvgem() { sha512sums="06b1d58536ebfacb7b56c1e6ed4b8ab816fadc4f48c845a452554cd262e7908199a30e5793f3cbaec2db56a8803aa5c6089abf7bf06c8fc47867e97870b7dfec ruby-2.5.5.tar.xz 20e7e5ee9936a93872fe1ad836dd1fde001fe4a0e7ed54c26727ad83da3ceb0e6247681d9dd4f98a69e1b0250703ed8fc682d44075780d5f47faa1d5f58d2bdb rubygems-avoid-platform-specific-gems.patch 814fe6359505b70d8ff680adf22f20a74b4dbd3fecc9a63a6c2456ee9824257815929917b6df5394ed069a6869511b8c6dce5b95b4acbbb7867c1f3a975a0150 test_insns-lower-recursion-depth.patch -e99b36940fa8fdd445d82738c70b8fc042cab042a4662cab156578aad2dac9673a96da22b6676aa36beac08070e92a7798c60d6f36eeb169216c4c51864ce2fe fix-get_main_stack.patch" +e99b36940fa8fdd445d82738c70b8fc042cab042a4662cab156578aad2dac9673a96da22b6676aa36beac08070e92a7798c60d6f36eeb169216c4c51864ce2fe fix-get_main_stack.patch +6b88fccce164db1d8beb16adeffdd7effd077e9842b7f61deddebeb39afcf9b839192b68a43ce66a1ff0c9aeaacc4f13a0ee56184c22e822cd8b10a07a1c87b2 libedit-compat.patch" diff --git a/system/ruby/libedit-compat.patch b/system/ruby/libedit-compat.patch new file mode 100644 index 000000000..601a9feea --- /dev/null +++ b/system/ruby/libedit-compat.patch @@ -0,0 +1,22 @@ +--- ruby-2.5.5/ext/readline/readline.c.old 2017-09-30 08:35:23.000000000 +0000 ++++ ruby-2.5.5/ext/readline/readline.c 2019-09-09 06:12:00.300098741 +0000 +@@ -571,6 +571,9 @@ + rb_syserr_fail(save_errno, "fdopen"); + } + rl_instream = readline_rl_instream = f; ++#ifdef HAVE_EDITLINE_READLINE_H ++ rl_initialize(); ++#endif + readline_instream = input; + } + return input; +@@ -607,6 +610,9 @@ + rb_syserr_fail(save_errno, "fdopen"); + } + rl_outstream = readline_rl_outstream = f; ++#ifdef HAVE_EDITLINE_READLINE_H ++ rl_initialize(); ++#endif + readline_outstream = output; + } + return output; |