From a02d17f7af94f6d12eae8ca32bdfd4289c8c9153 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= Date: Mon, 3 May 2021 15:20:36 +0000 Subject: [PATCH] chore(tree): move tools into their own directory Moving tools into their own directory --- .github/workflows/fedora.yml | 2 +- Makefile | 4 ++-- fedora-test-github.sh => tools/fedora-test-github.sh | 2 +- fedora-test.sh => tools/fedora-test.sh | 2 +- git2spec.pl => tools/git2spec.pl | 0 profile.py => tools/profile.py | 0 6 files changed, 5 insertions(+), 5 deletions(-) rename fedora-test-github.sh => tools/fedora-test-github.sh (97%) rename fedora-test.sh => tools/fedora-test.sh (94%) rename git2spec.pl => tools/git2spec.pl (100%) rename profile.py => tools/profile.py (100%) diff --git a/.github/workflows/fedora.yml b/.github/workflows/fedora.yml index 8bb90ceef..24ca7fb48 100644 --- a/.github/workflows/fedora.yml +++ b/.github/workflows/fedora.yml @@ -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 }} diff --git a/Makefile b/Makefile index 8a29edfaa..33169bd96 100644 --- 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" \ diff --git a/fedora-test-github.sh b/tools/fedora-test-github.sh similarity index 97% rename from fedora-test-github.sh rename to tools/fedora-test-github.sh index 6f82d8d58..f9c934fb8 100755 --- a/fedora-test-github.sh +++ b/tools/fedora-test-github.sh @@ -2,7 +2,7 @@ set -ex -[[ -d ${0%/*} ]] && cd "${0%/*}" +[[ -d ${0%/*} ]] && cd "${0%/*}"/../ RUN_ID="$1" TESTS=$2 diff --git a/fedora-test.sh b/tools/fedora-test.sh similarity index 94% rename from fedora-test.sh rename to tools/fedora-test.sh index f3bc3ccd6..b53bb2809 100755 --- a/fedora-test.sh +++ b/tools/fedora-test.sh @@ -2,7 +2,7 @@ set -ex -[[ -d ${0%/*} ]] && cd "${0%/*}" +[[ -d ${0%/*} ]] && cd "${0%/*}"/../ RUN_ID="$1" TESTS=$2 diff --git a/git2spec.pl b/tools/git2spec.pl similarity index 100% rename from git2spec.pl rename to tools/git2spec.pl diff --git a/profile.py b/tools/profile.py similarity index 100% rename from profile.py rename to tools/profile.py -- 2.47.3