From 9f9bf8a1783320b9350073814b61bbc50bd4e0ab Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@gmail.com>
Date: Mon, 3 May 2021 17:14:26 +0000
Subject: [PATCH 1/1] chore(tree): move src into their own src directory

Moving sources into their src directory
---
 Makefile                                  | 18 +++++++++---------
 logtee.c => src/logtee/logtee.c           |  0
 {skipcpio => src/skipcpio}/.dir-locals.el |  0
 {skipcpio => src/skipcpio}/.kateconfig    |  0
 {skipcpio => src/skipcpio}/skipcpio.c     |  0
 {util => src/util}/CMakeLists.txt         |  0
 {util => src/util}/util.c                 |  0
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename logtee.c => src/logtee/logtee.c (100%)
 rename {skipcpio => src/skipcpio}/.dir-locals.el (100%)
 rename {skipcpio => src/skipcpio}/.kateconfig (100%)
 rename {skipcpio => src/skipcpio}/skipcpio.c (100%)
 rename {util => src/util}/CMakeLists.txt (100%)
 rename {util => src/util}/util.c (100%)

diff --git a/Makefile b/Makefile
index 33169bd96..143b3d1c6 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ manpages = $(man1pages) $(man5pages) $(man7pages) $(man8pages)
 
 .PHONY: install clean archive rpm srpm testimage test all check AUTHORS CONTRIBUTORS doc dracut-version.sh
 
-all: dracut-version.sh dracut.pc dracut-install skipcpio/skipcpio dracut-util
+all: dracut-version.sh dracut.pc dracut-install src/skipcpio/skipcpio dracut-util
 
 %.o : %.c
 	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(KMOD_CFLAGS) $< -o $@
@@ -74,21 +74,21 @@ install/strv.o: install/strv.c install/strv.h install/util.h install/macro.h ins
 install/dracut-install: $(DRACUT_INSTALL_OBJECTS)
 	$(CC) $(LDFLAGS) -o $@ $(DRACUT_INSTALL_OBJECTS) $(LDLIBS) $(FTS_LIBS) $(KMOD_LIBS)
 
-logtee: logtee.c
+logtee: src/logtee/logtee.c
 	$(CC) $(LDFLAGS) -o $@ $<
 
 dracut-install: install/dracut-install
 	ln -fs $< $@
 
-SKIPCPIO_OBJECTS = skipcpio/skipcpio.o
-skipcpio/skipcpio.o: skipcpio/skipcpio.c
+SKIPCPIO_OBJECTS = src/skipcpio/skipcpio.o
+skipcpio/skipcpio.o: src/skipcpio/skipcpio.c
 skipcpio/skipcpio: $(SKIPCPIO_OBJECTS)
 
-UTIL_OBJECTS = util/util.o
-util/util.o: util/util.c
+UTIL_OBJECTS = src/util/util.o
+util/util.o: src/util/util.c
 util/util: $(UTIL_OBJECTS)
 
-dracut-util: util/util
+dracut-util: src/util/util
 	cp -a $< $@
 
 .PHONY: indent-c
@@ -189,8 +189,8 @@ endif
 	if [ -f install/dracut-install ]; then \
 		install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \
 	fi
-	if [ -f skipcpio/skipcpio ]; then \
-		install -m 0755 skipcpio/skipcpio $(DESTDIR)$(pkglibdir)/skipcpio; \
+	if [ -f src/skipcpio/skipcpio ]; then \
+		install -m 0755 src/skipcpio/skipcpio $(DESTDIR)$(pkglibdir)/skipcpio; \
 	fi
 	if [ -f dracut-util ]; then \
 		install -m 0755 dracut-util $(DESTDIR)$(pkglibdir)/dracut-util; \
diff --git a/logtee.c b/src/logtee/logtee.c
similarity index 100%
rename from logtee.c
rename to src/logtee/logtee.c
diff --git a/skipcpio/.dir-locals.el b/src/skipcpio/.dir-locals.el
similarity index 100%
rename from skipcpio/.dir-locals.el
rename to src/skipcpio/.dir-locals.el
diff --git a/skipcpio/.kateconfig b/src/skipcpio/.kateconfig
similarity index 100%
rename from skipcpio/.kateconfig
rename to src/skipcpio/.kateconfig
diff --git a/skipcpio/skipcpio.c b/src/skipcpio/skipcpio.c
similarity index 100%
rename from skipcpio/skipcpio.c
rename to src/skipcpio/skipcpio.c
diff --git a/util/CMakeLists.txt b/src/util/CMakeLists.txt
similarity index 100%
rename from util/CMakeLists.txt
rename to src/util/CMakeLists.txt
diff --git a/util/util.c b/src/util/util.c
similarity index 100%
rename from util/util.c
rename to src/util/util.c
-- 
2.39.5