shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-07 21:18:55 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1969 from ricardosalveti/master

Browse Source 
Makefile: declare ostree_boot_SCRIPTS and append values
This commit is contained in:
OpenShift Merge Robot 2019-11-06 16:39:59 +01:00 committed by GitHub
commit cb3eff6cfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile-boot.am
View File

@ -60,7 +60,7 @@ grub2configdir = $(sysconfdir)/grub.d
INSTALL_DATA_HOOKS += install-grub2-config-hook INSTALL_DATA_HOOKS += install-grub2-config-hook
else else
# We're using our internal generator # We're using our internal generator
ostree_boot_SCRIPTS = src/boot/grub2/ostree-grub-generator ostree_boot_SCRIPTS += src/boot/grub2/ostree-grub-generator
endif endif
EXTRA_DIST += src/boot/dracut/module-setup.sh \ EXTRA_DIST += src/boot/dracut/module-setup.sh \

1
Makefile-decls.am
View File

@ -47,6 +47,7 @@ typelibdir = $(libdir)/girepository-1.0
typelib_DATA = typelib_DATA =
gsettings_SCHEMAS = gsettings_SCHEMAS =
ostree_bootdir = $(prefix)/lib/ostree ostree_bootdir = $(prefix)/lib/ostree
ostree_boot_SCRIPTS =
ostree_boot_PROGRAMS = ostree_boot_PROGRAMS =
# This initializes some more variables # This initializes some more variables

2
Makefile-switchroot.am
View File

@ -42,7 +42,7 @@ if BUILDOPT_USE_STATIC_COMPILER
# to get autotools to install this as an executable but without generating rules # to get autotools to install this as an executable but without generating rules
# to make it itself which we have specified manually. See # to make it itself which we have specified manually. See
# https://lists.gnu.org/archive/html/help-gnu-utils/2007-01/msg00007.html # https://lists.gnu.org/archive/html/help-gnu-utils/2007-01/msg00007.html
ostree_boot_SCRIPTS = ostree-prepare-root ostree_boot_SCRIPTS += ostree-prepare-root
ostree-prepare-root : $(ostree_prepare_root_SOURCES) ostree-prepare-root : $(ostree_prepare_root_SOURCES)
$(STATIC_COMPILER) -o $@ -static $(top_srcdir)/src/switchroot/ostree-prepare-root.c $(ostree_prepare_root_CPPFLAGS) $(AM_CFLAGS) $(DEFAULT_INCLUDES) -DOSTREE_PREPARE_ROOT_STATIC=1 $(STATIC_COMPILER) -o $@ -static $(top_srcdir)/src/switchroot/ostree-prepare-root.c $(ostree_prepare_root_CPPFLAGS) $(AM_CFLAGS) $(DEFAULT_INCLUDES) -DOSTREE_PREPARE_ROOT_STATIC=1