From nobody Wed Feb 22 19:46:48 2023 X-Original-To: freebsd-hackers@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PMRW10pt6z3s76w for ; Wed, 22 Feb 2023 19:46:53 +0000 (UTC) (envelope-from void@f-m.fm) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4PMRW01rkFz3CNc for ; Wed, 22 Feb 2023 19:46:52 +0000 (UTC) (envelope-from void@f-m.fm) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=f-m.fm header.s=fm1 header.b=FOa06GMF; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=YYwedDIW; spf=pass (mx1.freebsd.org: domain of void@f-m.fm designates 66.111.4.27 as permitted sender) smtp.mailfrom=void@f-m.fm; dmarc=pass (policy=none) header.from=f-m.fm Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 20C115C00B3 for ; Wed, 22 Feb 2023 14:46:51 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Wed, 22 Feb 2023 14:46:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=f-m.fm; h=cc :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1677095211; x=1677181611; bh=2mqaOuC/Od 2gNvNfXlnAD8ryr87+lH01UAqhRAQ8IyM=; b=FOa06GMFe/bhlwuB1FbNGGP10T k5Gz1hDiViPotGFosuhdbMhXfpf/v0PTEshi9GsDuWfzVwRNfAwYkIzqTACnYuvU 5uhoe11Aia0WfRlNu7GwLfYEwB/XaQBdnDAuvlwsTAo8DnfART/F0Cc3U8roJgvi YV9g+NKVy1QQiRNogD4YDLeYADgnifqYWrFrjRuefmsQiW9SfY3DOGJGizsqzOBY KGlVuovoqDsrwR+POlpdDM+S8zIymESBfy9defUtw9XFB22EFbFHBvaO1O7eP9UF by3ewmi7HPfyXuMJezxVjKqgThdH6vMVnvyW562BdkXXjBF8zG4g4Ts8vXAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1677095211; x=1677181611; bh=2mqaOuC/Od2gNvNfXlnAD8ryr87+ lH01UAqhRAQ8IyM=; b=YYwedDIWHtYMHWd+le9dlV0CdrpxLQfGQnYDF0VeZe/n O9qPVFp0E3SuDLbRkkYNrWlEucldfofUXl+PpOf6eJTiPodMVvHPxztN0jT3inzf fdlghWEz4knI67bPR69Nz7Rq2apDVeSKEacuG9MzSEAmo4H4LyOmg77PFkzB/3Ng BQDb+XaHK9Lq/B0n7THwLmLtioLRXN4RY14YGWqTRC/PdN+vktxi2J+tHhFOjuGo esov8irSgm6l3LmU6ArHkZhoRXfp2ujukEj6XGPaHWaymF5/Wbjz+lSeN8NWOSLy 9WpJhNIfSndmMVNm1uu7BtxzlZ6dGk3o+ACi+P923g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrudejledguddviecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhepfffhvffukfhfgggtuggjsehttd ertddttddvnecuhfhrohhmpehvohhiugcuoehvohhiugesfhdqmhdrfhhmqeenucggtffr rghtthgvrhhnpeevkeelleegkeevgedviefhheeiffdujeduudeghfehjeeifedtudeuve dvgfduffenucffohhmrghinhepuggvfhgruhhlthdqvhgvrhhsihhonhhsrdhmkhenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehvohhiugesfh dqmhdrfhhm X-ME-Proxy: Feedback-ID: i2541463c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Wed, 22 Feb 2023 14:46:50 -0500 (EST) Date: Wed, 22 Feb 2023 19:46:48 +0000 From: void To: freebsd-hackers@freebsd.org Subject: Re: keeping old php74 in poudriere Message-ID: Mail-Followup-To: freebsd-hackers@freebsd.org References: List-Id: Technical discussions relating to FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-hackers List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-hackers@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: X-Spamd-Result: default: False [-4.56 / 15.00]; DWL_DNSWL_LOW(-1.00)[messagingengine.com:dkim]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-0.99)[-0.989]; NEURAL_HAM_SHORT(-0.97)[-0.971]; MID_RHS_NOT_FQDN(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[f-m.fm,none]; R_DKIM_ALLOW(-0.20)[f-m.fm:s=fm1,messagingengine.com:s=fm1]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.27]; MIME_GOOD(-0.10)[text/plain]; RCVD_IN_DNSWL_LOW(-0.10)[66.111.4.27:from]; FREEMAIL_ENVFROM(0.00)[f-m.fm]; PREVIOUSLY_DELIVERED(0.00)[freebsd-hackers@freebsd.org]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; RCPT_COUNT_ONE(0.00)[1]; MLMMJ_DEST(0.00)[freebsd-hackers@freebsd.org]; FREEMAIL_FROM(0.00)[f-m.fm]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[f-m.fm:+,messagingengine.com:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:19151, ipnet:66.111.4.0/24, country:US]; FROM_HAS_DN(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[66.111.4.27:from]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[] X-Rspamd-Queue-Id: 4PMRW01rkFz3CNc X-Spamd-Bar: ---- X-ThisMailContainsUnwantedMimeParts: N On Wed, Feb 22, 2023 at 06:15:40PM +0100, Andrea Venturoli wrote: > >Let me know how you manage, please, since I might need to do this too :( For these particular machines, these are being supported using a particular poudriere instance. So I make 1. poudriere ports -c -p default1 -m git+https -q and a small script to tell it to refresh and then remove MOVED from it, before the poudriere run for this instance. My other poudriere instances run with default ports tree, not default1 (in other words, I still want MOVED for those ones) I got the last branch with php74 in which was 2022Q4 so 2. poudriere ports -c -p php74 -B 2022Q4 -m git+https -q Then needed to "delete" the newly fetched branch so poudriere no longer knew about it, in order to make it nullfs mounted. 3. poudriere ports -d -k -p php74 4. poudriere ports -c -p php74 -m null -M /usr/local/poudriere/ports/php74 Then got a list of php ports on the client machine: 5. pkg info -xo php | sort | tee php74.txt sftp it to the poudriere host, stripped out the part that is just portname rather than port/origin in the list, then cat it followed by sort into the ports list. Then looked at php74.txt in one term and opened /usr/local/poudriere/ports/php74 in mc. matched category/port with what i wanted to keep, and deleted everything else apart from Mk/bsd.default-versions.mk and Mk/Uses/php.mk. I have the following set in 123R-make.conf ### WITH_CCACHE_BUILD=YES CCACHE_DIR=/var/cache/ccache SCCACHE_DIR=/root/.sccache OVERLAYS+=/usr/local/share/sccache/overlay # OPTIONS_UNSET+=DEBUG ALSA PULSEAUDIO WKS_SERVER SCDAEMON BRACKETEDPASTE GITWEB FLANG LTO OPTIONS_SET+=OPTIMIZED_CFLAGS MAN MANPAGES SUID_GPG BROTLI ZSTD OPTIONS_SET+=DOCS NLS AVX LARGE_RSA LIBZ2 LIBZ LIBSECRET GBDM LIBEDIT_DL DEFAULT_VERSIONS+=MYSQL=5.7 DEFAULT_VERSIONS+=PHP=7.4 LICENSES_ACCEPTED+=GPLv2+ MSPAT PDFlib ### Then ran the build with poudriere bulk -j 123R -O sccache -O php74 -f 123R-ports.txt It seems to build the right things :D >I personally rely on git. I haven't been able to get my head round git yet apart from the very simplest stuff >I maintain my own branches and periodically "rebase" on the official ones. I'd like to know how to do this in git as well. >However, I don't do this just for a port or two, I have some ports to >add, some to patch, etc... (and I also do this for src), so it's >possible that, for your use case, this might be overkill. It'd be useful for me to know how to rebase/cherry pick safely. Sometimes fixes appear in reviews but they don't MFC yet, same for ports sometimes. >WRT php74 I'm a bit scared, since it's not just a matter of adding some >ports, but also make the infrastructure cope (USES, VERSIONS, etc...). zeroing (not *deleting*) MOVED seems to take care of this, so far. --