Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/milo/
Date: Thu, 11 Aug 2022 11:13:49
Message-Id: 1660216390.41c1621d8cc415fabf5889265af5712ddd48619f.sam@gentoo
1 commit: 41c1621d8cc415fabf5889265af5712ddd48619f
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 11 11:12:33 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 11 11:13:10 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41c1621d
7
8 sys-boot/milo: fix UnquotedVariable
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 sys-boot/milo/milo-2.4.18.ebuild | 39 +++++++++++++++++++--------------------
13 1 file changed, 19 insertions(+), 20 deletions(-)
14
15 diff --git a/sys-boot/milo/milo-2.4.18.ebuild b/sys-boot/milo/milo-2.4.18.ebuild
16 index 0501252aa338..a4c3e71f8328 100644
17 --- a/sys-boot/milo/milo-2.4.18.ebuild
18 +++ b/sys-boot/milo/milo-2.4.18.ebuild
19 @@ -1,4 +1,4 @@
20 -# Copyright 1999-2021 Gentoo Authors
21 +# Copyright 1999-2022 Gentoo Authors
22 # Distributed under the terms of the GNU General Public License v2
23
24 EAPI=7
25 @@ -93,9 +93,9 @@ src_unpack() {
26 src_prepare() {
27 # gcc3 fixes, and some tweaks to get a build, also
28 # reiserfs support for the kernel (and milo).
29 - cd ${WORKDIR}/linux; eapply "${FILESDIR}"/linux-${kernel_version}-gcc3-milo.diff || die
30 - cd ${WORKDIR}/linux; eapply "${WORKDIR}"/linux-2.2.20-reiserfs-3.5.35.diff || die
31 - cd ${S}; eapply "${FILESDIR}"/milo-${milo_version}-gcc3-gentoo.diff || die
32 + cd "${WORKDIR}"/linux; eapply "${FILESDIR}"/linux-${kernel_version}-gcc3-milo.diff || die
33 + cd "${WORKDIR}"/linux; eapply "${WORKDIR}"/linux-2.2.20-reiserfs-3.5.35.diff || die
34 + cd "${S}"; eapply "${FILESDIR}"/milo-${milo_version}-gcc3-gentoo.diff || die
35 eapply_user
36 }
37
38 @@ -138,7 +138,7 @@ src_compile() {
39 die "${MILO_IMAGE} not supported, or not recognised."
40 fi
41
42 - sed -i "s!__MILO_ARCHES__!${MILO_ARCH}!g" ${S}/tools/scripts/build
43 + sed -i "s!__MILO_ARCHES__!${MILO_ARCH}!g" "${S}"/tools/scripts/build
44
45 ewarn
46 ewarn "seriously, this is going to take a while, go get some coffee..."
47 @@ -154,9 +154,9 @@ src_compile() {
48 ewarn
49
50 # get kernel configured
51 - cp ${custom_milo_kernel_config:-${S}/Documentation/config/linux-2.2.19-SuSE.config} \
52 - ${WORKDIR}/linux/.config
53 - cd ${WORKDIR}/linux; yes n | make oldconfig || die "unable to configure kernel."
54 + cp ${custom_milo_kernel_config:-"${S}"/Documentation/config/linux-2.2.19-SuSE.config} \
55 + "${WORKDIR}"/linux/.config
56 + cd "${WORKDIR}"/linux; yes n | make oldconfig || die "unable to configure kernel."
57
58 # we're building a generic kernel that defaults to ev5, but theres no
59 # reason why we cant tweak the instruction set.
60 @@ -165,7 +165,7 @@ src_compile() {
61 mcpu_flag="`get-flag mcpu`"
62 if [ ! -z "${mcpu_flag}" ]; then
63 sed -i "s/\(CFLAGS := \$(CFLAGS) \)-mcpu=ev5$/\1-mcpu=${mcpu_flag:-ev5}/g" \
64 - ${WORKDIR}/linux/arch/alpha/Makefile
65 + "${WORKDIR}"/linux/arch/alpha/Makefile
66 fi
67
68 # build the generic linux kernel, of course if you have
69 @@ -173,11 +173,11 @@ src_compile() {
70 # to hack it (or the .config used here).
71 einfo "building a generic kernel for use with milo..."
72 unset CC DISTCC_HOSTS; make dep vmlinux || die "unable to build generic kernel for milo."
73 - cat ${FILESDIR}/objstrip.c > ${WORKDIR}/linux/arch/alpha/boot/tools/objstrip.c
74 + cat "${FILESDIR}"/objstrip.c > "${WORKDIR}"/linux/arch/alpha/boot/tools/objstrip.c
75
76 # make the objstrip utility.
77 - gcc ${WORKDIR}/linux/arch/alpha/boot/tools/objstrip.c -o \
78 - ${WORKDIR}/linux/arch/alpha/boot/tools/objstrip || die "couldnt build objstrip."
79 + gcc "${WORKDIR}"/linux/arch/alpha/boot/tools/objstrip.c -o \
80 + "${WORKDIR}"/linux/arch/alpha/boot/tools/objstrip || die "couldnt build objstrip."
81 einfo "kernel build complete."
82 einfo "building milo images..."
83
84 @@ -191,20 +191,19 @@ src_compile() {
85 append-flags -DMILO_SERIAL_NUMBER1="${milo_serial_number1:-0x002174616572475f}"
86
87 # the Makefile missed this :-/
88 - cd ${S}/tools/common; make || die "couldnt make commonlib."
89 + cd "${S}"/tools/common; make || die "couldnt make commonlib."
90
91 # build all the milo images.
92 - cd ${S}; tools/scripts/build || die "failed to build milo images."
93 + cd "${S}"; tools/scripts/build || die "failed to build milo images."
94
95 # put the ldmilo utility there.
96 - cp ${DISTDIR}/ldmilo-patched-${ldmilo_patch} ${S}/binaries/ldmilo.exe
97 - cp ${DISTDIR}/linload.exe ${S}/binaries/linload.exe
98 + cp "${DISTDIR}"/ldmilo-patched-${ldmilo_patch} "${S}"/binaries/ldmilo.exe
99 + cp "${DISTDIR}"/linload.exe "${S}"/binaries/linload.exe
100
101 }
102
103 src_install() {
104 -
105 - cd ${S}; dodir /opt/milo
106 + cd "${S}"; dodir /opt/milo
107 insinto /opt/milo
108
109 einfo "Installing MILO images..."
110 @@ -214,10 +213,10 @@ src_install() {
111 doins ${i}
112 done
113
114 - cd ${S}/Documentation
115 + cd "${S}"/Documentation
116
117 dodoc ChangeLog filesystem Nikita.Todo README.milo Todo README.BSD Stuff WhatIsMilo \
118 - ${FILESDIR}/README-gentoo ${FILESDIR}/mkserial_no.c ${DISTDIR}/MILO-HOWTO
119 + "${FILESDIR}"/README-gentoo "${FILESDIR}"/mkserial_no.c "${DISTDIR}"/MILO-HOWTO
120
121 }