Annotation of /trunk/systemd/patches/systemd-220-always-include-src_boot_efi-in-tarballs.patch
Parent Directory | Revision Log
Revision 2586 -
(hide annotations)
(download)
Thu Jun 18 13:04:39 2015 UTC (9 years, 3 months ago) by niro
File size: 2366 byte(s)
Thu Jun 18 13:04:39 2015 UTC (9 years, 3 months ago) by niro
File size: 2366 byte(s)
-fixed gnuefi support
1 | niro | 2586 | From f80099c06fd12c87da4d2207fb2e2f31ffaec6ed Mon Sep 17 00:00:00 2001 |
2 | From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | ||
3 | Date: Mon, 25 May 2015 11:18:17 +0200 | ||
4 | Subject: build-sys: always include src/boot/efi in tarballs | ||
5 | |||
6 | currently it would only be included if configure was ran with --enable-gnuefi | ||
7 | |||
8 | diff --git a/Makefile.am b/Makefile.am | ||
9 | index 70d4dc0..9420879 100644 | ||
10 | --- a/Makefile.am | ||
11 | +++ b/Makefile.am | ||
12 | @@ -2601,6 +2601,8 @@ EFI_FORMAT = -O binary | ||
13 | else | ||
14 | EFI_FORMAT = --target=efi-app-$(EFI_ARCH) | ||
15 | endif | ||
16 | +endif | ||
17 | +endif | ||
18 | |||
19 | # ------------------------------------------------------------------------------ | ||
20 | systemd_boot_headers = \ | ||
21 | @@ -2616,13 +2618,16 @@ systemd_boot_sources = \ | ||
22 | src/boot/efi/pefile.c \ | ||
23 | src/boot/efi/boot.c | ||
24 | |||
25 | +EXTRA_DIST += $(systemd_boot_sources) $(systemd_boot_headers) | ||
26 | + | ||
27 | +if ENABLE_EFI | ||
28 | +if HAVE_GNUEFI | ||
29 | systemd_boot_objects = $(addprefix $(top_builddir)/,$(systemd_boot_sources:.c=.o)) | ||
30 | systemd_boot_solib = $(top_builddir)/src/boot/efi/systemd_boot.so | ||
31 | systemd_boot = systemd-boot$(EFI_MACHINE_TYPE_NAME).efi | ||
32 | |||
33 | bootlib_DATA = $(systemd_boot) | ||
34 | CLEANFILES += $(systemd_boot_objects) $(systemd_boot_solib) $(systemd_boot) | ||
35 | -EXTRA_DIST += $(systemd_boot_sources) $(systemd_boot_headers) | ||
36 | |||
37 | $(top_builddir)/src/boot/efi/%.o: $(top_srcdir)/src/boot/efi/%.c $(addprefix $(top_srcdir)/,$(systemd_boot_headers)) | ||
38 | @$(MKDIR_P) $(top_builddir)/src/boot/efi/ | ||
39 | @@ -2636,6 +2641,8 @@ $(systemd_boot_solib): $(systemd_boot_objects) | ||
40 | $(systemd_boot): $(systemd_boot_solib) | ||
41 | $(AM_V_GEN)$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \ | ||
42 | -j .dynsym -j .rel -j .rela -j .reloc $(EFI_FORMAT) $< $@ | ||
43 | +endif | ||
44 | +endif | ||
45 | |||
46 | # ------------------------------------------------------------------------------ | ||
47 | stub_headers = \ | ||
48 | @@ -2653,13 +2660,16 @@ stub_sources = \ | ||
49 | src/boot/efi/linux.c \ | ||
50 | src/boot/efi/stub.c | ||
51 | |||
52 | +EXTRA_DIST += $(stub_sources) $(stub_headers) | ||
53 | + | ||
54 | +if ENABLE_EFI | ||
55 | +if HAVE_GNUEFI | ||
56 | stub_objects = $(addprefix $(top_builddir)/,$(stub_sources:.c=.o)) | ||
57 | stub_solib = $(top_builddir)/src/boot/efi/stub.so | ||
58 | stub = linux$(EFI_MACHINE_TYPE_NAME).efi.stub | ||
59 | |||
60 | bootlib_DATA += $(stub) | ||
61 | CLEANFILES += $(stub_objects) $(stub_solib) $(stub) | ||
62 | -EXTRA_DIST += $(stub_sources) $(stub_headers) | ||
63 | |||
64 | $(top_builddir)/src/boot/efi/%.o: $(top_srcdir)/src/boot/efi/%.c $(addprefix $(top_srcdir)/,$(stub_headers)) | ||
65 | @$(MKDIR_P) $(top_builddir)/src/boot/efi/ | ||
66 | -- | ||
67 | cgit v0.10.2 | ||
68 |