[gentoo-commits] repo/gentoo:master commit in: sys-boot/silo/files/

2021-02-02 Thread Conrad Kostecki 
commit: 3e4f30d8f3cb8525e004653bea58f18b4ba78def
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Tue Feb  2 16:56:28 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Feb  2 21:38:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e4f30d8

sys-boot/silo: remove unused patch(es)

Closes: https://github.com/gentoo/gentoo/pull/19305
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/silo-1.4.14_p20120819-gnu90-inline.patch   | 20 
 1 file changed, 20 deletions(-)

diff --git a/sys-boot/silo/files/silo-1.4.14_p20120819-gnu90-inline.patch 
b/sys-boot/silo/files/silo-1.4.14_p20120819-gnu90-inline.patch
deleted file mode 100644
index bf6add0ce10..000
--- a/sys-boot/silo/files/silo-1.4.14_p20120819-gnu90-inline.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 a/Rules.make
-+++ b/Rules.make
-@@ -26,2 +26,7 @@ CFLAGS += -fno-stack-protector
- endif
-+ifeq ($(call cc-option-yn, -std=gnu90),y)
-+# In gcc-5+ c99 changed inline rules by forbidding
-+# multiple extern definitions. Fall back to gnu90
-+CFLAGS += -std=gnu90
-+endif
- 
 a/silo/Makefile
-+++ b/silo/Makefile
-@@ -6,2 +6,7 @@ UFSDEPS=
- CFLAGS=-O2 -Wall -I. -I../include
-+ifeq ($(call cc-option-yn, -std=gnu90),y)
-+# In gcc-5+ c99 changed inline rules by forbidding
-+# multiple extern definitions. Fall back to gnu90
-+CFLAGS += -std=gnu90
-+endif
-

[gentoo-commits] repo/gentoo:master commit in: sys-boot/silo/

2020-12-27 Thread Sergei Trofimovich 
commit: 68e519077027a0913bdae771a80f7694c20b5e86
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Dec 27 10:48:50 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Dec 27 10:52:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68e51907

sys-boot/silo: drop old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-boot/silo/Manifest |  1 -
 sys-boot/silo/silo-1.4.14_p20170829.ebuild | 66 --
 2 files changed, 67 deletions(-)

diff --git a/sys-boot/silo/Manifest b/sys-boot/silo/Manifest
index 08d80150537..21a7b23314e 100644
--- a/sys-boot/silo/Manifest
+++ b/sys-boot/silo/Manifest
@@ -1,2 +1 @@
-DIST silo-1.4.14_p20170829.tar.gz 183612 BLAKE2B 
88fb4b0ce4e9b8fa9518bcb6226f4fe9ec7011bf3f73d9f0f1562ff837217ca8d54ee783eed0b50096b009fc56527be8e4211623f5b0e4ef5372c38c0fe304f1
 SHA512 
bda31084ba2ee5b01d331fd390cbccf039dc812debe25f3af97dd5d2855668cbe7e160dee4ca45c16af1fa4aa86224daf3b474fd49b22a8b7f453584a12f3c2b
 DIST silo-1.4.14_p20200602.tar.gz 183668 BLAKE2B 
e229cdb9fbc5f0111aa49919f4b3b91c0770492fa06f91bda15c65af160b728b9409365c3ff0a93091b1e3011c60d0b0bec1101ffabaddbaef7e1083158830b1
 SHA512 
7a70fe25c1bb3ce655e4fbb85b00fe0d29fe0a6f98b80c1b8267b72bc9324ac0749cd050921163cc286e094f7d9bc81315d63ff02d2442b5c30ce350a537fcc1

diff --git a/sys-boot/silo/silo-1.4.14_p20170829.ebuild 
b/sys-boot/silo/silo-1.4.14_p20170829.ebuild
deleted file mode 100644
index 9fe244c7d56..000
--- a/sys-boot/silo/silo-1.4.14_p20170829.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mount-boot flag-o-matic toolchain-funcs vcs-snapshot
-
-MY_SNAPSHOT="${PN}-2506051d55dd5cb9fe10b4e978e22fa00363044b"
-
-DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/davem/silo.git/snapshot/${MY_SNAPSHOT}.tar.gz
 -> ${P}.tar.gz"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* sparc"
-IUSE=""
-
-DEPEND="sys-fs/e2fsprogs
-   sys-apps/sparc-utils"
-RDEPEND=""
-
-ABI_ALLOW="sparc32"
-
-src_prepare() {
-   default
-
-   # Set the correct version
-   sed -i -e "s/1.4.14/1.4.14_git20170829/g" Rules.make || die
-
-   # Fix build failure
-   # -fno-PIC is needed to shrink silo size back to manageable on
-   # profiles where gcc has -fPIC default (via --enable-default-pie).
-   sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing 
-U_FORTIFY_SOURCE -mcpu=v9 -fno-PIC/g" Rules.make || die
-
-   # Don't strip ieee32.b during compile
-   sed -i -e '/^   $(STRIP) ieee32.b/d' first/Makefile || die
-}
-
-src_compile() {
-   filter-flags "-fstack-protector"
-
-   emake CC="$(tc-getCC)" \
-   STRIP="$(tc-getSTRIP)" \
-   NM="$(tc-getNM)" \
-   LD="$(tc-getLD)"
-}
-
-src_install() {
-   default
-
-   dodoc first-isofs/README.SILO_ISOFS docs/README*
-
-   # Fix maketilo manpage
-   rm "${D}"/usr/share/man/man1/maketilo.1
-   dosym tilo.1 /usr/share/man/man1/maketilo.1
-}
-
-pkg_postinst() {
-   mount-boot_pkg_postinst
-   ewarn "NOTE: If this is an upgrade to an existing SILO install,"
-   ewarn "  you will need to re-run silo as the /boot/second.b"
-   ewarn "  file has changed, else the system will fail to load"
-   ewarn "  SILO at the next boot."
-   ewarn
-}

[gentoo-commits] repo/gentoo:master commit in: sys-boot/silo/

2020-12-26 Thread Sergei Trofimovich 
commit: ec4d579ba466276bb812d168d94f45c1e1a41867
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Dec 26 08:57:33 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Dec 26 09:12:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec4d579b

sys-boot/silo: stable 1.4.14_p20200602 for sparc, bug #759655

Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-boot/silo/silo-1.4.14_p20200602.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/silo/silo-1.4.14_p20200602.ebuild 
b/sys-boot/silo/silo-1.4.14_p20200602.ebuild
index 6e6b9cd4d3f..bb1eadd65f2 100644
--- a/sys-boot/silo/silo-1.4.14_p20200602.ebuild
+++ b/sys-boot/silo/silo-1.4.14_p20200602.ebuild
@@ -13,7 +13,7 @@ 
HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary";
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="-* ~sparc"
+KEYWORDS="-* sparc"
 IUSE="tilo-only"
 
 DEPEND="sys-fs/e2fsprogs

[gentoo-commits] repo/gentoo:master commit in: sys-boot/silo/

2020-12-25 Thread Sergei Trofimovich 
commit: 7d2ecca393148ac30882815ade02c4a8e2308dff
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Dec 25 22:31:44 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Dec 25 22:31:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d2ecca3

sys-boot/silo: fix src_instal()

Due to missing trailing '\' all arguments to `emake` were ignored.

Bug: https://bugs.gentoo.org/759655
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-boot/silo/silo-1.4.14_p20200602.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-boot/silo/silo-1.4.14_p20200602.ebuild 
b/sys-boot/silo/silo-1.4.14_p20200602.ebuild
index 42f7fc37254..6e6b9cd4d3f 100644
--- a/sys-boot/silo/silo-1.4.14_p20200602.ebuild
+++ b/sys-boot/silo/silo-1.4.14_p20200602.ebuild
@@ -42,7 +42,7 @@ _emake() {
STRIP="$(tc-getSTRIP)" \
NM="$(tc-getNM)" \
LD="$(tc-getLD) -m elf32_sparc" \
-   TILO_ONLY=$(usex tilo-only yes no)
+   TILO_ONLY=$(usex tilo-only yes no) \
\
"$@"
 }
@@ -50,7 +50,7 @@ _emake() {
 src_compile() {
filter-flags "-fstack-protector"
 
-   _emake $(usex tilo-only '-C tilo' '')
+   _emake
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: sys-boot/silo/

2020-12-25 Thread Sergei Trofimovich 
commit: 1975eb868186fba89ce71397ecdeed5dfaad0c0b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Dec 25 22:21:27 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Dec 25 22:21:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1975eb86

sys-boot/silo: fix USE=tilo-only, honot CC

Reported-by: Rolf Eike Beer
Bug: https://bugs.gentoo.org/759655
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-boot/silo/silo-1.4.14_p20200602.ebuild | 26 --
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/sys-boot/silo/silo-1.4.14_p20200602.ebuild 
b/sys-boot/silo/silo-1.4.14_p20200602.ebuild
index deeed7b293d..42f7fc37254 100644
--- a/sys-boot/silo/silo-1.4.14_p20200602.ebuild
+++ b/sys-boot/silo/silo-1.4.14_p20200602.ebuild
@@ -33,24 +33,30 @@ src_prepare() {
sed -i -e '/^   $(STRIP) ieee32.b/d' first/Makefile || die
 }
 
+_emake() {
+   # We inject '-m32' / '-m elf32_sparc' to follow 'Rules.make' defaults.
+
+   emake \
+   HOSTCC="$(tc-getBUILD_CC)" \
+   CC="$(tc-getCC) -m32" \
+   STRIP="$(tc-getSTRIP)" \
+   NM="$(tc-getNM)" \
+   LD="$(tc-getLD) -m elf32_sparc" \
+   TILO_ONLY=$(usex tilo-only yes no)
+   \
+   "$@"
+}
+
 src_compile() {
filter-flags "-fstack-protector"
 
-   CC="$(tc-getCC)" \
-   STRIP="$(tc-getSTRIP)" \
-   NM="$(tc-getNM)" \
-   LD="$(tc-getLD)" \
-   emake $(usex tilo-only '-C tilo' '')
+   _emake $(usex tilo-only '-C tilo' '')
 }
 
 src_install() {
-   default
+   _emake DESTDIR="${D}" install
 
dodoc first-isofs/README.SILO_ISOFS docs/README*
-
-   # Fix maketilo manpage
-   rm "${D}"/usr/share/man/man1/maketilo.1
-   dosym tilo.1 /usr/share/man/man1/maketilo.1
 }
 
 pkg_postinst() {

[gentoo-commits] repo/gentoo:master commit in: sys-boot/silo/

2020-12-18 Thread Sergei Trofimovich 
commit: 724b49598a12cfe0d1f63b27dacc239ff39a1243
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Dec 18 09:44:52 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Dec 18 09:52:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=724b4959

sys-boot/silo: drop old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-boot/silo/Manifest|  2 -
 sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild | 71 ---
 2 files changed, 73 deletions(-)

diff --git a/sys-boot/silo/Manifest b/sys-boot/silo/Manifest
index 70de039c957..08d80150537 100644
--- a/sys-boot/silo/Manifest
+++ b/sys-boot/silo/Manifest
@@ -1,4 +1,2 @@
 DIST silo-1.4.14_p20170829.tar.gz 183612 BLAKE2B 
88fb4b0ce4e9b8fa9518bcb6226f4fe9ec7011bf3f73d9f0f1562ff837217ca8d54ee783eed0b50096b009fc56527be8e4211623f5b0e4ef5372c38c0fe304f1
 SHA512 
bda31084ba2ee5b01d331fd390cbccf039dc812debe25f3af97dd5d2855668cbe7e160dee4ca45c16af1fa4aa86224daf3b474fd49b22a8b7f453584a12f3c2b
 DIST silo-1.4.14_p20200602.tar.gz 183668 BLAKE2B 
e229cdb9fbc5f0111aa49919f4b3b91c0770492fa06f91bda15c65af160b728b9409365c3ff0a93091b1e3011c60d0b0bec1101ffabaddbaef7e1083158830b1
 SHA512 
7a70fe25c1bb3ce655e4fbb85b00fe0d29fe0a6f98b80c1b8267b72bc9324ac0749cd050921163cc286e094f7d9bc81315d63ff02d2442b5c30ce350a537fcc1
-DIST silo_1.4.14+git20120819-1.diff.gz 10711 BLAKE2B 
c44a0204e3aece4eec8355f88b3a195c1ba7019c0aa648cc4e28ff6cb85fc6d96634bd282e5aaea9123dbc5835820acf2fc15054c91842d6b1040fc13cb0033b
 SHA512 
60719b672a0f1dd2a005e763efd232bbf7aeb00198e0b46827208b78f1b32acc3a730d43944382dec4b95fddfbb373b1eb69dc911ad28ec9d1d1e6c45d84db20
-DIST silo_1.4.14+git20120819.orig.tar.gz 755510 BLAKE2B 
f1185086671c12c901704c2aa1f582a4e983d2d4a2d5ec18194aebcd43a7bdf9e7ad329efebaf4911d40f8a417ff8c8566b61be4eac5fea13235ac44d0edf852
 SHA512 
2d1dd8f805fb0a272877b5e8e19e5a645aa9fe02cf2b5ef43b5d2894c0c6a5a82483a0e41556af50f01dc795dc5e43350ae92139485c19d64cda75c2aca01a38

diff --git a/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild 
b/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
deleted file mode 100644
index 946707a2947..000
--- a/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mount-boot flag-o-matic toolchain-funcs eutils
-
-DEB_PL="1"
-MY_PV="${PV##*_p}"
-MY_GIT="git${MY_PV%%_*}"
-MY_PV="${PV%%_*}"
-MY_P="${PN}_${MY_PV}+${MY_GIT}"
-
-DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
-SRC_URI="mirror://debian/pool/main/s/${PN}/${MY_P}.orig.tar.gz
-   mirror://debian/pool/main/s/${PN}/${MY_P}-${DEB_PL}.diff.gz"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* sparc"
-IUSE=""
-
-DEPEND="sys-fs/e2fsprogs
-   sys-apps/sparc-utils"
-RDEPEND=""
-
-ABI_ALLOW="sparc32"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-gnu90-inline.patch
-)
-
-src_prepare() {
-   default
-
-   #Set the correct version
-   sed -i -e "s/1.4.14/1.4.14_git20120819_p1/g" Rules.make || die
-
-   # Fix build failure
-   # -fno-PIC is needed to shrink silo size back to manageable on
-   # profiles where gcc has -fPIC default (via --enable-default-pie).
-   sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing 
-U_FORTIFY_SOURCE -mcpu=v9 -fno-PIC/g" Rules.make || die
-}
-
-src_compile() {
-   filter-flags "-fstack-protector"
-
-   emake CC="$(tc-getCC)"
-}
-
-src_install() {
-   default
-
-   dodoc first-isofs/README.SILO_ISOFS docs/README*
-
-   # Fix maketilo manpage
-   rm "${D}"/usr/share/man/man1/maketilo.1
-   dosym tilo.1 /usr/share/man/man1/maketilo.1
-}
-
-pkg_postinst() {
-   mount-boot_pkg_postinst
-   ewarn "NOTE: If this is an upgrade to an existing SILO install,"
-   ewarn "  you will need to re-run silo as the /boot/second.b"
-   ewarn "  file has changed, else the system will fail to load"
-   ewarn "  SILO at the next boot."
-   ewarn
-}

[gentoo-commits] repo/gentoo:master commit in: sys-boot/silo/

2020-06-02 Thread Matt Turner 
commit: 0c7cdb57b0ed7f03b693b7d2c21744c042e33fad
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Jun  3 02:05:26 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Jun  3 02:05:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c7cdb57

sys-boot/silo: Remove redundant long description

Signed-off-by: Matt Turner  gentoo.org>

 sys-boot/silo/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sys-boot/silo/metadata.xml b/sys-boot/silo/metadata.xml
index a2966fc65e1..a77bae3ef85 100644
--- a/sys-boot/silo/metadata.xml
+++ b/sys-boot/silo/metadata.xml
@@ -5,9 +5,6 @@
sp...@gentoo.org
Gentoo Linux SPARC Development
 
-
-SILO is the SPARC/UltraSPARC Improved Loader, a boot loader for sparc similar 
to LILO.
-
 
Install only the tilo netboot tool

[gentoo-commits] repo/gentoo:master commit in: sys-boot/silo/

2020-06-02 Thread Matt Turner 
commit: ffdc2a3d24da099fce0afb76f9f6d2c8d2a5a254
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Jun  3 02:03:41 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Jun  3 02:05:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffdc2a3d

sys-boot/silo: Version bump to 1.4.14_p20200602

Signed-off-by: Matt Turner  gentoo.org>

 sys-boot/silo/Manifest |  1 +
 sys-boot/silo/metadata.xml |  3 ++
 sys-boot/silo/silo-1.4.14_p20200602.ebuild | 65 ++
 3 files changed, 69 insertions(+)

diff --git a/sys-boot/silo/Manifest b/sys-boot/silo/Manifest
index e0c4be194e0..70de039c957 100644
--- a/sys-boot/silo/Manifest
+++ b/sys-boot/silo/Manifest
@@ -1,3 +1,4 @@
 DIST silo-1.4.14_p20170829.tar.gz 183612 BLAKE2B 
88fb4b0ce4e9b8fa9518bcb6226f4fe9ec7011bf3f73d9f0f1562ff837217ca8d54ee783eed0b50096b009fc56527be8e4211623f5b0e4ef5372c38c0fe304f1
 SHA512 
bda31084ba2ee5b01d331fd390cbccf039dc812debe25f3af97dd5d2855668cbe7e160dee4ca45c16af1fa4aa86224daf3b474fd49b22a8b7f453584a12f3c2b
+DIST silo-1.4.14_p20200602.tar.gz 183668 BLAKE2B 
e229cdb9fbc5f0111aa49919f4b3b91c0770492fa06f91bda15c65af160b728b9409365c3ff0a93091b1e3011c60d0b0bec1101ffabaddbaef7e1083158830b1
 SHA512 
7a70fe25c1bb3ce655e4fbb85b00fe0d29fe0a6f98b80c1b8267b72bc9324ac0749cd050921163cc286e094f7d9bc81315d63ff02d2442b5c30ce350a537fcc1
 DIST silo_1.4.14+git20120819-1.diff.gz 10711 BLAKE2B 
c44a0204e3aece4eec8355f88b3a195c1ba7019c0aa648cc4e28ff6cb85fc6d96634bd282e5aaea9123dbc5835820acf2fc15054c91842d6b1040fc13cb0033b
 SHA512 
60719b672a0f1dd2a005e763efd232bbf7aeb00198e0b46827208b78f1b32acc3a730d43944382dec4b95fddfbb373b1eb69dc911ad28ec9d1d1e6c45d84db20
 DIST silo_1.4.14+git20120819.orig.tar.gz 755510 BLAKE2B 
f1185086671c12c901704c2aa1f582a4e983d2d4a2d5ec18194aebcd43a7bdf9e7ad329efebaf4911d40f8a417ff8c8566b61be4eac5fea13235ac44d0edf852
 SHA512 
2d1dd8f805fb0a272877b5e8e19e5a645aa9fe02cf2b5ef43b5d2894c0c6a5a82483a0e41556af50f01dc795dc5e43350ae92139485c19d64cda75c2aca01a38

diff --git a/sys-boot/silo/metadata.xml b/sys-boot/silo/metadata.xml
index fd1c35f8fbe..a2966fc65e1 100644
--- a/sys-boot/silo/metadata.xml
+++ b/sys-boot/silo/metadata.xml
@@ -8,4 +8,7 @@
 
 SILO is the SPARC/UltraSPARC Improved Loader, a boot loader for sparc similar 
to LILO.
 
+
+   Install only the tilo netboot tool
+
 

diff --git a/sys-boot/silo/silo-1.4.14_p20200602.ebuild 
b/sys-boot/silo/silo-1.4.14_p20200602.ebuild
new file mode 100644
index 000..deeed7b293d
--- /dev/null
+++ b/sys-boot/silo/silo-1.4.14_p20200602.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mount-boot flag-o-matic toolchain-funcs vcs-snapshot
+
+MY_SNAPSHOT="${PN}-9277bfd433e398d0a6eabec79edead52d4cb8125"
+
+DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/davem/silo.git/snapshot/${MY_SNAPSHOT}.tar.gz
 -> ${P}.tar.gz"
+HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary";
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="-* ~sparc"
+IUSE="tilo-only"
+
+DEPEND="sys-fs/e2fsprogs
+   sys-apps/sparc-utils"
+RDEPEND=""
+
+src_prepare() {
+   default
+
+   # Set the correct version
+   sed -i -e "s/1.4.14/1.4.14_git20200602/g" Rules.make || die
+
+   # Fix build failure
+   sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing -mcpu=v9/g" 
Rules.make || die
+
+   # Don't strip ieee32.b during compile
+   sed -i -e '/^   $(STRIP) ieee32.b/d' first/Makefile || die
+}
+
+src_compile() {
+   filter-flags "-fstack-protector"
+
+   CC="$(tc-getCC)" \
+   STRIP="$(tc-getSTRIP)" \
+   NM="$(tc-getNM)" \
+   LD="$(tc-getLD)" \
+   emake $(usex tilo-only '-C tilo' '')
+}
+
+src_install() {
+   default
+
+   dodoc first-isofs/README.SILO_ISOFS docs/README*
+
+   # Fix maketilo manpage
+   rm "${D}"/usr/share/man/man1/maketilo.1
+   dosym tilo.1 /usr/share/man/man1/maketilo.1
+}
+
+pkg_postinst() {
+   use tilo-only && return
+
+   mount-boot_pkg_postinst
+   ewarn "NOTE: If this is an upgrade to an existing SILO install,"
+   ewarn "  you will need to re-run silo as the /boot/second.b"
+   ewarn "  file has changed, else the system will fail to load"
+   ewarn "  SILO at the next boot."
+   ewarn
+}

[gentoo-commits] repo/gentoo:master commit in: sys-boot/silo/

2019-06-28 Thread Ben Kohler 
commit: 77ddb23bfef97fba7ed01b244372d1283edb08a9
Author: Ben Kohler  gentoo  org>
AuthorDate: Fri Jun 28 18:38:13 2019 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Fri Jun 28 18:38:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77ddb23b

sys-boot/silo: 1.4.14_p20170829 stable on sparc

Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Ben Kohler  gentoo.org>

 sys-boot/silo/silo-1.4.14_p20170829.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-boot/silo/silo-1.4.14_p20170829.ebuild 
b/sys-boot/silo/silo-1.4.14_p20170829.ebuild
index e62265f8848..9fe244c7d56 100644
--- a/sys-boot/silo/silo-1.4.14_p20170829.ebuild
+++ b/sys-boot/silo/silo-1.4.14_p20170829.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ 
HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary";
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="-* ~sparc"
+KEYWORDS="-* sparc"
 IUSE=""
 
 DEPEND="sys-fs/e2fsprogs

[gentoo-commits] repo/gentoo:master commit in: sys-boot/silo/

2018-05-07 Thread Sergei Trofimovich 
commit: 7feba33143b3b11e91448c9f331ecefd4cd05aa0
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon May  7 16:14:01 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon May  7 16:14:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7feba331

sys-boot/silo: fix a build against PIC profiles

Build failed on default/linux/sparc/17.0 profiles as
  ./util -a silotftp.map silotftp.aout silotftp2.aout silotftp.b silotftp.b2
  Distance between two changes larger than 63K 3 83881 0

I suspect th breakage happens due code inflation (caused by
-fPIC) on new profiles. iamben reports that -fno-PIC makes
silo to build and boot a sparc machine \o/

Fixed-by: iamben
Tested-by: iamben
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild | 4 +++-
 sys-boot/silo/silo-1.4.14_p20170829.ebuild| 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild 
b/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
index 2431901f440..946707a2947 100644
--- a/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
+++ b/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
@@ -40,7 +40,9 @@ src_prepare() {
sed -i -e "s/1.4.14/1.4.14_git20120819_p1/g" Rules.make || die
 
# Fix build failure
-   sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing 
-U_FORTIFY_SOURCE -mcpu=v9/g" Rules.make || die
+   # -fno-PIC is needed to shrink silo size back to manageable on
+   # profiles where gcc has -fPIC default (via --enable-default-pie).
+   sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing 
-U_FORTIFY_SOURCE -mcpu=v9 -fno-PIC/g" Rules.make || die
 }
 
 src_compile() {

diff --git a/sys-boot/silo/silo-1.4.14_p20170829.ebuild 
b/sys-boot/silo/silo-1.4.14_p20170829.ebuild
index dde2b3c9a73..e62265f8848 100644
--- a/sys-boot/silo/silo-1.4.14_p20170829.ebuild
+++ b/sys-boot/silo/silo-1.4.14_p20170829.ebuild
@@ -29,7 +29,9 @@ src_prepare() {
sed -i -e "s/1.4.14/1.4.14_git20170829/g" Rules.make || die
 
# Fix build failure
-   sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing 
-U_FORTIFY_SOURCE -mcpu=v9/g" Rules.make || die
+   # -fno-PIC is needed to shrink silo size back to manageable on
+   # profiles where gcc has -fPIC default (via --enable-default-pie).
+   sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing 
-U_FORTIFY_SOURCE -mcpu=v9 -fno-PIC/g" Rules.make || die
 
# Don't strip ieee32.b during compile
sed -i -e '/^   $(STRIP) ieee32.b/d' first/Makefile || die

[gentoo-commits] repo/gentoo:master commit in: sys-boot/silo/files/

2018-04-05 Thread Aaron Bauman 
commit: 714b85c450678167c02f339d0d6990c0b50a74c8
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu Apr  5 10:49:47 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu Apr  5 15:34:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=714b85c4

sys-boot/silo: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/7826

 sys-boot/silo/files/silo-e2fsprogs-1.4.14.patch | 54 -
 1 file changed, 54 deletions(-)

diff --git a/sys-boot/silo/files/silo-e2fsprogs-1.4.14.patch 
b/sys-boot/silo/files/silo-e2fsprogs-1.4.14.patch
deleted file mode 100644
index afcfc462ea8..000
--- a/sys-boot/silo/files/silo-e2fsprogs-1.4.14.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-# Patch to make silo compile and work with >=e2fsprogs-1.4.14
-# http://bugs.gentoo.org/show_bug.cgi?id=350677
-# http://marc.info/?l=linux-sparc&m=129468771631829&w=2
 silo.orig/common/malloc.c  2010-02-28 12:11:51.0 +0100
-+++ silo/common/malloc.c   2011-01-22 12:06:42.849946213 +0100
-@@ -27,6 +27,12 @@
- 
- static char *last_alloc = 0;
- 
-+static char *align_ptr_to(char *ptr, unsigned long align)
-+{
-+return (char *) unsigned long) ptr) + (align - 1UL)) &
-+   ~(align - 1UL));
-+}
-+
- void *malloc (int size)
- {
- char *caddr;
-@@ -34,10 +40,34 @@
- caddr = malloc_ptr;
- malloc_ptr += size;
- last_alloc = caddr;
--malloc_ptr = (char *) unsigned long) malloc_ptr) + 7) & (~7));
-+malloc_ptr = align_ptr_to(malloc_ptr, 8UL);
- return caddr;
- }
- 
-+int posix_memalign(void **memptr, unsigned long alignment, unsigned long size)
-+{
-+char *caddr;
-+
-+if (alignment & (alignment - 1UL))
-+return -1;
-+if (alignment & (sizeof(void *) - 1UL))
-+return -1;
-+
-+if (size == 0) {
-+  *memptr = (void *) 0;
-+  return 0;
-+}
-+
-+caddr = align_ptr_to(malloc_ptr, alignment);
-+malloc_ptr = (caddr + size);
-+last_alloc = caddr;
-+malloc_ptr = align_ptr_to(malloc_ptr, 8UL);
-+
-+*memptr = caddr;
-+
-+return 0;
-+}
-+
- void free (void *m)
- {
- if (m == last_alloc)

[gentoo-commits] repo/gentoo:master commit in: sys-boot/silo/

2018-04-04 Thread Sergei Trofimovich 
commit: 7366385c6928add323f3d0a9597742795b93f289
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Wed Apr  4 17:47:22 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Apr  4 22:25:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7366385c

sys-boot/silo: stable 1.4.14_p20120819-r1 for sparc

Bug: https://bugs.gentoo.org/648358
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"

 sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild 
b/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
index 8cb43a1287e..2431901f440 100644
--- a/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
+++ b/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
@@ -18,7 +18,7 @@ 
HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary";
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="-* ~sparc"
+KEYWORDS="-* sparc"
 IUSE=""
 
 DEPEND="sys-fs/e2fsprogs

[gentoo-commits] repo/gentoo:master commit in: sys-boot/silo/

2018-04-04 Thread Sergei Trofimovich 
commit: 875d8fa09543c16765cfe69507a5e0998f20fc41
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Wed Apr  4 18:08:56 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Apr  4 22:25:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=875d8fa0

sys-boot/silo: remove old

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"

 sys-boot/silo/Manifest |  4 --
 sys-boot/silo/silo-1.4.14_p20100228.ebuild | 69 --
 sys-boot/silo/silo-1.4.14_p20120226.ebuild | 69 --
 sys-boot/silo/silo-1.4.14_p20120819.ebuild | 63 ---
 4 files changed, 205 deletions(-)

diff --git a/sys-boot/silo/Manifest b/sys-boot/silo/Manifest
index 8f3abcfcba2..e0c4be194e0 100644
--- a/sys-boot/silo/Manifest
+++ b/sys-boot/silo/Manifest
@@ -1,7 +1,3 @@
 DIST silo-1.4.14_p20170829.tar.gz 183612 BLAKE2B 
88fb4b0ce4e9b8fa9518bcb6226f4fe9ec7011bf3f73d9f0f1562ff837217ca8d54ee783eed0b50096b009fc56527be8e4211623f5b0e4ef5372c38c0fe304f1
 SHA512 
bda31084ba2ee5b01d331fd390cbccf039dc812debe25f3af97dd5d2855668cbe7e160dee4ca45c16af1fa4aa86224daf3b474fd49b22a8b7f453584a12f3c2b
-DIST silo_1.4.14+git20100228-1.diff.gz 10143 BLAKE2B 
4282de2900dfa670164ab9c7d64c7793cb5a132fda015750355bad9d94269c223f850d23fe048c215df9653689774dadd8f9cbbdd2919751e574f00b10053e08
 SHA512 
7209fd4fe65d7d72866ce41d25498e8369f59b51833550ecf9ae84badce33e82eccf97835558d560ca9937ebf37d0de99da7876ee4de1bafbe96e931c6d72cf0
-DIST silo_1.4.14+git20100228.orig.tar.gz 738325 BLAKE2B 
5e5e221a9df91b94523c366a9f6ab2d195567e9f2938f141d93750a2fd15ec3cf657ca48155ea1113c7b6db011953fa15c1c6fd05759d7bc47cfc274c43424da
 SHA512 
aa119893695fe0ce5eb30c7a461aa77b0f8935b1e2bcff9f83b232aad8b44cce72662c7c6716c61ea914dd5217edaf8d0e01b363010a2f7d9be9ac80a666bb77
-DIST silo_1.4.14+git20120226-1.diff.gz 10389 BLAKE2B 
ad2f6dfdb468a81b71f1f9b43668d162ca946278b03ce115527712beb49c5319e1e285df7e0fa45bc126264b6c35cb2e950184c0647da3a990e087c6dc28fbca
 SHA512 
0dd39461357f862bc0eb7d0b4db8e3e9acadb30f70c8c638b1adef6f6c306d0c475bf59e29c72a91594fcbf544c80e05e5293b857265d4cd579696f10993483b
-DIST silo_1.4.14+git20120226.orig.tar.gz 747622 BLAKE2B 
c2c92c01516da82f4ee2a2c8dc3a992c26ac89ea22a224aae900761c011c3cb5f13aedfdffb1bf743385910b582928ca6c7d2bd5abef07abbca88a0c08f3aa82
 SHA512 
14d7ad363232e7520f2c1d6ea5ca26e5b0a2059be6b161799cc6cc155ecbe0590c890433a5442f48c2d2a47b784053063e08e4140895807fc595e291f42ab9e8
 DIST silo_1.4.14+git20120819-1.diff.gz 10711 BLAKE2B 
c44a0204e3aece4eec8355f88b3a195c1ba7019c0aa648cc4e28ff6cb85fc6d96634bd282e5aaea9123dbc5835820acf2fc15054c91842d6b1040fc13cb0033b
 SHA512 
60719b672a0f1dd2a005e763efd232bbf7aeb00198e0b46827208b78f1b32acc3a730d43944382dec4b95fddfbb373b1eb69dc911ad28ec9d1d1e6c45d84db20
 DIST silo_1.4.14+git20120819.orig.tar.gz 755510 BLAKE2B 
f1185086671c12c901704c2aa1f582a4e983d2d4a2d5ec18194aebcd43a7bdf9e7ad329efebaf4911d40f8a417ff8c8566b61be4eac5fea13235ac44d0edf852
 SHA512 
2d1dd8f805fb0a272877b5e8e19e5a645aa9fe02cf2b5ef43b5d2894c0c6a5a82483a0e41556af50f01dc795dc5e43350ae92139485c19d64cda75c2aca01a38

diff --git a/sys-boot/silo/silo-1.4.14_p20100228.ebuild 
b/sys-boot/silo/silo-1.4.14_p20100228.ebuild
deleted file mode 100644
index 33094a3840c..000
--- a/sys-boot/silo/silo-1.4.14_p20100228.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit mount-boot flag-o-matic toolchain-funcs eutils
-
-DEB_PL="1"
-MY_PV="${PV##*_p}"
-MY_GIT="git${MY_PV%%_*}"
-MY_PV="${PV%%_*}"
-MY_P="${PN}_${MY_PV}+${MY_GIT}"
-
-DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
-SRC_URI="mirror://debian/pool/main/s/${PN}/${MY_P}.orig.tar.gz
-   mirror://debian/pool/main/s/${PN}/${MY_P}-${DEB_PL}.diff.gz"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* sparc"
-IUSE="hardened"
-
-DEPEND="sys-fs/e2fsprogs
-   sys-apps/sparc-utils"
-
-ABI_ALLOW="sparc32"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-   unpack ${A}
-   cd "${S}"
-
-   #Set the correct version
-   sed -i -e "s/1.4.14/1.4.14_git2010228_p1/g" Rules.make
-
-   # Fix build failure
-   sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing 
-U_FORTIFY_SOURCE/g" Rules.make
-
-   # Fix bug #350677
-   epatch "${FILESDIR}"/silo-e2fsprogs-1.4.14.patch
-}
-
-src_compile() {
-   filter-flags "-fstack-protector"
-
-   if use hardened
-   then
-   make ${MAKEOPTS} CC="$(tc-getCC) -fno-stack-protector -fno-pic"
-   else
-   make ${MAKEOPTS} CC="$(tc-getCC)" || die
-   fi
-}
-
-src_install() {
-   make DESTDIR="${D}" install || die
-   dodoc first-isofs/README.SILO_ISOFS docs/README*
-
-   # Fix maketilo manpage
-   rm "${D}"/usr/share/man/man1/maketilo.1
-   dosym /

[gentoo-commits] repo/gentoo:master commit in: sys-boot/silo/

2018-02-13 Thread Sergei Trofimovich 
commit: 3035a543e7e0fa1ee22e69d66f69863db920f62c
Author: Stephan Hartmann  googlemail  com>
AuthorDate: Mon Feb 12 18:56:32 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Feb 13 19:56:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3035a543

sys-boot/silo: bump 1.4.14_p20170829

Package-Manager: Portage-2.3.19, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7170

 sys-boot/silo/Manifest |  1 +
 sys-boot/silo/silo-1.4.14_p20170829.ebuild | 64 ++
 2 files changed, 65 insertions(+)

diff --git a/sys-boot/silo/Manifest b/sys-boot/silo/Manifest
index fee880417db..8f3abcfcba2 100644
--- a/sys-boot/silo/Manifest
+++ b/sys-boot/silo/Manifest
@@ -1,3 +1,4 @@
+DIST silo-1.4.14_p20170829.tar.gz 183612 BLAKE2B 
88fb4b0ce4e9b8fa9518bcb6226f4fe9ec7011bf3f73d9f0f1562ff837217ca8d54ee783eed0b50096b009fc56527be8e4211623f5b0e4ef5372c38c0fe304f1
 SHA512 
bda31084ba2ee5b01d331fd390cbccf039dc812debe25f3af97dd5d2855668cbe7e160dee4ca45c16af1fa4aa86224daf3b474fd49b22a8b7f453584a12f3c2b
 DIST silo_1.4.14+git20100228-1.diff.gz 10143 BLAKE2B 
4282de2900dfa670164ab9c7d64c7793cb5a132fda015750355bad9d94269c223f850d23fe048c215df9653689774dadd8f9cbbdd2919751e574f00b10053e08
 SHA512 
7209fd4fe65d7d72866ce41d25498e8369f59b51833550ecf9ae84badce33e82eccf97835558d560ca9937ebf37d0de99da7876ee4de1bafbe96e931c6d72cf0
 DIST silo_1.4.14+git20100228.orig.tar.gz 738325 BLAKE2B 
5e5e221a9df91b94523c366a9f6ab2d195567e9f2938f141d93750a2fd15ec3cf657ca48155ea1113c7b6db011953fa15c1c6fd05759d7bc47cfc274c43424da
 SHA512 
aa119893695fe0ce5eb30c7a461aa77b0f8935b1e2bcff9f83b232aad8b44cce72662c7c6716c61ea914dd5217edaf8d0e01b363010a2f7d9be9ac80a666bb77
 DIST silo_1.4.14+git20120226-1.diff.gz 10389 BLAKE2B 
ad2f6dfdb468a81b71f1f9b43668d162ca946278b03ce115527712beb49c5319e1e285df7e0fa45bc126264b6c35cb2e950184c0647da3a990e087c6dc28fbca
 SHA512 
0dd39461357f862bc0eb7d0b4db8e3e9acadb30f70c8c638b1adef6f6c306d0c475bf59e29c72a91594fcbf544c80e05e5293b857265d4cd579696f10993483b

diff --git a/sys-boot/silo/silo-1.4.14_p20170829.ebuild 
b/sys-boot/silo/silo-1.4.14_p20170829.ebuild
new file mode 100644
index 000..dde2b3c9a73
--- /dev/null
+++ b/sys-boot/silo/silo-1.4.14_p20170829.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mount-boot flag-o-matic toolchain-funcs vcs-snapshot
+
+MY_SNAPSHOT="${PN}-2506051d55dd5cb9fe10b4e978e22fa00363044b"
+
+DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/davem/silo.git/snapshot/${MY_SNAPSHOT}.tar.gz
 -> ${P}.tar.gz"
+HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary";
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="-* ~sparc"
+IUSE=""
+
+DEPEND="sys-fs/e2fsprogs
+   sys-apps/sparc-utils"
+RDEPEND=""
+
+ABI_ALLOW="sparc32"
+
+src_prepare() {
+   default
+
+   # Set the correct version
+   sed -i -e "s/1.4.14/1.4.14_git20170829/g" Rules.make || die
+
+   # Fix build failure
+   sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing 
-U_FORTIFY_SOURCE -mcpu=v9/g" Rules.make || die
+
+   # Don't strip ieee32.b during compile
+   sed -i -e '/^   $(STRIP) ieee32.b/d' first/Makefile || die
+}
+
+src_compile() {
+   filter-flags "-fstack-protector"
+
+   emake CC="$(tc-getCC)" \
+   STRIP="$(tc-getSTRIP)" \
+   NM="$(tc-getNM)" \
+   LD="$(tc-getLD)"
+}
+
+src_install() {
+   default
+
+   dodoc first-isofs/README.SILO_ISOFS docs/README*
+
+   # Fix maketilo manpage
+   rm "${D}"/usr/share/man/man1/maketilo.1
+   dosym tilo.1 /usr/share/man/man1/maketilo.1
+}
+
+pkg_postinst() {
+   mount-boot_pkg_postinst
+   ewarn "NOTE: If this is an upgrade to an existing SILO install,"
+   ewarn "  you will need to re-run silo as the /boot/second.b"
+   ewarn "  file has changed, else the system will fail to load"
+   ewarn "  SILO at the next boot."
+   ewarn
+}

[gentoo-commits] repo/gentoo:master commit in: sys-boot/silo/, sys-boot/silo/files/

2018-01-01 Thread Sergei Trofimovich 
commit: 47fdb3554be8764c8adfc03782dcdf41a4448191
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Jan  1 22:37:14 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jan  1 22:37:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47fdb355

sys-boot/silo: fix build failure against gcc-6, bug #639224

It's a commit similar to d534bffc051980f5bca96ae8fbad3f7f1a70297c
("sys-boot/aboot: fix link failure on recent gcc (force gnu90)")

c99 and gnu90 have slightly different semantics
WRT symbol definition: http://www.greenend.org.uk/rjk/tech/inline.html

Reported-by: Rolf Eike Beer
Closes: https://bugs.gentoo.org/639224
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../files/silo-1.4.14_p20120819-gnu90-inline.patch | 20 +++
 sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild  | 69 ++
 2 files changed, 89 insertions(+)

diff --git a/sys-boot/silo/files/silo-1.4.14_p20120819-gnu90-inline.patch 
b/sys-boot/silo/files/silo-1.4.14_p20120819-gnu90-inline.patch
new file mode 100644
index 000..bf6add0ce10
--- /dev/null
+++ b/sys-boot/silo/files/silo-1.4.14_p20120819-gnu90-inline.patch
@@ -0,0 +1,20 @@
+--- a/Rules.make
 b/Rules.make
+@@ -26,2 +26,7 @@ CFLAGS += -fno-stack-protector
+ endif
++ifeq ($(call cc-option-yn, -std=gnu90),y)
++# In gcc-5+ c99 changed inline rules by forbidding
++# multiple extern definitions. Fall back to gnu90
++CFLAGS += -std=gnu90
++endif
+ 
+--- a/silo/Makefile
 b/silo/Makefile
+@@ -6,2 +6,7 @@ UFSDEPS=
+ CFLAGS=-O2 -Wall -I. -I../include
++ifeq ($(call cc-option-yn, -std=gnu90),y)
++# In gcc-5+ c99 changed inline rules by forbidding
++# multiple extern definitions. Fall back to gnu90
++CFLAGS += -std=gnu90
++endif
+ 

diff --git a/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild 
b/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
new file mode 100644
index 000..8cb43a1287e
--- /dev/null
+++ b/sys-boot/silo/silo-1.4.14_p20120819-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mount-boot flag-o-matic toolchain-funcs eutils
+
+DEB_PL="1"
+MY_PV="${PV##*_p}"
+MY_GIT="git${MY_PV%%_*}"
+MY_PV="${PV%%_*}"
+MY_P="${PN}_${MY_PV}+${MY_GIT}"
+
+DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc"
+SRC_URI="mirror://debian/pool/main/s/${PN}/${MY_P}.orig.tar.gz
+   mirror://debian/pool/main/s/${PN}/${MY_P}-${DEB_PL}.diff.gz"
+HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/davem/silo.git;a=summary";
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="-* ~sparc"
+IUSE=""
+
+DEPEND="sys-fs/e2fsprogs
+   sys-apps/sparc-utils"
+RDEPEND=""
+
+ABI_ALLOW="sparc32"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-gnu90-inline.patch
+)
+
+src_prepare() {
+   default
+
+   #Set the correct version
+   sed -i -e "s/1.4.14/1.4.14_git20120819_p1/g" Rules.make || die
+
+   # Fix build failure
+   sed -i -e "s/-fno-strict-aliasing/-fno-strict-aliasing 
-U_FORTIFY_SOURCE -mcpu=v9/g" Rules.make || die
+}
+
+src_compile() {
+   filter-flags "-fstack-protector"
+
+   emake CC="$(tc-getCC)"
+}
+
+src_install() {
+   default
+
+   dodoc first-isofs/README.SILO_ISOFS docs/README*
+
+   # Fix maketilo manpage
+   rm "${D}"/usr/share/man/man1/maketilo.1
+   dosym tilo.1 /usr/share/man/man1/maketilo.1
+}
+
+pkg_postinst() {
+   mount-boot_pkg_postinst
+   ewarn "NOTE: If this is an upgrade to an existing SILO install,"
+   ewarn "  you will need to re-run silo as the /boot/second.b"
+   ewarn "  file has changed, else the system will fail to load"
+   ewarn "  SILO at the next boot."
+   ewarn
+}