]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
chore(tree): move tools into their own directory
authorJóhann B. Guðmundsson <johannbg@gmail.com>
Mon, 3 May 2021 15:20:36 +0000 (15:20 +0000)
committerHarald Hoyer <harald@hoyer.xyz>
Tue, 4 May 2021 08:01:14 +0000 (10:01 +0200)
Moving tools into their own directory

.github/workflows/fedora.yml
Makefile
tools/fedora-test-github.sh [moved from fedora-test-github.sh with 97% similarity]
tools/fedora-test.sh [moved from fedora-test.sh with 94% similarity]
tools/git2spec.pl [moved from git2spec.pl with 100% similarity]
tools/profile.py [moved from profile.py with 100% similarity]

index 8bb90ceef03079eb8da5b06bf5164630d1d28797..24ca7fb48240e18bbca7315974e47883f1b04f93 100644 (file)
@@ -53,4 +53,4 @@ jobs:
                     fetch-depth: 0
 
             -   name: "Fedora-${{ matrix.fedora }} TEST-${{ matrix.test }}"
-                run: ./fedora-test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
+                run: ./tools/fedora-test-github.sh "TEST-${{ matrix.test }}" ${{ matrix.test }}
index 8a29edfaa00926b7a1aefbd5126f97d1fb229925..33169bd96c989ab4a1e601d6157e1919007d7a7d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -238,7 +238,7 @@ dracut-$(DRACUT_MAIN_VERSION).tar.xz: doc syncheck
 rpm: dracut-$(DRACUT_MAIN_VERSION).tar.xz syncheck
        rpmbuild=$$(mktemp -d -p /var/tmp rpmbuild-dracut.XXXXXX); src=$$(pwd); \
        cp dracut-$(DRACUT_MAIN_VERSION).tar.xz "$$rpmbuild"; \
-       LC_MESSAGES=C $$src/git2spec.pl $(DRACUT_MAIN_VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \
+       LC_MESSAGES=C $$src/tools/git2spec.pl $(DRACUT_MAIN_VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \
        (cd "$$rpmbuild"; \
        wget https://www.gnu.org/licenses/lgpl-2.1.txt; \
        rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \
@@ -249,7 +249,7 @@ rpm: dracut-$(DRACUT_MAIN_VERSION).tar.xz syncheck
 srpm: dracut-$(DRACUT_MAIN_VERSION).tar.xz syncheck
        rpmbuild=$$(mktemp -d -t rpmbuild-dracut.XXXXXX); src=$$(pwd); \
        cp dracut-$(DRACUT_MAIN_VERSION).tar.xz "$$rpmbuild"; \
-       LC_MESSAGES=C $$src/git2spec.pl $(DRACUT_MAIN_VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \
+       LC_MESSAGES=C $$src/tools/git2spec.pl $(DRACUT_MAIN_VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \
        (cd "$$rpmbuild"; \
        [ -f $$src/lgpl-2.1.txt ] && cp $$src/lgpl-2.1.txt . || wget https://www.gnu.org/licenses/lgpl-2.1.txt; \
        rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \
similarity index 97%
rename from fedora-test-github.sh
rename to tools/fedora-test-github.sh
index 6f82d8d585ece7e32c780d73086091957cb221ac..f9c934fb8009ed0b26900730779ed0732b18f4d5 100755 (executable)
@@ -2,7 +2,7 @@
 
 set -ex
 
-[[ -d ${0%/*} ]] && cd "${0%/*}"
+[[ -d ${0%/*} ]] && cd "${0%/*}"/../
 
 RUN_ID="$1"
 TESTS=$2
similarity index 94%
rename from fedora-test.sh
rename to tools/fedora-test.sh
index f3bc3ccd63dca2750f354ded7d4fb71ffb4a462c..b53bb28094e4fd3e2e3e3937739c36f9830f6192 100755 (executable)
@@ -2,7 +2,7 @@
 
 set -ex
 
-[[ -d ${0%/*} ]] && cd "${0%/*}"
+[[ -d ${0%/*} ]] && cd "${0%/*}"/../
 
 RUN_ID="$1"
 TESTS=$2
similarity index 100%
rename from git2spec.pl
rename to tools/git2spec.pl
similarity index 100%
rename from profile.py
rename to tools/profile.py