1 |
commit: 269d880e1ca0b649d211da71e7c72b14d506a7df |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 4 15:06:57 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 4 15:06:57 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=269d880e |
7 |
|
8 |
sys-kernel/vanilla-kernel-bin: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
sys-kernel/vanilla-kernel-bin/Manifest | 2 - |
13 |
sys-kernel/vanilla-kernel-bin/metadata.xml | 8 +- |
14 |
.../vanilla-kernel-bin-5.4.6.ebuild | 174 --------------------- |
15 |
3 files changed, 4 insertions(+), 180 deletions(-) |
16 |
|
17 |
diff --git a/sys-kernel/vanilla-kernel-bin/Manifest b/sys-kernel/vanilla-kernel-bin/Manifest |
18 |
index a5340a12b78..ec54297a6ee 100644 |
19 |
--- a/sys-kernel/vanilla-kernel-bin/Manifest |
20 |
+++ b/sys-kernel/vanilla-kernel-bin/Manifest |
21 |
@@ -1,6 +1,4 @@ |
22 |
DIST tinycorelinux-10.1-amd64.qcow2 16842752 BLAKE2B e013e76503c335739a9623c0901ca791937a0e6b177854535cadec1e2c2cd2df588283ed3128cf652595f32264fbfe5b3bd3a8c97665fd4da344e308535be366 SHA512 c3aeb20ff8769da9211694b7f701907cc7ae7582cdfad2c2fdc008d97ebcbd9dc08245b4e8f8450e1cb304bd705345a11fe79f901a47979fee91443841d55641 |
23 |
DIST tinycorelinux-10.1-x86.qcow2 14876672 BLAKE2B 3c760eb7438b13261e52ecfaa33a53649ced95f1ab40aae52134b8cdc31a16d7aa0d6a6dd716e268ed148e9d77a10b7c700b141b61d70c82d271ffe88e8e2a3c SHA512 9964538dc42f232a11949f74b61d46422ea5da3bdc253a217119bd0b8a750c40fd2da0b07157067be9ac0226472614f210a1248114df0d331df390979867a895 |
24 |
-DIST vanilla-kernel-5.4.6-r1-1.amd64.xpak 89795144 BLAKE2B cca6e78f991cc79165a528d95fa1202b6f99dcf763f890609a0bf3e273cb81e786e39365a89e14282b75e259aa298b7349ee2868ef8437faae400475ad7e1c42 SHA512 de609b831db05c42350fe57e3248be3208c190ff99082088b5d2a1d69ec54734784f8143befbfd397deb9446228781ba25c1e50ecc020a651f6beda30be6ba97 |
25 |
-DIST vanilla-kernel-5.4.6-r1-1.x86.xpak 81308308 BLAKE2B f499c5a8e65d3754fd0e1ba65a2dfa7eb4fa9b8cbdf5e5957186dc40b1c5572dd66433284529b0ca93b7a3073103243d5f45ad8749ca891b1f86d838cbf363be SHA512 f8334097566ce8b1852ec65a5205221a2bb5193fc638756e87f6da2199cde1d1e73f85f9dd60679fccd18be11055c37da873b92a0e209775e7a9926f6ae94134 |
26 |
DIST vanilla-kernel-5.4.7-1.amd64.xpak 67980060 BLAKE2B 6bff3c16edc33dc65eedc55290d83cd26bf23bcf70addff39f43ba0d2fe9a678bc8bd2ba259802c95032132dce14e6866f15c30d66c4be23d82b88fa7e33d2f1 SHA512 edad0f70a46d2398702beeed442a84818d9d34cbd057372ad1175e7c2d944d59f6c5dbe2731658ed4c74eb66ffc3dd542b2589b1e776095c457b6347872d3dc4 |
27 |
DIST vanilla-kernel-5.4.7-1.x86.xpak 59512079 BLAKE2B be8b611d164cb0e17fc9232eebdd642ea3e7926acf0c8628dde6bfe4de9d5600fca8f33aeba039bffce574926d7f1dff5bfa9910ed42553fa168e6104207fa13 SHA512 9d2a59824f7ce0cd01ea5aced3a95c4e2ac44ca4ad82cf5997987f9b0df730650cb8c8c5a83476084e427af345ad4d5515eb996dd2db5d5c7fa21c0eb1d8871e |
28 |
|
29 |
diff --git a/sys-kernel/vanilla-kernel-bin/metadata.xml b/sys-kernel/vanilla-kernel-bin/metadata.xml |
30 |
index cd6a1d01518..b78799ea4a8 100644 |
31 |
--- a/sys-kernel/vanilla-kernel-bin/metadata.xml |
32 |
+++ b/sys-kernel/vanilla-kernel-bin/metadata.xml |
33 |
@@ -1,14 +1,14 @@ |
34 |
<?xml version="1.0" encoding="UTF-8"?> |
35 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
36 |
<pkgmetadata> |
37 |
+ <maintainer type="project"> |
38 |
+ <email>dist-kernel@g.o</email> |
39 |
+ <name>Distribution Kernel Project</name> |
40 |
+ </maintainer> |
41 |
<maintainer type="person"> |
42 |
<email>mgorny@g.o</email> |
43 |
<name>Michał Górny</name> |
44 |
</maintainer> |
45 |
- <maintainer type="person"> |
46 |
- <email>zlogene@g.o</email> |
47 |
- <name>Mikle Kolyada</name> |
48 |
- </maintainer> |
49 |
<use> |
50 |
<flag name='initramfs'>Build initramfs along with the kernel.</flag> |
51 |
</use> |
52 |
|
53 |
diff --git a/sys-kernel/vanilla-kernel-bin/vanilla-kernel-bin-5.4.6.ebuild b/sys-kernel/vanilla-kernel-bin/vanilla-kernel-bin-5.4.6.ebuild |
54 |
deleted file mode 100644 |
55 |
index 7d051f6f005..00000000000 |
56 |
--- a/sys-kernel/vanilla-kernel-bin/vanilla-kernel-bin-5.4.6.ebuild |
57 |
+++ /dev/null |
58 |
@@ -1,174 +0,0 @@ |
59 |
-# Copyright 2019-2020 Gentoo Authors |
60 |
-# Distributed under the terms of the GNU General Public License v2 |
61 |
- |
62 |
-EAPI=7 |
63 |
- |
64 |
-inherit mount-boot |
65 |
- |
66 |
-MY_P=vanilla-kernel-${PV}-r1-1 |
67 |
-TCL_VER=10.1 |
68 |
-DESCRIPTION="Pre-built vanilla Linux kernel" |
69 |
-HOMEPAGE="https://www.kernel.org/" |
70 |
-SRC_URI=" |
71 |
- amd64? ( |
72 |
- https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/vanilla-kernel/${MY_P}.xpak |
73 |
- -> ${MY_P}.amd64.xpak |
74 |
- test? ( |
75 |
- https://dev.gentoo.org/~mgorny/dist/tinycorelinux-${TCL_VER}-amd64.qcow2 |
76 |
- ) |
77 |
- ) |
78 |
- x86? ( |
79 |
- https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/vanilla-kernel/${MY_P}.xpak |
80 |
- -> ${MY_P}.x86.xpak |
81 |
- test? ( |
82 |
- https://dev.gentoo.org/~mgorny/dist/tinycorelinux-${TCL_VER}-x86.qcow2 |
83 |
- ) |
84 |
- )" |
85 |
-S=${WORKDIR} |
86 |
- |
87 |
-LICENSE="GPL-2" |
88 |
-SLOT="${PV}" |
89 |
-KEYWORDS="~amd64 ~x86" |
90 |
-IUSE="+initramfs test" |
91 |
-RESTRICT="!test? ( test ) test? ( userpriv )" |
92 |
- |
93 |
-# install-DEPEND actually |
94 |
-# note: we need installkernel with initramfs support! |
95 |
-RDEPEND=" |
96 |
- || ( |
97 |
- sys-kernel/installkernel-gentoo |
98 |
- sys-kernel/installkernel-systemd-boot |
99 |
- ) |
100 |
- initramfs? ( >=sys-kernel/dracut-049-r2 ) |
101 |
- !sys-kernel/vanilla-kernel:${SLOT}" |
102 |
-BDEPEND=" |
103 |
- test? ( |
104 |
- dev-tcltk/expect |
105 |
- sys-kernel/dracut |
106 |
- amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) |
107 |
- x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) |
108 |
- )" |
109 |
- |
110 |
-QA_PREBUILT='*' |
111 |
- |
112 |
-pkg_pretend() { |
113 |
- mount-boot_pkg_pretend |
114 |
- |
115 |
- ewarn "This is an experimental package. The built kernel and/or initramfs" |
116 |
- ewarn "may not work at all or fail with your bootloader configuration. Please" |
117 |
- ewarn "make sure to keep a backup kernel available before testing it." |
118 |
-} |
119 |
- |
120 |
-src_unpack() { |
121 |
- ebegin "Unpacking ${MY_P}.${ARCH}.xpak" |
122 |
- tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak") |
123 |
- eend ${?} || die "Unpacking ${MY_P} failed" |
124 |
-} |
125 |
- |
126 |
-src_test() { |
127 |
- local image_arch=${ARCH} |
128 |
- local qemu_arch=$(usex amd64 x86_64 i386) |
129 |
- |
130 |
- dracut \ |
131 |
- --conf /dev/null \ |
132 |
- --confdir /dev/null \ |
133 |
- --no-hostonly \ |
134 |
- --kmoddir "lib/modules/${PV}" \ |
135 |
- "${T}/initrd" "${PV}" || die |
136 |
- cp "${DISTDIR}/tinycorelinux-${TCL_VER}-${image_arch}.qcow2" \ |
137 |
- "${T}/fs.qcow2" || die |
138 |
- |
139 |
- cd "${T}" || die |
140 |
- cat > run.sh <<-EOF || die |
141 |
- #!/bin/sh |
142 |
- exec qemu-system-${qemu_arch} \ |
143 |
- -m 256M \ |
144 |
- -display none \ |
145 |
- -no-reboot \ |
146 |
- -kernel '${WORKDIR}/usr/src/linux-${PV}/bzImage' \ |
147 |
- -initrd '${T}/initrd' \ |
148 |
- -serial mon:stdio \ |
149 |
- -hda '${T}/fs.qcow2' \ |
150 |
- -append 'root=/dev/sda console=ttyS0,115200n8' |
151 |
- EOF |
152 |
- chmod +x run.sh || die |
153 |
- # TODO: initramfs does not let core finish starting on some systems, |
154 |
- # figure out how to make it better at that |
155 |
- expect - <<-EOF || die "Booting kernel failed" |
156 |
- set timeout 900 |
157 |
- spawn ./run.sh |
158 |
- expect { |
159 |
- "Kernel panic" { |
160 |
- send_error "\n* Kernel panic" |
161 |
- exit 1 |
162 |
- } |
163 |
- "Entering emergency mode" { |
164 |
- send_error "\n* Initramfs failed to start the system" |
165 |
- exit 1 |
166 |
- } |
167 |
- "Core 10.1" { |
168 |
- send_error "\n* Booted to login" |
169 |
- exit 0 |
170 |
- } |
171 |
- timeout { |
172 |
- send_error "\n* Kernel boot timed out" |
173 |
- exit 2 |
174 |
- } |
175 |
- } |
176 |
- EOF |
177 |
-} |
178 |
- |
179 |
-src_install() { |
180 |
- mv * "${ED}" || die |
181 |
-} |
182 |
- |
183 |
-pkg_preinst() { |
184 |
- : |
185 |
-} |
186 |
- |
187 |
-pkg_postinst() { |
188 |
- if [[ -z ${ROOT} ]]; then |
189 |
- mount-boot_pkg_preinst |
190 |
- |
191 |
- if use initramfs; then |
192 |
- ebegin "Building initramfs via dracut" |
193 |
- # putting it alongside kernel image as 'initrd' makes |
194 |
- # kernel-install happier |
195 |
- dracut --force "${EROOT}/usr/src/linux-${PV}/initrd" "${PV}" |
196 |
- eend ${?} || die "Building initramfs failed" |
197 |
- fi |
198 |
- |
199 |
- ebegin "Installing the kernel via installkernel" |
200 |
- # note: .config is taken relatively to System.map; |
201 |
- # initrd relatively to bzImage |
202 |
- installkernel "${PV}" \ |
203 |
- "${EROOT}/usr/src/linux-${PV}/bzImage" \ |
204 |
- "${EROOT}/usr/src/linux-${PV}/System.map" |
205 |
- eend ${?} || die "Installing the kernel failed" |
206 |
- fi |
207 |
- |
208 |
- local symlink_target=$(readlink "${EROOT}"/usr/src/linux) |
209 |
- local symlink_ver=${symlink_target#linux-} |
210 |
- if [[ ${symlink_target} == linux-* && -z ${symlink_ver//[0-9.]/} ]] |
211 |
- then |
212 |
- local symlink_pkg=${CATEGORY}/${PN}-${symlink_ver} |
213 |
- # if the current target is either being replaced, or still |
214 |
- # installed (probably depclean candidate), update the symlink |
215 |
- if has "${symlink_ver}" ${REPLACING_VERSIONS} || |
216 |
- has_version -r "~${symlink_pkg}" |
217 |
- then |
218 |
- ebegin "Updating /usr/src/linux symlink" |
219 |
- ln -f -n -s linux-${PV} "${EROOT}"/usr/src/linux |
220 |
- eend ${?} |
221 |
- fi |
222 |
- fi |
223 |
-} |
224 |
- |
225 |
-pkg_prerm() { |
226 |
- : |
227 |
-} |
228 |
- |
229 |
-pkg_postrm() { |
230 |
- rm -f "${EROOT}/usr/src/linux-${PV}/initrd" && |
231 |
- rmdir --ignore-fail-on-non-empty "${EROOT}/usr/src/linux-${PV}" |
232 |
-} |