aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJóhann B. Guðmundsson <johannbg@gmail.com>2021-05-06 13:29:19 +0000
committerHarald Hoyer <harald@hoyer.xyz>2021-05-06 16:25:32 +0200
commit3420a70dee112bc92ea6a805455846eeb139228e (patch)
tree643bdbf9a31a9f281636eae3baa5cda9a45da9bd
parent215365441e1042793d62c4c9e146be5916ed5aeb (diff)
downloaddracut-3420a70dee112bc92ea6a805455846eeb139228e.tar.gz
chore(install): move install to src directory
Moving install to the src directory
-rw-r--r--Makefile36
-rw-r--r--src/install/.kateconfig (renamed from install/.kateconfig)0
-rw-r--r--src/install/Makefile (renamed from install/Makefile)0
-rw-r--r--src/install/dracut-install.c (renamed from install/dracut-install.c)0
-rw-r--r--src/install/hashmap.c (renamed from install/hashmap.c)0
-rw-r--r--src/install/hashmap.h (renamed from install/hashmap.h)0
-rw-r--r--src/install/hashmap.lo (renamed from install/hashmap.lo)0
-rw-r--r--src/install/log.c (renamed from install/log.c)0
-rw-r--r--src/install/log.h (renamed from install/log.h)0
-rw-r--r--src/install/macro.h (renamed from install/macro.h)0
-rw-r--r--src/install/strv.c (renamed from install/strv.c)0
-rw-r--r--src/install/strv.h (renamed from install/strv.h)0
-rw-r--r--src/install/util.c (renamed from install/util.c)0
-rw-r--r--src/install/util.h (renamed from install/util.h)0
14 files changed, 18 insertions, 18 deletions
diff --git a/Makefile b/Makefile
index 8b43d59b..909d523c 100644
--- a/Makefile
+++ b/Makefile
@@ -57,28 +57,28 @@ all: dracut-version.sh dracut.pc dracut-install src/skipcpio/skipcpio dracut-uti
$(CC) -c $(CFLAGS) $(CPPFLAGS) $(KMOD_CFLAGS) $< -o $@
DRACUT_INSTALL_OBJECTS = \
- install/dracut-install.o \
- install/hashmap.o\
- install/log.o \
- install/strv.o \
- install/util.o
+ src/install/dracut-install.o \
+ src/install/hashmap.o\
+ src/install/log.o \
+ src/install/strv.o \
+ src/install/util.o
# deps generated with gcc -MM
-install/dracut-install.o: install/dracut-install.c install/log.h install/macro.h \
- install/hashmap.h install/util.h
-install/hashmap.o: install/hashmap.c install/util.h install/macro.h install/log.h \
- install/hashmap.h
-install/log.o: install/log.c install/log.h install/macro.h install/util.h
-install/util.o: install/util.c install/util.h install/macro.h install/log.h
-install/strv.o: install/strv.c install/strv.h install/util.h install/macro.h install/log.h
-
-install/dracut-install: $(DRACUT_INSTALL_OBJECTS)
+src/install/dracut-install.o: src/install/dracut-install.c src/install/log.h src/install/macro.h \
+ src/install/hashmap.h src/install/util.h
+src/install/hashmap.o: src/install/hashmap.c src/install/util.h src/install/macro.h src/install/log.h \
+ src/install/hashmap.h
+src/install/log.o: src/install/log.c src/install/log.h src/install/macro.h src/install/util.h
+src/install/util.o: src/install/util.c src/install/util.h src/install/macro.h src/install/log.h
+src/install/strv.o: src/install/strv.c src/install/strv.h src/install/util.h src/install/macro.h src/install/log.h
+
+src/install/dracut-install: $(DRACUT_INSTALL_OBJECTS)
$(CC) $(LDFLAGS) -o $@ $(DRACUT_INSTALL_OBJECTS) $(LDLIBS) $(FTS_LIBS) $(KMOD_LIBS)
logtee: src/logtee/logtee.c
$(CC) $(LDFLAGS) -o $@ $<
-dracut-install: install/dracut-install
+dracut-install: src/install/dracut-install
ln -fs $< $@
SKIPCPIO_OBJECTS = src/skipcpio/skipcpio.o
@@ -187,8 +187,8 @@ endif
$(DESTDIR)$(systemdsystemunitdir)/initrd.target.wants/$$i; \
done \
fi
- if [ -f install/dracut-install ]; then \
- install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \
+ if [ -f src/install/dracut-install ]; then \
+ install -m 0755 src/install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \
fi
if [ -f src/skipcpio/skipcpio ]; then \
install -m 0755 src/skipcpio/skipcpio $(DESTDIR)$(pkglibdir)/skipcpio; \
@@ -217,7 +217,7 @@ clean:
$(RM) test-*.img
$(RM) dracut-*.rpm dracut-*.tar.bz2 dracut-*.tar.xz
$(RM) dracut-version.sh
- $(RM) dracut-install install/dracut-install $(DRACUT_INSTALL_OBJECTS)
+ $(RM) dracut-install src/install/dracut-install $(DRACUT_INSTALL_OBJECTS)
$(RM) skipcpio/skipcpio $(SKIPCPIO_OBJECTS)
$(RM) dracut-util util/util $(UTIL_OBJECTS)
$(RM) $(manpages) dracut.html
diff --git a/install/.kateconfig b/src/install/.kateconfig
index 12215289..12215289 100644
--- a/install/.kateconfig
+++ b/src/install/.kateconfig
diff --git a/install/Makefile b/src/install/Makefile
index 5332f251..5332f251 100644
--- a/install/Makefile
+++ b/src/install/Makefile
diff --git a/install/dracut-install.c b/src/install/dracut-install.c
index b4eec363..b4eec363 100644
--- a/install/dracut-install.c
+++ b/src/install/dracut-install.c
diff --git a/install/hashmap.c b/src/install/hashmap.c
index 65aab208..65aab208 100644
--- a/install/hashmap.c
+++ b/src/install/hashmap.c
diff --git a/install/hashmap.h b/src/install/hashmap.h
index 4f9c33a0..4f9c33a0 100644
--- a/install/hashmap.h
+++ b/src/install/hashmap.h
diff --git a/install/hashmap.lo b/src/install/hashmap.lo
index c7260f22..c7260f22 100644
--- a/install/hashmap.lo
+++ b/src/install/hashmap.lo
diff --git a/install/log.c b/src/install/log.c
index a3198f04..a3198f04 100644
--- a/install/log.c
+++ b/src/install/log.c
diff --git a/install/log.h b/src/install/log.h
index 6e8c4e6a..6e8c4e6a 100644
--- a/install/log.h
+++ b/src/install/log.h
diff --git a/install/macro.h b/src/install/macro.h
index aae601e8..aae601e8 100644
--- a/install/macro.h
+++ b/src/install/macro.h
diff --git a/install/strv.c b/src/install/strv.c
index a4944513..a4944513 100644
--- a/install/strv.c
+++ b/src/install/strv.c
diff --git a/install/strv.h b/src/install/strv.h
index 7b94f682..7b94f682 100644
--- a/install/strv.h
+++ b/src/install/strv.h
diff --git a/install/util.c b/src/install/util.c
index a947e3fc..a947e3fc 100644
--- a/install/util.c
+++ b/src/install/util.c
diff --git a/install/util.h b/src/install/util.h
index a6f9a184..a6f9a184 100644
--- a/install/util.h
+++ b/src/install/util.h