|
 |
12f6cc0 |
From 24ba78cb77b3a8ce50902da1795a2d3cdac11691 Mon Sep 17 00:00:00 2001
|
|
|
12f6cc0 |
From: Harald Hoyer <harald@redhat.com>
|
|
|
12f6cc0 |
Date: Thu, 26 Jul 2012 11:50:50 +0200
|
|
|
12f6cc0 |
Subject: [PATCH] Makefile: fixed dracut-install make target
|
|
|
12f6cc0 |
|
|
|
12f6cc0 |
---
|
|
|
12f6cc0 |
Makefile | 27 +++++++++++++++++----------
|
|
|
12f6cc0 |
dracut.spec | 1 +
|
|
|
12f6cc0 |
2 files changed, 18 insertions(+), 10 deletions(-)
|
|
|
12f6cc0 |
|
|
|
12f6cc0 |
diff --git a/Makefile b/Makefile
|
|
|
12f6cc0 |
index d013cbc..0dbc6eb 100644
|
|
|
12f6cc0 |
--- a/Makefile
|
|
|
12f6cc0 |
+++ b/Makefile
|
|
|
12f6cc0 |
@@ -33,17 +33,24 @@ manpages = $(man1pages) $(man5pages) $(man7pages) $(man8pages)
|
|
|
12f6cc0 |
|
|
|
12f6cc0 |
.PHONY: install clean archive rpm testimage test all check AUTHORS doc
|
|
|
12f6cc0 |
|
|
|
12f6cc0 |
-DRACUT_INSTALL_BIN = install/dracut-install
|
|
|
12f6cc0 |
-
|
|
|
12f6cc0 |
-DRACUT_INSTALL_OBJECTS = \
|
|
|
12f6cc0 |
- install/dracut-install.o \
|
|
|
12f6cc0 |
- install/hashmap.o\
|
|
|
12f6cc0 |
- install/log.o \
|
|
|
12f6cc0 |
- install/util.o
|
|
|
12f6cc0 |
+DRACUT_INSTALL_BIN = dracut-install
|
|
|
12f6cc0 |
|
|
|
12f6cc0 |
all: syncheck dracut-version.sh $(DRACUT_INSTALL_BIN)
|
|
|
12f6cc0 |
|
|
|
12f6cc0 |
-$(DRACUT_INSTALL_BIN): $(DRACUT_INSTALL_OBJECTS)
|
|
|
12f6cc0 |
+DRACUT_INSTALL_SOURCE = \
|
|
|
12f6cc0 |
+ install/dracut-install.c \
|
|
|
12f6cc0 |
+ install/hashmap.c\
|
|
|
12f6cc0 |
+ install/log.c \
|
|
|
12f6cc0 |
+ install/util.c
|
|
|
12f6cc0 |
+
|
|
|
12f6cc0 |
+DRACUT_INSTALL_HEADER = \
|
|
|
12f6cc0 |
+ install/hashmap.h \
|
|
|
12f6cc0 |
+ install/log.h \
|
|
|
12f6cc0 |
+ install/macro.h \
|
|
|
12f6cc0 |
+ install/util.h
|
|
|
12f6cc0 |
+
|
|
|
12f6cc0 |
+$(DRACUT_INSTALL_BIN): $(DRACUT_INSTALL_SOURCE) $(DRACUT_INSTALL_HEADER)
|
|
|
12f6cc0 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $(DRACUT_INSTALL_BIN) $(DRACUT_INSTALL_SOURCE)
|
|
|
12f6cc0 |
|
|
|
12f6cc0 |
indent:
|
|
|
12f6cc0 |
indent -i8 -nut -br -linux -l120 install/dracut-install.c
|
|
|
12f6cc0 |
@@ -95,7 +102,7 @@ install: doc dracut-version.sh
|
|
|
12f6cc0 |
ln -s ../dracut-shutdown.service \
|
|
|
12f6cc0 |
$(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants/dracut-shutdown.service; \
|
|
|
12f6cc0 |
fi
|
|
|
12f6cc0 |
- if [ -x $(DRACUT_INSTALL_BIN) ]; then \
|
|
|
12f6cc0 |
+ if [ -f $(DRACUT_INSTALL_BIN) ]; then \
|
|
|
12f6cc0 |
install -m 0755 $(DRACUT_INSTALL_BIN) $(DESTDIR)$(pkglibdir)/dracut-install; \
|
|
|
12f6cc0 |
fi
|
|
|
12f6cc0 |
|
|
|
12f6cc0 |
@@ -108,7 +115,7 @@ clean:
|
|
|
12f6cc0 |
$(RM) */*/*~
|
|
|
12f6cc0 |
$(RM) test-*.img
|
|
|
12f6cc0 |
$(RM) dracut-*.rpm dracut-*.tar.bz2
|
|
|
12f6cc0 |
- $(RM) $(DRACUT_INSTALL_BIN) $(DRACUT_INSTALL_OBJECTS)
|
|
|
12f6cc0 |
+ $(RM) $(DRACUT_INSTALL_BIN)
|
|
|
12f6cc0 |
$(RM) $(manpages) dracut.html
|
|
|
12f6cc0 |
$(MAKE) -C test clean
|
|
|
12f6cc0 |
|
|
|
12f6cc0 |
diff --git a/dracut.spec b/dracut.spec
|
|
|
12f6cc0 |
index 0d4062f..d960506 100644
|
|
|
12f6cc0 |
--- a/dracut.spec
|
|
|
12f6cc0 |
+++ b/dracut.spec
|
|
|
12f6cc0 |
@@ -286,6 +286,7 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
12f6cc0 |
%{dracutlibdir}/modules.d/90multipath
|
|
|
12f6cc0 |
%{dracutlibdir}/modules.d/90qemu
|
|
|
12f6cc0 |
%{dracutlibdir}/modules.d/91crypt-gpg
|
|
|
12f6cc0 |
+%{dracutlibdir}/modules.d/91crypt-loop
|
|
|
12f6cc0 |
%{dracutlibdir}/modules.d/95debug
|
|
|
12f6cc0 |
%{dracutlibdir}/modules.d/95resume
|
|
|
12f6cc0 |
%{dracutlibdir}/modules.d/95rootfs-block
|