From 06206772382cd27d0b66fa3722141d6e0f1861f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= Date: Tue, 4 May 2021 12:22:52 +0000 Subject: [PATCH] chore(tree): move package build files in their own directory Creating pkgbuild directory and move relevant files there. --- .packit.yml | 2 +- Makefile | 4 ++-- PKGBUILD => pkgbuild/PKGBUILD | 0 dracut.spec => pkgbuild/dracut.spec | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename PKGBUILD => pkgbuild/PKGBUILD (100%) rename dracut.spec => pkgbuild/dracut.spec (100%) diff --git a/.packit.yml b/.packit.yml index 4bcf8eba..8a995efe 100644 --- a/.packit.yml +++ b/.packit.yml @@ -11,7 +11,7 @@ upstream_tag_template: "{version}" upstream_project_url: https://github.com/dracutdevs/dracut # Relative path to a spec file within the upstream repository -specfile_path: dracut.spec +specfile_path: pkgbuild/dracut.spec # Name of the downstream package downstream_package_name: dracut diff --git a/Makefile b/Makefile index a438b8b9..8b43d59b 100644 --- a/Makefile +++ b/Makefile @@ -240,7 +240,7 @@ ifeq ($(HAVE_RPMBUILD),yes) 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/tools/git2spec.pl $(DRACUT_MAIN_VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \ + LC_MESSAGES=C $$src/tools/git2spec.pl $(DRACUT_MAIN_VERSION) "$$rpmbuild" < pkgbuild/dracut.spec > $$rpmbuild/dracut.spec; \ (cd "$$rpmbuild"; \ wget https://www.gnu.org/licenses/lgpl-2.1.txt; \ rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" \ @@ -251,7 +251,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/tools/git2spec.pl $(DRACUT_MAIN_VERSION) "$$rpmbuild" < dracut.spec > $$rpmbuild/dracut.spec; \ + LC_MESSAGES=C $$src/tools/git2spec.pl $(DRACUT_MAIN_VERSION) "$$rpmbuild" < pkgbuild/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/PKGBUILD b/pkgbuild/PKGBUILD similarity index 100% rename from PKGBUILD rename to pkgbuild/PKGBUILD diff --git a/dracut.spec b/pkgbuild/dracut.spec similarity index 100% rename from dracut.spec rename to pkgbuild/dracut.spec