* [PATCH] silo: Allow building tilo only
@ 2020-04-06 20:27 Matt Turner
2020-04-17 19:39 ` Matt Turner
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Matt Turner @ 2020-04-06 20:27 UTC (permalink / raw)
To: sparclinux
The bootloader bits are built as 32-bit, which can be difficult to do on
a system with a 64-bit userland since they include system headers.
Specifically, the inclusion of <gnu/stubs-32.h> is problematic since
this header is not provided on a non-multilib build of glibc.
<gnu/stubs-32.h>, included by
<gnu/stubs.h>, included by
<features.h>, included by
<elf.h> and <setjmp.h>
tilo is built for the host machine and doesn't have this problem.
Signed-off-by: Matt Turner <mattst88@gmail.com>
---
Makefile | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 15a0de1..b411020 100644
--- a/Makefile
+++ b/Makefile
@@ -3,27 +3,37 @@ include Rules.make
# These only get built on Linux
ifeq ($(OPSYS),Linux)
- SUBDIRS = common first second first-isofs tilo
+ifneq ($(TILO_ONLY),yes)
+ SUBDIRS = common first second first-isofs
+endif
+ SUBDIRS += tilo
MANPAGES = maketilo.1 tilo.1
endif
+ifneq ($(TILO_ONLY),yes)
# These get built on Linux and Solaris
MANPAGES += silo.8 silo.conf.5
SUBDIRS += silo
+endif
all dep depend clean:
@for I in $(SUBDIRS); do $(MAKE) -C $$I $@ || exit 1; done
ifeq ($(OPSYS),$(findstring $(OPSYS),Linux Solaris))
install:
+ifneq ($(TILO_ONLY),yes)
install -d -m755 $(DESTDIR)/etc $(DESTDIR)/sbin $(DESTDIR)/usr/sbin
install -m755 silo/silo $(DESTDIR)/sbin
install -m755 silo/silocheck $(DESTDIR)/usr/sbin
[ -f $(DESTDIR)/etc/silo.conf ] || \
install -m644 etc/silo.conf $(DESTDIR)/etc/
+endif
ifeq ($(OPSYS),Linux)
- install -d -m755 $(DESTDIR)/boot $(DESTDIR)/usr/bin
+ifneq ($(TILO_ONLY),yes)
+ install -d -m755 $(DESTDIR)/boot
install -m644 first/*.b second/*.b first-isofs/*.b $(DESTDIR)/boot/
+endif
+ install -d -m755 $(DESTDIR)/usr/bin
install -m755 tilo/maketilo $(DESTDIR)/usr/bin/
install -m755 tilo/tilo.sh $(DESTDIR)/usr/bin/tilo
endif
--
2.24.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] silo: Allow building tilo only
2020-04-06 20:27 [PATCH] silo: Allow building tilo only Matt Turner
@ 2020-04-17 19:39 ` Matt Turner
2020-04-17 23:30 ` David Miller
2020-05-13 22:26 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2020-04-17 19:39 UTC (permalink / raw)
To: sparclinux
Ping (and for the other 5 patches I sent as well)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] silo: Allow building tilo only
2020-04-06 20:27 [PATCH] silo: Allow building tilo only Matt Turner
2020-04-17 19:39 ` Matt Turner
@ 2020-04-17 23:30 ` David Miller
2020-05-13 22:26 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2020-04-17 23:30 UTC (permalink / raw)
To: sparclinux
From: Matt Turner <mattst88@gmail.com>
Date: Fri, 17 Apr 2020 12:39:24 -0700
> Ping (and for the other 5 patches I sent as well)
I'll take a look at this soon.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] silo: Allow building tilo only
2020-04-06 20:27 [PATCH] silo: Allow building tilo only Matt Turner
2020-04-17 19:39 ` Matt Turner
2020-04-17 23:30 ` David Miller
@ 2020-05-13 22:26 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2020-05-13 22:26 UTC (permalink / raw)
To: sparclinux
From: Matt Turner <mattst88@gmail.com>
Date: Mon, 6 Apr 2020 13:27:16 -0700
> The bootloader bits are built as 32-bit, which can be difficult to do on
> a system with a 64-bit userland since they include system headers.
>
> Specifically, the inclusion of <gnu/stubs-32.h> is problematic since
> this header is not provided on a non-multilib build of glibc.
>
> <gnu/stubs-32.h>, included by
> <gnu/stubs.h>, included by
> <features.h>, included by
> <elf.h> and <setjmp.h>
>
> tilo is built for the host machine and doesn't have this problem.
>
> Signed-off-by: Matt Turner <mattst88@gmail.com>
Applied, thanks Matt.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-05-13 22:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-06 20:27 [PATCH] silo: Allow building tilo only Matt Turner
2020-04-17 19:39 ` Matt Turner
2020-04-17 23:30 ` David Miller
2020-05-13 22:26 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.