From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Dominik Csapak <d.csapak@proxmox.com>
Subject: Re: [pve-devel] [PATCH novnc v2 2/3] add BUILDDIR to clean make target
Date: Tue, 12 Nov 2024 16:02:23 +0100 [thread overview]
Message-ID: <5213e0e0-4559-457f-ae9b-2c8b0aa97f5d@proxmox.com> (raw)
In-Reply-To: <20241112075135.182866-2-d.csapak@proxmox.com>
Am 12.11.24 um 08:51 schrieb Dominik Csapak:
> so it gets cleaned up too
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> new in v2
>
> Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index 431dff9..d1159e0 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -57,7 +57,7 @@ distclean: clean
>
> .PHONY: clean
> clean:
> - rm -rf $(PACKAGE)-[0-9]*/ $() *.deb *.dsc $(PACKAGE)*.tar.[gx]z *.changes *.dsc *.buildinfo *.build
> + rm -rf $(BUILDDIR) $(PACKAGE)-[0-9]*/ $() *.deb *.dsc $(PACKAGE)*.tar.[gx]z *.changes *.dsc *.buildinfo *.build
>
> .PHONY: dinstall
> dinstall: deb
I replaced this with changing the build-dir to be derived from package
name and upstream version, like most modern packages of ours (and using
dget on debian source packages) do. The clean target already assumed this
to be the case.
diff --git a/Makefile b/Makefile
index 431dff9..1df5937 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ include /usr/share/dpkg/default.mk
PACKAGE=novnc-pve
SRCDIR=novnc
-BUILDDIR=$(SRCDIR).tmp
+BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
ORIG_SRC_TAR=$(PACKAGE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
GITVERSION:=$(shell git rev-parse HEAD)
Also adapted the build-dir target to be atomic in another, unrelated,
follow-up.
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2024-11-12 15:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-12 7:51 [pve-devel] [PATCH novnc v2 1/3] upgrade noVNC and patches to 1.5.0 Dominik Csapak
2024-11-12 7:51 ` [pve-devel] [PATCH novnc v2 2/3] add BUILDDIR to clean make target Dominik Csapak
2024-11-12 15:02 ` Thomas Lamprecht [this message]
2024-11-12 7:51 ` [pve-devel] [PATCH novnc v2 3/3] bump version to 1.5.0-1 Dominik Csapak
2024-11-12 15:04 ` [pve-devel] applied: " Thomas Lamprecht
2024-11-12 15:02 ` [pve-devel] applied: [PATCH novnc v2 1/3] upgrade noVNC and patches to 1.5.0 Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5213e0e0-4559-457f-ae9b-2c8b0aa97f5d@proxmox.com \
--to=t.lamprecht@proxmox.com \
--cc=d.csapak@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox