From patchwork Thu Feb 13 20:14:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Albershteyn X-Patchwork-Id: 13973993 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A045C24BBED for ; Thu, 13 Feb 2025 20:16:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739477763; cv=none; b=Q/x2hfXeCGvXaweA3f9G0JS91laPsohf5mutAOqkyNfyJn/9AmN6YepMoKYjD9+D3pTdSbHC1F74cQ3QBzdOLtlGqi8f9+cmzwNVMaEqSz6YOMXgMezHd/dbJjiAApVUi8c3ZsqQdhaVKDR/uynBnKyRI4NLjvHd1btQpLZ2NsA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739477763; c=relaxed/simple; bh=SUcYMnveHRrds1g1KDSVRn3iSgbRiOFQxeOxDUpSmiU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=trT+64xAB8+hFrc2bh3GU9Ij9VwvzvYzySJT+03buGmocI1Z5FIZEo+rkaxBly2JE7E5OT0XgTbE+clr/pQrWjf5QaC6XtKyJ/3nAec4O3IEh9UClcxNsz/xJTI3m/gfXLWGEIk4V7tUEC4tJ4WQgXRbmykEKrI2RdGQsV/TpV0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=gzZtvYDu; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gzZtvYDu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739477760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wHfUTzjVehqyfrB6QGAwoWMJBUqulYw/6Mwu24qZfy8=; b=gzZtvYDuGm/A7GFUqI5Vb+Bl02oL31S5WsC+d/N6BCVcVZPm19hmQgHRe8Gn751sObCARc 3RZ4qVO5CA8gFRbvVRRstoJ63ss4t3qyvsDwu+QTdhnSEEHObijpvjHnXv6wXdJaUO4GX7 LOQPkexCdrYT90Kjd1pYtFTBp8piqeI= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-439-dlzAV_gHP3qsACcPO4rTEw-1; Thu, 13 Feb 2025 15:15:59 -0500 X-MC-Unique: dlzAV_gHP3qsACcPO4rTEw-1 X-Mimecast-MFC-AGG-ID: dlzAV_gHP3qsACcPO4rTEw Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-38dcd8ddc5eso1267491f8f.3 for ; Thu, 13 Feb 2025 12:15:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739477758; x=1740082558; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wHfUTzjVehqyfrB6QGAwoWMJBUqulYw/6Mwu24qZfy8=; b=H/HF2EkEnbSFjOtK4JURAAAXBBXTF+Ms9JGh3aipRmevgMPRDqOqg5A3bSrkwRST4T rPit4/6fZzpi8tcjjb4Awdmo0V10VrIpXChVx3rO5GRJYNjrP52vODYDIgoK8f9vD4+6 WC8NEH7xxgyhJU9GaolqCbZZ7Ceyclds9yeA9P2qQVf73ekgpdIbVc4E9RsSREc8cH8A L8spsh6/LW53vfGoFWhQEVsDUD2u2iYHw5RZ4Q+F6iFma+1fWqk6xKebho1dk77UFRP8 UkItzDfB64fXdF0/q8MsTyEYfLHf1kXKW/3GXgqp7WWIE8Eyda6YXS6ZRmDd+2IFVAp5 mmwQ== X-Gm-Message-State: AOJu0YxmaPAMnamixpVXauzeUl5cJpd9mPwzYjiMBcyxDoAQxnF2ipqo uLm2rDjWq8RX8+zPzeQeWn5WyLJdOJeszsMOWnt6jwPr6iseGnKxFwH/mtDR/JuG9wE/KcC9Dt2 KmMY79cyc3WtUTNqojpJszDKqkLHbJbh+oUdvq3RqqL/dUYtInyI0zwTk X-Gm-Gg: ASbGncsWO61I6J1nbJDEhG2M2br/tyXBj+eHvNW/hsjJKiaRvNaiOyeDanZzYfC44/i Eg5c47AvKDBmgYkWnwxxrfoSXXJcOCKcS9h3sb/TMiTOc2MJIqbgoINcI1v8YJvdcGhztMLX+BY RZh2HPIr9pNyhl31DQF8r5SypgXUx/jnlifFMmEELIWBKp4pfdz7qT0+I8DaEFEh24428EXkUn4 2cU8ApjDrsVRGNvt8h6lxWeBLEcaQGURqRUx0ad5VfX5R78ED1yKWgZ8CbsRgyeusysxZ/UAVxt K3D/jYY0M5moYnoAEdDSq8F2IlFYPcA= X-Received: by 2002:a5d:6c6a:0:b0:38d:c627:f634 with SMTP id ffacd0b85a97d-38dea2ea06emr8736224f8f.50.1739477757787; Thu, 13 Feb 2025 12:15:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IEJLbdxfXmhWH4fhf8qAcO0TpghMdAgeWhXyxaxMLiqe+Jg+/KBlRznfiCAtHUEmvmU/cKs1g== X-Received: by 2002:a5d:6c6a:0:b0:38d:c627:f634 with SMTP id ffacd0b85a97d-38dea2ea06emr8736198f8f.50.1739477757396; Thu, 13 Feb 2025 12:15:57 -0800 (PST) Received: from [127.0.0.2] (ip-217-030-074-039.aim-net.cz. [217.30.74.39]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4395a06d237sm57520895e9.21.2025.02.13.12.15.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 12:15:56 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Thu, 13 Feb 2025 21:14:23 +0100 Subject: [PATCH v4 01/10] release.sh: add signing and fix outdated commands Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250213-update-release-v4-1-c06883a8bbd6@kernel.org> References: <20250213-update-release-v4-0-c06883a8bbd6@kernel.org> In-Reply-To: <20250213-update-release-v4-0-c06883a8bbd6@kernel.org> To: linux-xfs@vger.kernel.org Cc: "Darrick J. Wong" , Andrey Albershteyn X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1953; i=aalbersh@kernel.org; h=from:subject:message-id; bh=SUcYMnveHRrds1g1KDSVRn3iSgbRiOFQxeOxDUpSmiU=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIY0tcF/Tq2MLu5+mNHQM6GQ28ahL/Hbjn0U89ze+mFe oMT+nNOPAzqKGVhEONikBVTZFknrTU1qUgq/4hBjTzMHFYmkCEMXJwCMJHUswx/pV8tfCbHEV16 8bFrlHrVrf0VL2R7j1l3XY58X3TyaSRrOcP/Ap/F57L3vzp7/t7CzEmJB+NMb6RK2n6Kj1dWv8z 2lU+HCwDHiE4J X-Developer-Key: i=aalbersh@kernel.org; a=openpgp; fpr=AE1B2A9562721A6FC4307C1F46A7EA18AC33E108 Reviewed-by: Darrick J. Wong Signed-off-by: Andrey Albershteyn --- release.sh | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/release.sh b/release.sh index 577257a354d442e1cc0a2b9381b11ffbe2f64a71..b15ed610082f34928827ab0547db944cf559cef4 100755 --- a/release.sh +++ b/release.sh @@ -9,6 +9,8 @@ # configure.ac (with new version string) # debian/changelog (with new release entry, only for release version) +set -e + . ./VERSION version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION} @@ -16,21 +18,38 @@ date=`date +"%-d %B %Y"` echo "Cleaning up" make realclean +rm -rf "xfsprogs-${version}.tar" \ + "xfsprogs-${version}.tar.gz" \ + "xfsprogs-${version}.tar.asc" \ + "xfsprogs-${version}.tar.sign" echo "Updating CHANGES" sed -e "s/${version}.*/${version} (${date})/" doc/CHANGES > doc/CHANGES.tmp && \ mv doc/CHANGES.tmp doc/CHANGES echo "Commiting CHANGES update to git" -git commit -a -m "${version} release" +git commit --all --signoff --message="xfsprogs: Release v${version} + +Update all the necessary files for a v${version} release." echo "Tagging git repository" -git tag -a -m "${version} release" v${version} +git tag --annotate --sign --message="Release v${version}" v${version} echo "Making source tarball" make dist +gunzip -k "xfsprogs-${version}.tar.gz" -#echo "Sign the source tarball" -#gpg --detach-sign xfsprogs-${version}.tar.gz +echo "Sign the source tarball" +gpg \ + --detach-sign \ + --armor \ + "xfsprogs-${version}.tar" -echo "Done. Please remember to push out tags using \"git push --tags\"" +echo "Verify signature" +gpg \ + --verify \ + "xfsprogs-${version}.tar.asc" + +mv "xfsprogs-${version}.tar.asc" "xfsprogs-${version}.tar.sign" + +echo "Done. Please remember to push out tags using \"git push origin v${version}\"" From patchwork Thu Feb 13 20:14:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Albershteyn X-Patchwork-Id: 13973994 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 79D9E24BBF5 for ; Thu, 13 Feb 2025 20:16:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739477764; cv=none; b=eY3CdOvujC5hAnGH6rhdtB+iBfqiYk9Rl+8B3gFl/GgPuPApYvm+jlWxrtvm5yPFmxaj5gyAPUrIhywM8oHtOnZWDcNX7dVe2H2A52YqwRExol6eFrkACDRF9etUKE95uSaGzhqqESBsmeZ3SWXDpU9ahdEioSKC5mQJsp2hOPk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739477764; c=relaxed/simple; bh=k4JjaWjDKXkA2Ktr0ek0djzOAggrEZFk2s4xZ5LUkZ0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=itt3GPKO8SqS54Co3DTrVZVYwlgcRiIwebxSUchqXXHWOXChoqL6uAbWy5fG9d4cS3RTyh43D95QwCUtz4G+m2Ych43ZS/38yR3okjoNpX29srerBGa9hUG742QCQ+ycqoMKqKigeOmcr+vEzbLvPLXtAxIm/L4tIDX8OWqHkb8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=H95TDcbT; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="H95TDcbT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739477761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pbAFELYrrgqB0w7UVgfPzmVZdE/umW5JbrBDfQjoIg0=; b=H95TDcbT2Ndisltgf4CEk1CqPrilcjBUIUAbPTaK9HxYugitPgct4m8C/w6vq4pLP2oURG z9GByypRWCR/Gor8vVXCCLUYJPtuNROCtxGvcQ5uKO+3m0mqGMCfr7Q/QaG5EPlimPKGdZ oODsIn5zfnGdNiV9Uc5rfFnFHJEmBAQ= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-119-1xQHjMaVMh2Rdwt1s64oRA-1; Thu, 13 Feb 2025 15:16:00 -0500 X-MC-Unique: 1xQHjMaVMh2Rdwt1s64oRA-1 X-Mimecast-MFC-AGG-ID: 1xQHjMaVMh2Rdwt1s64oRA_1739477759 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-38de11a0002so1346371f8f.3 for ; Thu, 13 Feb 2025 12:16:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739477759; x=1740082559; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pbAFELYrrgqB0w7UVgfPzmVZdE/umW5JbrBDfQjoIg0=; b=SKxXwjm1uU6mTsTpzQ71GESrCNrw/5APCW2Mt+yA87OdumhaG3ppvmB13UkkgFzdvc fXxisGKjWS1pfd1oxs3+PWSGXz8pJZoK1vWyh1MC4Wcg7uOi2YsqtAEYKBeIip01gVoC LVrjjDGUUcA7LnZFr28qP4MK2fjr3X5rYrc7y+U2O+gC3l9lR7HWUSRgn868PVzoyrTJ 1NXftJsFWq4tqkNdGw9EUOQq489I56rPq5B/HmEEGmix+5TAISuZkcKMUdLR/Sc2u/BW Un5ynXGWUqzdBHaDY/gEQrQM8bGBB9233eArfScBlFA3SJ5KgOQYgqnNAl5bXvYrGk0E WxgQ== X-Gm-Message-State: AOJu0YzMvas+lVbIqEOGnfcxxqQj1MV0lTLiWliO1+0DWFW4d0Rfkdsg F+0VeqCbChpjeddRJP2D4+YJ6bVytS/eqwkXsq+kCCS7M0hmTXHbgCymsLLDDf+NnLaM9DjjErn zYSG/CzTaYclKaHM+hsC5Rb/LtoIASTu3m5zoKAOelpLrlqttlBscrVMZ X-Gm-Gg: ASbGncvwUH+r9IaNH3ltHa9W4EPEsferVqSEEok0WkjhHV0rrWWlJuEHefPMfzvTF8O 29MnmXdeEigVmMdbZ+U+StdV1jiVrfB5LShhGBpUo9AuoyORa8SbTwRyhQqjDEk22ezaJ+qb8YC cT+TzKTueQTxGNwzc0acCJn01pX/v+3OZA1728RIOq7j24HXnagxqHN7I9Evgz9OFtq5FbNZPqe SFtRKdfsHzvH4hqc/5cDyPuo/DsPQJXUQYnNS+4Jti9toHgK232M2uT/EBW6HO4EDCshGo2hDer k6E/xPB7sMcXjQzKa+zrdngYIYs7r98= X-Received: by 2002:a5d:5188:0:b0:385:fd07:85f4 with SMTP id ffacd0b85a97d-38dea290941mr7424190f8f.31.1739477759109; Thu, 13 Feb 2025 12:15:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IFwnnhMiMFGDRCJ6LRhaQLilLPS+FzUwf8s4XHK+I3i6f2p4k0zydiOybtOaGGIh9gSzzIH6Q== X-Received: by 2002:a5d:5188:0:b0:385:fd07:85f4 with SMTP id ffacd0b85a97d-38dea290941mr7424173f8f.31.1739477758763; Thu, 13 Feb 2025 12:15:58 -0800 (PST) Received: from [127.0.0.2] (ip-217-030-074-039.aim-net.cz. [217.30.74.39]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4395a06d237sm57520895e9.21.2025.02.13.12.15.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 12:15:57 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Thu, 13 Feb 2025 21:14:24 +0100 Subject: [PATCH v4 02/10] release.sh: add --kup to upload release tarball to kernel.org Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250213-update-release-v4-2-c06883a8bbd6@kernel.org> References: <20250213-update-release-v4-0-c06883a8bbd6@kernel.org> In-Reply-To: <20250213-update-release-v4-0-c06883a8bbd6@kernel.org> To: linux-xfs@vger.kernel.org Cc: "Darrick J. Wong" , Andrey Albershteyn X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1359; i=aalbersh@kernel.org; h=from:subject:message-id; bh=k4JjaWjDKXkA2Ktr0ek0djzOAggrEZFk2s4xZ5LUkZ0=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIY0tcF/epSrUzK+L/+uNRjo5ZJPNY8rP5pBqZ/dJg5k ksqJAP8pnWUsjCIcTHIiimyrJPWmppUJJV/xKBGHmYOKxPIEAYuTgGYSLIJw2+WK5sl76be2MH/ i0dz+5ztP6bvXZzKqr9bY1pl3qlbD42jGP7KHV9gGLRI+6gSw8Ibi1LnzO+v/di/WLAku+JJZGm h8QluABPpRn4= X-Developer-Key: i=aalbersh@kernel.org; a=openpgp; fpr=AE1B2A9562721A6FC4307C1F46A7EA18AC33E108 Add kup support so that the maintainer can push the newly formed release tarballs to kernel.org. Reviewed-by: Darrick J. Wong Signed-off-by: Andrey Albershteyn --- release.sh | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/release.sh b/release.sh index b15ed610082f34928827ab0547db944cf559cef4..b036c3241b3f67bfb2435398e6a17ea4c6a6eebe 100755 --- a/release.sh +++ b/release.sh @@ -16,6 +16,30 @@ set -e version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION} date=`date +"%-d %B %Y"` +KUP=0 + +help() { + echo "$(basename) - create xfsprogs release" + printf "\t[--kup|-k] upload final tarball with KUP\n" +} + +while [ $# -gt 0 ]; do + case "$1" in + --kup|-k) + KUP=1 + ;; + --help|-h) + help + exit 0 + ;; + *) + >&2 printf "Error: Invalid argument\n" + exit 1 + ;; + esac + shift +done + echo "Cleaning up" make realclean rm -rf "xfsprogs-${version}.tar" \ @@ -52,4 +76,11 @@ gpg \ mv "xfsprogs-${version}.tar.asc" "xfsprogs-${version}.tar.sign" +if [ $KUP -eq 1 ]; then + kup put \ + xfsprogs-${version}.tar.gz \ + xfsprogs-${version}.tar.sign \ + pub/linux/utils/fs/xfs/xfsprogs/ +fi; + echo "Done. Please remember to push out tags using \"git push origin v${version}\"" From patchwork Thu Feb 13 20:14:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Albershteyn X-Patchwork-Id: 13973995 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C577F24BC1F for ; Thu, 13 Feb 2025 20:16:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739477766; cv=none; b=FViYE9mMQKxbPfF7pPsevvkTkWx/mdP57sTmmyzR6/QkGqYFmnNBt2Te1VfhDBn43rzbv7pU+NZ0w+3zl/V/tokUYWp/Gfgd4JHMmqxsUTecDa2gd9XvhkESK64zNHcnVuG8zGSRkGX1vkH5biqfrIEmc28Nxb27HEXwPj3B4kQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739477766; c=relaxed/simple; bh=em41zXomO0jL9kZk0F8GUYFuiu2onzUI7wqVleP04iE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RYsfeh9e+Zo+hexRaNBNDoeNaUOMlaop3jaxA+Hq08DLNtM/M/qbHt7/FQOIjZGW9fBNzxUhY4wQFAkZTx59U5IvGEiWWk4qiKmQwOa6aAg5jNdFmdka5w99oUbzaPYDCH10CmHlBUDwHRQHNjXi97q85wy8zlHPidUyCe5EF7A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Um/lgZEq; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Um/lgZEq" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739477763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EVF6Djswvdycv30ceiXMOHnHpXzJo3+aaqOC0QnjsTc=; b=Um/lgZEqYHFlMBGz2Sv5QVHiIoM6qMt6bwLIBpviFdTtLbsHRFmwgIv6eN5dGD5nlpd+JU 4qsX6/p/kNT8tt3aMPzLAyLIdCBX9VxTsN9OITAT4CCPaFrkSkGJq4qzE79T4NFkuRrywz cMp4LPovWhsfzf048g0QqdgxVk3aIBc= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-614-iu27gUF7On61JC85HfHKGg-1; Thu, 13 Feb 2025 15:16:02 -0500 X-MC-Unique: iu27gUF7On61JC85HfHKGg-1 X-Mimecast-MFC-AGG-ID: iu27gUF7On61JC85HfHKGg Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-38dc88ed7e6so993812f8f.1 for ; Thu, 13 Feb 2025 12:16:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739477761; x=1740082561; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EVF6Djswvdycv30ceiXMOHnHpXzJo3+aaqOC0QnjsTc=; b=UFTJeBtmF/12DX4PQbebEWQxq6g6N81iggsaHTRP213hE9nGfgh9z4YdHnjlzmWtQG G1katQboGePeMMZytsS7aJBgcacGb5RCq/zRo4PzN8QlJYH3JodJOBc+DEQzuNKFyowQ UbJ3g596BP23D2nT7R2lDFrLpJXogjkIo8TRfPcKF2HfRnfoe7ZpfWh1BytarKtoHBkL znzY7UnXmXU/MOoC7Hut4YGdVyQC2neLUxh7WqrP1Fkp3rhVFab9BklOR6eBvp8LskEV s4TwpF8yvKFlRF1DBKyBaDwOD2xDqQTFpgfPboU1mKQfXXfljzllKGkJwrmrEvRzpJ04 Epbw== X-Gm-Message-State: AOJu0YxKyi3T1zDMU8C6WPbGlubD+OHYKKxX0grlUqpbi8UFBAQf43CJ XS3D6Z8CocSUaREZzldHT4IfnOk78nNmrdRUenP4msZ7RGEoXWCR87H+UbFyIHYyLYWkYc/nnJ3 ZdJZWlKUNhuhmoKU2gXdgJBMkFH3IKGOfrmBI2nUO9gGhl246i2xdBJwJO4UtQVfC X-Gm-Gg: ASbGnctQq2KBgI/cYkUrVIUcck+BxOhRRoumg89WkLvIzqppIIZdYWDgu21P+bda9wO cE8LZpNAtUr1oEVxlGxSpNZTopdZBac79ndDZfUKKYgtBVnsQo0t5wawc+5nGcSk8yeOQzDjSL5 1hbUxYvWuOQvIlYFsrfNkpbWuGmKvzyQQ6QKlHYtz28kmcuQZaaFGFvuCphA+/WhYbWyWtmBy2x sQY+tU25/zXqYvb3PKt+dwwK+eUm/XkdWif/dkwKJwYyre9XsKU/YImuq+zNWOkqIHwqNV4S0ss QqxfpZluDTqphxAT5kf5SIAhbUgdrMo= X-Received: by 2002:a05:6000:12c6:b0:38e:d026:820 with SMTP id ffacd0b85a97d-38f244e539dmr6025598f8f.16.1739477760687; Thu, 13 Feb 2025 12:16:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IH48FHFs9EFXlbhNx/RhYE6UHH12tO14eGSYBkVE2YT1VxqYOeYrtcsExZDvcpHOk3w54IxWQ== X-Received: by 2002:a05:6000:12c6:b0:38e:d026:820 with SMTP id ffacd0b85a97d-38f244e539dmr6025576f8f.16.1739477760212; Thu, 13 Feb 2025 12:16:00 -0800 (PST) Received: from [127.0.0.2] (ip-217-030-074-039.aim-net.cz. [217.30.74.39]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4395a06d237sm57520895e9.21.2025.02.13.12.15.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 12:15:59 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Thu, 13 Feb 2025 21:14:25 +0100 Subject: [PATCH v4 03/10] release.sh: update version files make commit optional Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250213-update-release-v4-3-c06883a8bbd6@kernel.org> References: <20250213-update-release-v4-0-c06883a8bbd6@kernel.org> In-Reply-To: <20250213-update-release-v4-0-c06883a8bbd6@kernel.org> To: linux-xfs@vger.kernel.org Cc: "Darrick J. Wong" , Andrey Albershteyn X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3840; i=aalbersh@kernel.org; h=from:subject:message-id; bh=em41zXomO0jL9kZk0F8GUYFuiu2onzUI7wqVleP04iE=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIY0tcF/UpkKw7dbLkr5mhp4eZnMlWvjql4TJZ+839qJ l9Q16yPVus6SlkYxLgYZMUUWdZJa01NKpLKP2JQIw8zh5UJZAgDF6cATMRpFiPDVlEDoRtb85cF PvshPHHGs/V6bxUPnpXtu7voeZSOS/HPjYwMO/iUJyfei7l0pbpVqXNGQU7mh1CuOdxNSVdTsoJ 5e43ZAPUMSGQ= X-Developer-Key: i=aalbersh@kernel.org; a=openpgp; fpr=AE1B2A9562721A6FC4307C1F46A7EA18AC33E108 Based on ./VERSION script updates all other files. For ./doc/changelog script asks maintainer to fill it manually as not all changes goes into changelog. --no-commit|-n flag is handy when something got into the version commit and need to be changed manually. Then ./release.sh -c will use fixed history Reviewed-by: Darrick J. Wong Signed-off-by: Andrey Albershteyn --- release.sh | 75 ++++++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 58 insertions(+), 17 deletions(-) diff --git a/release.sh b/release.sh index b036c3241b3f67bfb2435398e6a17ea4c6a6eebe..c3f74bc8dc587a40d867dd22e1e4c6e4aabb8997 100755 --- a/release.sh +++ b/release.sh @@ -11,16 +11,33 @@ set -e -. ./VERSION - -version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION} -date=`date +"%-d %B %Y"` - KUP=0 +COMMIT=1 help() { echo "$(basename) - create xfsprogs release" printf "\t[--kup|-k] upload final tarball with KUP\n" + printf "\t[--no-commit|-n] don't create release commit\n" +} + +update_version() { + echo "Updating version files" + # doc/CHANGES + header="xfsprogs-${version} ($(date +'%d %b %Y'))" + sed -i "1s/^/$header\n\t\n\n/" doc/CHANGES + $EDITOR doc/CHANGES + + # ./configure.ac + CONF_AC="AC_INIT([xfsprogs],[${version}],[linux-xfs@vger.kernel.org])" + sed -i "s/^AC_INIT.*/$CONF_AC/" ./configure.ac + + # ./debian/changelog + sed -i "1s/^/\n/" ./debian/changelog + sed -i "1s/^/ -- Nathan Scott `date -R`\n/" ./debian/changelog + sed -i "1s/^/\n/" ./debian/changelog + sed -i "1s/^/ * New upstream release\n/" ./debian/changelog + sed -i "1s/^/\n/" ./debian/changelog + sed -i "1s/^/xfsprogs (${version}-1) unstable; urgency=low\n/" ./debian/changelog } while [ $# -gt 0 ]; do @@ -28,6 +45,9 @@ while [ $# -gt 0 ]; do --kup|-k) KUP=1 ;; + --no-commit|-n) + COMMIT=0 + ;; --help|-h) help exit 0 @@ -40,6 +60,36 @@ while [ $# -gt 0 ]; do shift done +if [ -z "$EDITOR" ]; then + EDITOR=$(command -v vi) +fi + +if [ $COMMIT -eq 1 ]; then + if git diff --exit-code ./VERSION > /dev/null; then + $EDITOR ./VERSION + fi +fi + +. ./VERSION + +version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION} +date=`date +"%-d %B %Y"` + +if [ $COMMIT -eq 1 ]; then + update_version + + git diff --color=always | less -r + [[ "$(read -e -p 'All good? [Y/n]> '; echo $REPLY)" == [Nn]* ]] && exit 0 + + echo "Commiting new version update to git" + git commit --all --signoff --message="xfsprogs: Release v${version} + +Update all the necessary files for a v${version} release." + + echo "Tagging git repository" + git tag --annotate --sign --message="Release v${version}" v${version} +fi + echo "Cleaning up" make realclean rm -rf "xfsprogs-${version}.tar" \ @@ -47,17 +97,6 @@ rm -rf "xfsprogs-${version}.tar" \ "xfsprogs-${version}.tar.asc" \ "xfsprogs-${version}.tar.sign" -echo "Updating CHANGES" -sed -e "s/${version}.*/${version} (${date})/" doc/CHANGES > doc/CHANGES.tmp && \ - mv doc/CHANGES.tmp doc/CHANGES - -echo "Commiting CHANGES update to git" -git commit --all --signoff --message="xfsprogs: Release v${version} - -Update all the necessary files for a v${version} release." - -echo "Tagging git repository" -git tag --annotate --sign --message="Release v${version}" v${version} echo "Making source tarball" make dist @@ -83,4 +122,6 @@ if [ $KUP -eq 1 ]; then pub/linux/utils/fs/xfs/xfsprogs/ fi; -echo "Done. Please remember to push out tags using \"git push origin v${version}\"" +echo "" +echo "Done. Please remember to push out tags and the branch." +printf "\tgit push origin v${version} master:master master:for-next\n" From patchwork Thu Feb 13 20:14:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Albershteyn X-Patchwork-Id: 13973996 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9CC8424BBEB for ; Thu, 13 Feb 2025 20:16:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739477767; cv=none; b=i1YWAilapGU8lLpBCHZupQ3l2b3NTLHq73pQgQfY5HQ8iIG2sCKPAwcpG7IZdBKBf5Bz0MHv8Lk5P6OtaE7rMw8Xv3krI4ysi2M4F3+LkDj6O33uIXAcogjLN7KQk7ik3aJyr5ubigTB8ISbdLfP564A9Yrn+vE2qJm9ZiX1ZRg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739477767; c=relaxed/simple; bh=HU9n5NvoPomLXLF6LgaJXXpRdjxvBbILUZwTjWna110=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=suwa/Q2zmYX/ZuyX2VmLeG1kGoqRGNfecY50Oqcnqa7bjGGe/WXLXDimpXTjdEvR8BWoOUbxV4/BAU5Rs105Vo41sv5yFwUVwrzM/X3qES+gEK2NLx+r0SW29a3YS77vwKT6N3p27tA4vRnTtG+2RDcFl+3BTHYMa0/wFa0fZAM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=chGRVmMd; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="chGRVmMd" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739477764; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8Dwzp/NU0ujGgiL6wnczWrvsNXVl+Zg+N3jt2/uSQpM=; b=chGRVmMdTChEbsr1XP2AI742OjPCW7t0u6kLBIg2fEJm9K+VwkmE/5FSk2CYpG5v2j/OF5 +KB764oV39ZryXTnBTwG0uvzuo90PpSbktl9wyEZsQuXsxoLorYZ8V1ccsICYjh2OHKVc9 KzOuawu/mJzZRtiGherdrfCm1G9M0hg= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-624-GLIgAOWUNCikjQJKrPY9lw-1; Thu, 13 Feb 2025 15:16:03 -0500 X-MC-Unique: GLIgAOWUNCikjQJKrPY9lw-1 X-Mimecast-MFC-AGG-ID: GLIgAOWUNCikjQJKrPY9lw Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4395f1c4366so7130045e9.3 for ; Thu, 13 Feb 2025 12:16:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739477761; x=1740082561; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8Dwzp/NU0ujGgiL6wnczWrvsNXVl+Zg+N3jt2/uSQpM=; b=Gfax9DWv49ZV0d1Vakp+dXIf+efusX95ShJ58vCYX5PdIWCtA/WsBymmtTiV+t/yr1 dsv8hPUQZr0weF2DbM1kdlpqH6bQMkXe1WWL9Ax4CmGpKFaU9UsT2VLeOJWHKluR2Vte 2jj74G2+GtrJ7zlXHjmVrf8UALW5JmsFWduWhtChJLLvW49rAAg7X3L36gxMHykMOz3g nxr/ICYC8eOwVTIl+DJAeVQtXn9FpkdtIUTIl8TTfZArPq2fYtplKR4jI6lBlrQZVyZj /7CUz9/89TZb3GznWjwkzHDW6SQ8EkTMNliG7h55oN2eoPYSJ4e7xD7U6wocpuJLDvUa dTbA== X-Gm-Message-State: AOJu0YyDSu2TKrKBYBIBoIPGLUC1Hvff6itZAf8+Tiomq47al3cJXr5Y NadkMMBlqwrItVNLs4jnHy4XCXiaXxfHA9XA+iK1DS+O/In/Lj8U4/Vn45sMZtlSKXr93z4xAzo 83hVB30RD/fsqDW8qjb4G7Q5klDET8g47l383lBy4PdGkrdSqYkY6qiyxbcaAaKiD X-Gm-Gg: ASbGncvthtrruwNnmUf2Zu/8Y4xaQQq/gHe5O5fkT7DrEDfRThabJGJDxv+2Xtz36Kq mFSMhI0I0HHBqQXNqqUFBlVEWYiB8zADroIyzpU2lno8LfuTCWWNwNsWqcV6Nr3oJPu4/xVQCOI IejWe+sO2+XtcUW9PGLWEVm3PKT4O9ZCOMtX5rRnNXkBETLL9FCmEtkDouMc3CPKqkjXeRWAGew n7nlvio0tUnVQ/JqmIpsO7UsV6Hk8uipSIsiZ8SrTB/2FQxymtDc9yfYtLarFMUFQqFvAOds0+N bEO0n5S0Trvoeo7EMvdWf4VDxxQt17k= X-Received: by 2002:a05:600c:4f89:b0:439:57a3:4fd6 with SMTP id 5b1f17b1804b1-4395817a64emr100052755e9.13.1739477761341; Thu, 13 Feb 2025 12:16:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IGTyGHFgC18k8AdMXVtrdqPD79w/7OMnLDUqEbZyZU9x7wrmEYsQ1xIxqk0/nMvKfx05pfs/Q== X-Received: by 2002:a05:600c:4f89:b0:439:57a3:4fd6 with SMTP id 5b1f17b1804b1-4395817a64emr100052485e9.13.1739477760917; Thu, 13 Feb 2025 12:16:00 -0800 (PST) Received: from [127.0.0.2] (ip-217-030-074-039.aim-net.cz. [217.30.74.39]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4395a06d237sm57520895e9.21.2025.02.13.12.16.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 12:16:00 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Thu, 13 Feb 2025 21:14:26 +0100 Subject: [PATCH v4 04/10] Add git-contributors script to notify about merges Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250213-update-release-v4-4-c06883a8bbd6@kernel.org> References: <20250213-update-release-v4-0-c06883a8bbd6@kernel.org> In-Reply-To: <20250213-update-release-v4-0-c06883a8bbd6@kernel.org> To: linux-xfs@vger.kernel.org Cc: "Darrick J. Wong" , Andrey Albershteyn X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4032; i=aalbersh@kernel.org; h=from:subject:message-id; bh=HU9n5NvoPomLXLF6LgaJXXpRdjxvBbILUZwTjWna110=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIY0tcF/ZrzJci+Pa/dTEreK7XL6uW2mfaHmX62/Mh5W jutwcbrzZaOUhYGMS4GWTFFlnXSWlOTiqTyjxjUyMPMYWUCGcLAxSkAEzlgz8jQy7LI+LR6e5Cj zU1bgbvJ4VU8yuL6urPUfmWnh7hM2bWHkeGQ/8br+/5pOB803WdZFb2xr4v76U+ntBo5x4aM+Ff frvIAAD8NRsI= X-Developer-Key: i=aalbersh@kernel.org; a=openpgp; fpr=AE1B2A9562721A6FC4307C1F46A7EA18AC33E108 Add python script used to collect emails over all changes merged in the next release. CC: Darrick J. Wong Signed-off-by: Darrick J. Wong Reviewed-by: Darrick J. Wong Signed-off-by: Andrey Albershteyn --- tools/git-contributors.py | 101 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/tools/git-contributors.py b/tools/git-contributors.py new file mode 100755 index 0000000000000000000000000000000000000000..70ac8abb26c8ce65de336c5ae48abcfee39508b2 --- /dev/null +++ b/tools/git-contributors.py @@ -0,0 +1,101 @@ +#!/usr/bin/python3 + +# List all contributors to a series of git commits. +# Copyright(C) 2025 Oracle, All Rights Reserved. +# Licensed under GPL 2.0 or later + +import re +import subprocess +import io +import sys +import argparse +import email.utils + +DEBUG = False + +def backtick(args): + '''Generator function that yields lines of a program's stdout.''' + if DEBUG: + print(' '.join(args)) + p = subprocess.Popen(args, stdout = subprocess.PIPE) + for line in io.TextIOWrapper(p.stdout, encoding="utf-8"): + yield line + +class find_developers(object): + def __init__(self): + tags = '%s|%s|%s|%s|%s|%s|%s|%s' % ( + 'signed-off-by', + 'acked-by', + 'cc', + 'reviewed-by', + 'reported-by', + 'tested-by', + 'suggested-by', + 'reported-and-tested-by') + # some tag, a colon, a space, and everything after that + regex1 = r'^(%s):\s+(.+)$' % tags + + self.r1 = re.compile(regex1, re.I) + + def run(self, lines): + addr_list = [] + + for line in lines: + l = line.strip() + + # emailutils can handle abominations like: + # + # Reviewed-by: Bogus J. Simpson + # Reviewed-by: "Bogus J. Simpson" + # Reviewed-by: bogus@simpson.com + # Cc: # v6.9 + # Tested-by: Moo Cow # powerpc + m = self.r1.match(l) + if not m: + continue + (name, addr) = email.utils.parseaddr(m.expand(r'\g<2>')) + + # This last split removes anything after a hash mark, + # because someone could have provided an improperly + # formatted email address: + # + # Cc: stable@vger.kernel.org # v6.19+ + # + # emailutils doesn't seem to catch this, and I can't + # fully tell from RFC2822 that this isn't allowed. I + # think it is because dtext doesn't forbid spaces or + # hash marks. + addr_list.append(addr.split('#')[0]) + + return sorted(set(addr_list)) + +def main(): + global DEBUG + + parser = argparse.ArgumentParser(description = "List email addresses of contributors to a series of git commits.") + parser.add_argument("revspec", nargs = '?', default = None, \ + help = "git revisions to process.") + parser.add_argument("--separator", type = str, default = '\n', \ + help = "Separate each email address with this string.") + parser.add_argument('--debug', action = 'store_true', default = False, \ + help = argparse.SUPPRESS) + args = parser.parse_args() + + if args.debug: + DEBUG = True + + fd = find_developers() + if args.revspec: + # read git commits from repo + contributors = fd.run(backtick(['git', 'log', '--pretty=medium', + args.revspec])) + else: + # read patch from stdin + contributors = fd.run(sys.stdin.readlines()) + + print(args.separator.join(sorted(contributors))) + return 0 + +if __name__ == '__main__': + sys.exit(main()) + From patchwork Thu Feb 13 20:14:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Albershteyn X-Patchwork-Id: 13973997 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 05E9424BBF5 for ; Thu, 13 Feb 2025 20:16:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739477768; cv=none; b=GsGEk3pWLu+nn960urYhO1X/2Xni79qq8BVfk89GLXuNIxYcXok1zNxEW+46AIQH4HU1PbNgCH3m2WGN+DnjqPrbbb/ry6CwM/Pq9boQuqI3qI0Djb6kwwJrwvQdrzE1Os4+fumefsZTpGoC6I+zzTaYjG248LXkODhAJ+JIt+4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739477768; c=relaxed/simple; bh=FRMtZEM/v2TdSzfxgy/TEs1Vbuhq4HDz9EGnvkfc2rs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=c4KsF765fL3BKBDU8fVc7HO+WFtzFTEJLTmWS3kxEgBt+P/JefyWMoPBX3YlTchIxWto4RTeBcLHTWCPhiis1OX/x0EzylFK9oCo8e3OOBkVB9Orhg0Bc1jYwcqxNg2II2Z8EAvb2V5Ypq5sy2P6cjQ9pZ3KF4oBp2UyncXZ5iE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=OvD0Qz3t; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="OvD0Qz3t" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739477765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bY9CGV7zlvT14th3ab23rDDHWXiloyF5GCzDs8pWPBY=; b=OvD0Qz3tChEuynf+0ROlJ5w/zQ+OD/1KjeP819jDW1lbq9SRVsXsk+SkY4t58DQbBRgnst gUvmvuMEoCCJDH3HKIqJcCq3+2DvfHV4NkOs1yRZrfy7S40y2UMz7Wc3kkbIDkqVY28ko9 0NOdgRmCfqPoXxhMJIGhXXqftmJWEM4= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-508-djcTmiwKM3iN9QHn0UPUZQ-1; Thu, 13 Feb 2025 15:16:04 -0500 X-MC-Unique: djcTmiwKM3iN9QHn0UPUZQ-1 X-Mimecast-MFC-AGG-ID: djcTmiwKM3iN9QHn0UPUZQ Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4395fa20a21so8317275e9.1 for ; Thu, 13 Feb 2025 12:16:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739477763; x=1740082563; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bY9CGV7zlvT14th3ab23rDDHWXiloyF5GCzDs8pWPBY=; b=Q3QFX98kUDdg6eQS4eEKpA0mHQBTZo+IxcfouNH9qTpvzDtXPCPe33zpEmKRsopeM7 WSdsVS+iTvqMthJFN89foeJMTBknTkmsJYEkzB31jYCRh5pjOVv8+Li4XML0PuKzyPIl 9Lz5sS4tfmhYdRy44Z8mVbwQcTicRggGMOyT+sM7y7dGmbYFjaCEzLzLzUGZBlCiBn7g o8gkFAlNXgnlDfuARO+t3Na7Dl1/otSvuBkve9y5uO8suqj03uV3SxJoSE3/G/oih2F6 nCu/Vh3DTJ/RkLruIMkfLQTofrKmLKOeVKhULIyCdi+fyTlW1tROULqWLAHdECnden08 Rrog== X-Gm-Message-State: AOJu0YzwWycI/tnK5dPcAWqB4XqSSuNc+6R7oDBdOQ/8fTjcd7ddvn8B ieazCk8b+Ch3vmrzs3tmJxJSOJM9iI45MOgXYNEJiqU2N1e0ybk6j8U0eqSZ88b5hoxusLuhY3W a5CN9iXgUuDhipMhRbzrfE5oVPkrD3mO+J0YA5kIRv+5ErQOfXOCkYN4eyUhue6Vw X-Gm-Gg: ASbGncv+Ka9N3Uz8pnHizjK3PjSBwpejHR/V4ZI5uUORZDlAxbbgrxktwOomXgIazK5 INwc1V6S8DmV1ETzuPfiCOeAxZ8FPreuTKUDJyXvofYwosN6vMQSljQ5FTtPp1fzfYcGfVttVix ZTrD5e498oeZTn4OnpNEwi7VFAD+WKpuHbD55k/ikMP3S5bmavUkRZnqBLUZHcI+0FkthOLuAQk yzd8GOf2iIPqSY8Q781LqOjyVFuN0zqsxULY3HZgbFm5mV/hrs/OZGNaEokOc/ZzcW3WncQOjXs tBzmoRPkeJ9UTP1x8rCEBp4rfIM+vQQ= X-Received: by 2002:a05:6000:4a17:b0:38d:d166:d44 with SMTP id ffacd0b85a97d-38f24da9cf2mr5264787f8f.23.1739477762944; Thu, 13 Feb 2025 12:16:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IGEl1x+X+UYDCaahN3gUCpDwhADHqd9ULDIdFIHTTb2rh19MpZt9LijFXMBWsimjdSb19ueGA== X-Received: by 2002:a05:6000:4a17:b0:38d:d166:d44 with SMTP id ffacd0b85a97d-38f24da9cf2mr5264759f8f.23.1739477762517; Thu, 13 Feb 2025 12:16:02 -0800 (PST) Received: from [127.0.0.2] (ip-217-030-074-039.aim-net.cz. [217.30.74.39]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4395a06d237sm57520895e9.21.2025.02.13.12.16.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 12:16:01 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Thu, 13 Feb 2025 21:14:27 +0100 Subject: [PATCH v4 05/10] git-contributors: better handling of hash mark/multiple emails Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250213-update-release-v4-5-c06883a8bbd6@kernel.org> References: <20250213-update-release-v4-0-c06883a8bbd6@kernel.org> In-Reply-To: <20250213-update-release-v4-0-c06883a8bbd6@kernel.org> To: linux-xfs@vger.kernel.org Cc: Andrey Albershteyn , "Darrick J. Wong" X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=5799; i=aalbersh@kernel.org; h=from:subject:message-id; bh=FRMtZEM/v2TdSzfxgy/TEs1Vbuhq4HDz9EGnvkfc2rs=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIY0tcF/Tp4alKc799ZzvEzbq1jPL0nV+FI6aKNX9TWT Zk86aBsceS+jlIWBjEuBlkxRZZ10lpTk4qk8o8Y1MjDzGFlAhnCwMUpABPZd4yR4dhn8fKP86Yr un1z5DGIXJKidOqxyGSObbGGDq+uLany4GZkaDlT6P3u7Y6t7n0C1/QC2P/6ahZdP2Cc8rA8Iy3 L7J81LwC76EnS X-Developer-Key: i=aalbersh@kernel.org; a=openpgp; fpr=AE1B2A9562721A6FC4307C1F46A7EA18AC33E108 Better handling of hash mark, tags with multiple emails and not quoted names in emails. See comments in the script. Signed-off-by: Andrey Albershteyn Signed-off-by: "Darrick J. Wong" Reviewed-by: "Darrick J. Wong" --- tools/git-contributors.py | 109 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 90 insertions(+), 19 deletions(-) diff --git a/tools/git-contributors.py b/tools/git-contributors.py index 70ac8abb26c8ce65de336c5ae48abcfee39508b2..1a0f2b80e3dad9124b86b29f8507389ef91fe813 100755 --- a/tools/git-contributors.py +++ b/tools/git-contributors.py @@ -37,35 +37,106 @@ class find_developers(object): self.r1 = re.compile(regex1, re.I) + # regex to guess if this is a list of multiple addresses. + # Not sure why the initial "^.*" is needed here. + self.r2 = re.compile(r'^.*,[^,]*@[^@]*,[^,]*@', re.I) + + # regex to match on anything inside a pair of angle brackets + self.r3 = re.compile(r'^.*<(.+)>', re.I) + + def _handle_addr(self, addr): + # The next split removes everything after an octothorpe (hash + # mark), because someone could have provided an improperly + # formatted email address: + # + # Cc: stable@vger.kernel.org # v6.19+ + # + # This, according to my reading of RFC5322, is allowed because + # octothorpes can be part of atom text. However, it is + # interepreted as if there weren't any whitespace + # ("stable@vger.kernel.org#v6.19+"). The grammar allows for + # this form, even though this is not a correct Internet domain + # name. + # + # Worse, if you follow the format specified in the kernel's + # SubmittingPatches file: + # + # Cc: # v6.9 + # + # emailutils will not know how to parse this, and returns empty + # strings. I think this is because the angle-addr + # specification allows only whitespace between the closing + # angle bracket and the CRLF. + # + # Hack around both problems by ignoring everything after an + # octothorpe, no matter where it occurs in the string. If + # someone has one in their name or the email address, too bad. + a = addr.split('#')[0] + + # emailutils can extract email addresses from headers that + # roughly follow the destination address field format: + # + # Reviewed-by: Bogus J. Simpson + # Reviewed-by: "Bogus J. Simpson" + # Reviewed-by: bogus@simpson.com + # + # Use it to extract the email address, because we don't care + # about the display name. + (name, addr) = email.utils.parseaddr(a) + if DEBUG: + print(f'A:{a}:NAME:{name}:ADDR:{addr}:') + if len(addr) > 0: + return addr + + # If emailutils fails to find anything, let's see if there's + # a sequence of characters within angle brackets and hope that + # is an email address. This works around things like: + # + # Reported-by: Xu, Wen + # + # Which should have had the name in quotations because there's + # a comma. + m = self.r3.match(a) + if m: + addr = m.expand(r'\g<1>') + if DEBUG: + print(f"M3:{addr}:M:{m}:") + return addr + + # No idea, just spit the whole thing out and hope for the best. + return a + def run(self, lines): addr_list = [] for line in lines: l = line.strip() - # emailutils can handle abominations like: - # - # Reviewed-by: Bogus J. Simpson - # Reviewed-by: "Bogus J. Simpson" - # Reviewed-by: bogus@simpson.com - # Cc: # v6.9 - # Tested-by: Moo Cow # powerpc + # First, does this line match any of the headers we + # know about? m = self.r1.match(l) if not m: continue - (name, addr) = email.utils.parseaddr(m.expand(r'\g<2>')) + rightside = m.expand(r'\g<2>') - # This last split removes anything after a hash mark, - # because someone could have provided an improperly - # formatted email address: - # - # Cc: stable@vger.kernel.org # v6.19+ - # - # emailutils doesn't seem to catch this, and I can't - # fully tell from RFC2822 that this isn't allowed. I - # think it is because dtext doesn't forbid spaces or - # hash marks. - addr_list.append(addr.split('#')[0]) + n = self.r2.match(rightside) + if n: + # Break the line into an array of addresses, + # delimited by commas, then handle each + # address. + addrs = rightside.split(',') + if DEBUG: + print(f"0LINE:{rightside}:ADDRS:{addrs}:M:{n}") + for addr in addrs: + a = self._handle_addr(addr) + addr_list.append(a) + else: + # Otherwise treat the line as a single email + # address. + if DEBUG: + print(f"1LINE:{rightside}:M:{n}") + a = self._handle_addr(rightside) + addr_list.append(a) return sorted(set(addr_list)) From patchwork Thu Feb 13 20:14:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Albershteyn X-Patchwork-Id: 13973998 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4666F24BBEB for ; Thu, 13 Feb 2025 20:16:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739477769; cv=none; b=U13QivhF1g5G0wJckZ9AbrW7peCCo72Q+sxQSxfTQ2Sqmixo17WkpB/5a76cqA0JXZdFzQKhZAXEGSXWUD7jQBvtzMK06EaFhO+cOilVmDI5fqLi74xUKM2LCjApbfSON+82AuIxvNLQ+/CUhq7066VSrSndUHYkrxqmtp/BEzI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739477769; c=relaxed/simple; bh=VYmMJTB6ehENr3WhCSM9iKdq6BQu8DfprsA/mDAgtJk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qNoxcpvEY3itHXotcmurQ3rF7TtO00VS1R2PCtpdSpUFOa76npi9vvTX007Skz++v4FzmPqBTUEl7MnSTiGuVPDB8c6T5g+MsGtJq5vj1tkjyJhT0TPQJ1xiDIR4krLl38SAC0tXLtaic/ZsREOurR7qkr5eUJIpAaumKrX9r3I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=eI1lz3Be; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="eI1lz3Be" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739477767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MhLwHh6iu7zsAzndLlkS/0chSXf0+r9ublGzpAhqKGs=; b=eI1lz3BeUZt3OVSstwksOBIDgQ6gFTFnOphhXvS2k8d4AplABr6B79hMe2tBnP86617mHR l7EZu95aGOtVWDlsjQx5M+syTwyJo96oul0vAllz3S6zkrW5yp5yzDY+P+uoWbP/JHTovA 6ssYBPZJjo3KaILR9tygBOf9/p9Vv2Q= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-561-AXzSF-lJP6OKdt2AU9R03Q-1; Thu, 13 Feb 2025 15:16:06 -0500 X-MC-Unique: AXzSF-lJP6OKdt2AU9R03Q-1 X-Mimecast-MFC-AGG-ID: AXzSF-lJP6OKdt2AU9R03Q Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-38de0201961so1429850f8f.2 for ; Thu, 13 Feb 2025 12:16:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739477763; x=1740082563; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MhLwHh6iu7zsAzndLlkS/0chSXf0+r9ublGzpAhqKGs=; b=VjV/yMZD0zOIc+gHpqtcT71z5iKmO5MjMwN2pvkzVa0qX6IGrPI4a6MQanC+kxcDSp WjLZxKltDqifVFiJupC9G6gDJt0R5wa+3cnJhLYXf8CWVLzS5arXRFp6LB7GRA6fBt0c uu0KQ9r5AMQsQgsSome0v6q8yGN5GTdD/WyQ2oW3a6Nef9HYJAvL5maKghkFHoBuyDaR NAw78GfHcENZ1lwzx2/CtiZSAvwdOvjsPz8XLhYCwNwXJ6RBsz6AOb9rSinYgRSBKA2A xReYVPGtTTg3SR50AIQcboXnk+hgEiMWMneooUru4QtFfI4rCXTLLg0lnMz8z6ebMAo5 1PCw== X-Gm-Message-State: AOJu0YwqlFKVVuCoFG2J0FW/HsXHQJ1mR0F0X76izyq8wp46xHliwubD PzdDLp6pfVEo71WVjEPWlz6CeaobiE4Odu6DIbspf5xt/Dohyq0xFhRtsa0eDext4cHjZRqT33L 9fnX+8ItzKfkv5RnswCzLHc61AagbKDPvHF5mJzJXUnLjHl0UGvyIEPY1ZhL0tq24 X-Gm-Gg: ASbGnctBtsh1JdJaMzRrXLMCMNAWL8WnrZPc3e55VEXUfkjWr0Q9e+s4h6C1vlAaamk oQiugJ0kECtbm3RQfHIIxbmkn/lbz2+UnDi0E0c4OXBfG0Qg+yMkWUZLfEF3IuDR6r5R+EMb/OU iZv1cUZM76KIP0fRjOKqAjWZVoREwuc3n9FyX3ciYUhPEGMNFMGcPsqucLmHiti7yVojszlmNig mLY/K/lsFrj49iDtZGl+h3x4seseD51Yet2/kZyOTcbwIsdALwJhUTYzOMbrPU9mRFB9Lo4/5Sn Tar+DWB3P5vWrMYGrhyY0onsieiaTjA= X-Received: by 2002:a05:6000:186d:b0:38d:d118:8b4d with SMTP id ffacd0b85a97d-38dea2eadcdmr9883332f8f.54.1739477763530; Thu, 13 Feb 2025 12:16:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IFoazP6TCAHXibYn9BX731+i3xY0fK1TtDKxEP0QD2HXuCue1F30GIB3MdjDSxH5jfumOx5lQ== X-Received: by 2002:a05:6000:186d:b0:38d:d118:8b4d with SMTP id ffacd0b85a97d-38dea2eadcdmr9883303f8f.54.1739477763175; Thu, 13 Feb 2025 12:16:03 -0800 (PST) Received: from [127.0.0.2] (ip-217-030-074-039.aim-net.cz. [217.30.74.39]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4395a06d237sm57520895e9.21.2025.02.13.12.16.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 12:16:02 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Thu, 13 Feb 2025 21:14:28 +0100 Subject: [PATCH v4 06/10] git-contributors: make revspec required and shebang fix Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250213-update-release-v4-6-c06883a8bbd6@kernel.org> References: <20250213-update-release-v4-0-c06883a8bbd6@kernel.org> In-Reply-To: <20250213-update-release-v4-0-c06883a8bbd6@kernel.org> To: linux-xfs@vger.kernel.org Cc: Andrey Albershteyn X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1748; i=aalbersh@kernel.org; h=from:subject:message-id; bh=VYmMJTB6ehENr3WhCSM9iKdq6BQu8DfprsA/mDAgtJk=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIY0tcF/fpeEVV9M+NV/c3vsza0KKav0M9dzPn6/5ZdM nfvb6ieMZ+po5SFQYyLQVZMkWWdtNbUpCKp/CMGNfIwc1iZQIYwcHEKwERWSDH8M45f2vz8Xb6t Vno400ZJS89A+QqH6zs5uWUOKF8++bHZkZFhUtCSta9TpaOXFCnZfC4SveV3Q1Pn0KaXNob2s/s /c03iAQDg+kkF X-Developer-Key: i=aalbersh@kernel.org; a=openpgp; fpr=AE1B2A9562721A6FC4307C1F46A7EA18AC33E108 Without default value script will show help instead of just hanging waiting for input on stdin. Shebang fix for system with different python location than the /usr/bin one. Cut leading delimiter from the final CC string. Signed-off-by: Andrey Albershteyn Reviewed-by: "Darrick J. Wong" --- tools/git-contributors.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/git-contributors.py b/tools/git-contributors.py index 1a0f2b80e3dad9124b86b29f8507389ef91fe813..01177a9af749776ce4ac982f29f8f9302904d820 100755 --- a/tools/git-contributors.py +++ b/tools/git-contributors.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # List all contributors to a series of git commits. # Copyright(C) 2025 Oracle, All Rights Reserved. @@ -144,8 +144,7 @@ def main(): global DEBUG parser = argparse.ArgumentParser(description = "List email addresses of contributors to a series of git commits.") - parser.add_argument("revspec", nargs = '?', default = None, \ - help = "git revisions to process.") + parser.add_argument("revspec", help = "git revisions to process.") parser.add_argument("--separator", type = str, default = '\n', \ help = "Separate each email address with this string.") parser.add_argument('--debug', action = 'store_true', default = False, \ @@ -160,9 +159,6 @@ def main(): # read git commits from repo contributors = fd.run(backtick(['git', 'log', '--pretty=medium', args.revspec])) - else: - # read patch from stdin - contributors = fd.run(sys.stdin.readlines()) print(args.separator.join(sorted(contributors))) return 0 From patchwork Thu Feb 13 20:14:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Albershteyn X-Patchwork-Id: 13973999 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0E9F724BBFF for ; Thu, 13 Feb 2025 20:16:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739477770; cv=none; b=sNxX7PeNmJi6CzdqjhvSPqXhGSPNI7FbHi4oaNr23sqefZGULs3bCF4/nTyAAeR3kVN1bwHuMT0FvkcH2tHeiik3un7DIbH9DdZogB00wEl9EH08b0wcA/zEU6OgdIjn0/11wccv1LVU0Cm6/l94cKIC1n4aAD4aODIUlLlMczQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739477770; c=relaxed/simple; bh=rEflmP3SN1QNELLhRia+oSljkcISs2LV+HBYG8gRPwI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oxmNC8Y2JwBCDObBGK8ygQ78RrgK7U7sId0BO/UhDU/ZvnY56YSataEI1ZNRv+GGpsnnCHRpeYfcNV6t8gyUiFo5IZOVa2Ek4RQKmRYpToPWQxN6Ue9MM5FQn2zJvDGdVC4VgvHC0JTsAwBJDhEvYMZzwR+fXOY85Hu/K0846f4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=IkblpVtx; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="IkblpVtx" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739477768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0x/LYnT+O7ha0wrAYFG+Ebf3sRK/ZTjDo3WLO3Wl+wY=; b=IkblpVtxiqQL2LurzZTCd2fvWKPIHjiT65UnVk2goaXCQ3aWae+ZZ+1Hm4lmvKYF8B3Z3E 4pOSvk0MHbfd3lcB+rfU10AMuR5iUBLGDx/kcBOzXUyh3YaY4Tl8Sjea2aqA3xOZwKlAGo QxjTa+D5ISmPbuVMK1n5geFcLPXw+qg= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-644-O6cmrUrlMnqumwGsTp5H5g-1; Thu, 13 Feb 2025 15:16:06 -0500 X-MC-Unique: O6cmrUrlMnqumwGsTp5H5g-1 X-Mimecast-MFC-AGG-ID: O6cmrUrlMnqumwGsTp5H5g Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4394c747c72so7548255e9.1 for ; Thu, 13 Feb 2025 12:16:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739477765; x=1740082565; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0x/LYnT+O7ha0wrAYFG+Ebf3sRK/ZTjDo3WLO3Wl+wY=; b=Sh44jK5R/c6RR6jSXKlx+m1q6UROHEiXrkyt2aaj4MzEV8svzzy+isphv57V+PevHM MytP/PCG5pEwliMQ3D70k+ycqHZ1zclujKku8dK+X+NrnjAXj0zAwxuYTcKM7Ws/dznD orF9ImkcDVRw0OoneeU7ApAI8wltznrsakyI8Ce+zBTXBu3fpcbzlxf281Mn7i+FmNeD sYdDVbnpGzFFdvsT3bCEsRSg6aeCBdj031Gq5sA7b296CNV+n1rsmqlcKW8q92t7ZA7D gqrMF46Xul4uwPl/v3lPkwRfRpAPANg4M2pSdGkop2H2F8LYIUjP68PyV+4EbmTuqORc R7tw== X-Gm-Message-State: AOJu0YzdzBUFvjk9+2K7/rJeDpvPvFzwfYamSgEWyhZ/mqFBVmMjDp9S 74/00L5dF9kRo4ll1+Fwk9/sGT8+wzPDbvtQ76+SuRWmOYFT9bpFHjvs1Px0rmOLP7VpGplnmxM tZbj0Ls7+BZUU8I/VJCTc61OwqAyE68wnjDAmeBiDWlrxi7bhjF1k69Oub/EFfVwO X-Gm-Gg: ASbGncvZSPPBHVVHaXTKzirS4Nb663jr4uge4VVdWIb9LtLLB13qFXzU+BU8jkym8eQ mgrpN4o9t+fIP1yPcSpGda3DwH8KqGWOfS5BCBBNO4VT5KD7Ul1EXJmZNbU4oZuqUTWYJmko5eL ZBfx6Mpmoko5Go/YqfIW73DhUAsO8MPTytUOk+7myulIegpWOUhbeWU7/BP9YF42viYAlsBY/Qs IzSnOPoH97Ow3b7I0nlekqXiyx1Y1OW5FfQa/QT8XFteCFrALxuoawm2znQjzcqSRf7dZJcIl0Y WQZmnLDam49S2znuLA7Nrk5BPDYWUHI= X-Received: by 2002:a05:600c:8709:b0:439:4b9a:a9fb with SMTP id 5b1f17b1804b1-43959a997e9mr103927645e9.30.1739477764991; Thu, 13 Feb 2025 12:16:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IFssC39RAkEFAv1yf4TSgr9XVc1v2gbf3RS+nS6QZGylhhnrZyLlNGM5Q0gnl1eZ44/uoFh5g== X-Received: by 2002:a05:600c:8709:b0:439:4b9a:a9fb with SMTP id 5b1f17b1804b1-43959a997e9mr103927365e9.30.1739477764599; Thu, 13 Feb 2025 12:16:04 -0800 (PST) Received: from [127.0.0.2] (ip-217-030-074-039.aim-net.cz. [217.30.74.39]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4395a06d237sm57520895e9.21.2025.02.13.12.16.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 12:16:03 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Thu, 13 Feb 2025 21:14:29 +0100 Subject: [PATCH v4 07/10] release.sh: generate ANNOUNCE email Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250213-update-release-v4-7-c06883a8bbd6@kernel.org> References: <20250213-update-release-v4-0-c06883a8bbd6@kernel.org> In-Reply-To: <20250213-update-release-v4-0-c06883a8bbd6@kernel.org> To: linux-xfs@vger.kernel.org Cc: "Darrick J. Wong" , Andrey Albershteyn X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2602; i=aalbersh@kernel.org; h=from:subject:message-id; bh=rEflmP3SN1QNELLhRia+oSljkcISs2LV+HBYG8gRPwI=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIY0tcF/drh4qF+euvptLBdUinvtVzmN8SIzPQ4pH3px Mr5dRvTbyh2lLIwiHExyIopsqyT1pqaVCSVf8SgRh5mDisTyBAGLk4BmMimR4wMG55UlrI0m0/9 s3hDtJLTku7NO8tWv1P+ylol/M69aoXReUaGJ6yBK1eGvpeymWk1I9troxOn4WKVUANzj8qw+es XXJRjAQDOUEb7 X-Developer-Key: i=aalbersh@kernel.org; a=openpgp; fpr=AE1B2A9562721A6FC4307C1F46A7EA18AC33E108 Reviewed-by: Darrick J. Wong Signed-off-by: Andrey Albershteyn --- release.sh | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/release.sh b/release.sh index c3f74bc8dc587a40d867dd22e1e4c6e4aabb8997..696d3ec107ca0cc11ed565734ca7423acfd6d858 100755 --- a/release.sh +++ b/release.sh @@ -13,11 +13,13 @@ set -e KUP=0 COMMIT=1 +LAST_HEAD="" help() { echo "$(basename) - create xfsprogs release" printf "\t[--kup|-k] upload final tarball with KUP\n" printf "\t[--no-commit|-n] don't create release commit\n" + printf "\t[--last-head|-l] commit of the last release\n" } update_version() { @@ -40,6 +42,48 @@ update_version() { sed -i "1s/^/xfsprogs (${version}-1) unstable; urgency=low\n/" ./debian/changelog } +prepare_mail() { + branch="$1" + mail_file=$(mktemp) + if [ -n "$LAST_HEAD" ]; then + if [ $branch == "master" ]; then + reason="$(git describe --abbrev=0 $branch) released" + else + reason="for-next updated to $(git log --oneline --format="%h" -1 $branch)" + fi; + cat << EOF > $mail_file +To: linux-xfs@vger.kernel.org +Cc: $(./tools/git-contributors.py $LAST_HEAD..$branch --delimiter ', ') +Subject: [ANNOUNCE] xfsprogs: $reason + +Hi folks, + +The xfsprogs $branch branch in repository at: + + git://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git + +has just been updated. + +Patches often get missed, so if your outstanding patches are properly reviewed +on the list and not included in this update, please let me know. + +The for-next branch has also been updated to match the state of master. + +The new head of the $branch branch is commit: + +$(git log --oneline --format="%H" -1 $branch) + +New commits: + +$(git shortlog --format="[%h] %s" $LAST_HEAD..$branch) + +Code Diffstat: + +$(git diff --stat --summary -C -M $LAST_HEAD..$branch) +EOF + fi +} + while [ $# -gt 0 ]; do case "$1" in --kup|-k) @@ -48,6 +92,10 @@ while [ $# -gt 0 ]; do --no-commit|-n) COMMIT=0 ;; + --last-head|-l) + LAST_HEAD=$2 + shift + ;; --help|-h) help exit 0 @@ -122,6 +170,12 @@ if [ $KUP -eq 1 ]; then pub/linux/utils/fs/xfs/xfsprogs/ fi; +prepare_mail "master" + echo "" echo "Done. Please remember to push out tags and the branch." printf "\tgit push origin v${version} master:master master:for-next\n" +if [ -n "$LAST_HEAD" ]; then + echo "Command to send ANNOUNCE email" + printf "\tneomutt -H $mail_file\n" +fi From patchwork Thu Feb 13 20:14:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Albershteyn X-Patchwork-Id: 13974000 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E1E2124BBF5 for ; Thu, 13 Feb 2025 20:16:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739477771; cv=none; b=C7sbymP9E1tcoNiYxigXuUuD5Q1/bvjT5DHSsAzER4YCbPfLDcaoEdagafgi0LAPfpBYrRH6Ib2SnZFpx6b/loQ5L3gaM37I9ISnFIpA0orTp9FpaKweeDmzx7HIwJgGZo3nDbBfIaAMf/BjgByKPqfBTLsgwGlfX/ok1KBkRPc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739477771; c=relaxed/simple; bh=/3wTB0dZWiuzHweqc57qc93adFoOrjqnjoE6PEajIGc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oCvQGM4MF9AEGIlLqcCF4fIdbeJO8mydC5TFaWLsETwCvkSyaZN3Diw3phN27U5EQeKK4oO0KurJbh3xz8qhefj1I1+vyWIWS008SzWPpWwnxH7BKoC0r6uWSiBUZzOCJZ8pCBUQ+OnKab+mUPOQmkAFtHnHRV5K7iESx/yiF68= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=g2Q/a22K; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="g2Q/a22K" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739477768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nXeDJn2Hln3ymF19/vkeHhF/7YwfAfkD+D52rqv6Y1k=; b=g2Q/a22K2epW/8P6+ckAh4FIcLTdDT9LRCkgPOX1EgmfdhG9zOSWvAeZWeOINr+hikLQJs KTAgZxXJeyhzluVWWntwi/WorWNl5aSDTrEsgv7WuLf+OMvekiZeRODdTXwADXocmPzNic Di+5H5pkz6ezAYX3PuJI9rmj2uXYetM= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-127-Q28v6uaRN0KMKg6QmP9lUQ-1; Thu, 13 Feb 2025 15:16:07 -0500 X-MC-Unique: Q28v6uaRN0KMKg6QmP9lUQ-1 X-Mimecast-MFC-AGG-ID: Q28v6uaRN0KMKg6QmP9lUQ_1739477766 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-43945f32e2dso10650815e9.2 for ; Thu, 13 Feb 2025 12:16:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739477766; x=1740082566; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nXeDJn2Hln3ymF19/vkeHhF/7YwfAfkD+D52rqv6Y1k=; b=QUgwVTH+f8rVwB8lXoxL/G83yUkAMvlsKEm5eC7TJWG0FoZh1UGsQ1kK5JYgndSwEY 7xTdPxOmxYl7Q8iKSKZP/9bGqZ5bICH4SJSeG4G1uqr92YpRFIbsuxcdYmnlzGmsyj8e 1TbEhQ9rQ9G2I6W+Gp0vqA0RR1fItl3pkbqwrgMRWZZ9aQVbkxf2HdPMm43MTram96hi 5QQuGIVOsckdtoAkNC9WWB1HaheSrMSY6j1vds/rddHQ0pn/9FBf8if09x49VO/H3yKC friat04zEzxkJVIQJwdKE5xjm/C8/yHNs1FU8KbmkJUO7pl5vIsqMbpnTIMDMh/+YheJ ws3Q== X-Gm-Message-State: AOJu0YwjeR1aK6bGSdaAR55A458XKQ0c8t7whFAaIzvwLuiEBgR/0azh rNKtj7Dc5snGt3IJ/MUf9ddMDC5K3Za1yDb7+vO2BVBDae1VgyTY/+Q3eVqei+FkDp77LwOoHgj Dv/kE2X5IXwhMYNV7LNP1OuxHfJEAts/3UQ0n6uPBYqOWiZjOvGfk19rmfsvGk7U7 X-Gm-Gg: ASbGnctZdWAr96/yDblzoGkqnwZ3QlW5GQm0Xz25l2KMi2mZvei7P1y5EXDUlZIwryW lt0VPSZM2HZSZZzeRm+HM1liU2GBL9Pc4uFvxhYrTZBKITRKKWYHiXDKLSTFJRv3NvLDYYGoukc mNHHo0unSOQ4DnVg7idrBvc8bcwvoPRSWgpTuvAuQOLQt1U3/iBvGj6E7XfruQZenLdfBYoYPF5 afukSemuK8zWL93ThuUwzE1UNOe93D2Fq8qcwSzg7YzeSWq2vofeH7t/7FiSAmVC89PJWcSzeiw hP/bmwHr+O3euJkel4R32cUfa9XohX4= X-Received: by 2002:a05:600c:4f4d:b0:439:3d5c:8c19 with SMTP id 5b1f17b1804b1-439601b7ef9mr63346685e9.24.1739477765836; Thu, 13 Feb 2025 12:16:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IFiPB51e3ugUUKN8mtB0v6peaXkHODaveZJLRN27IX8lNnpE77dK6vxFY8+mTu8QCPU3RDefg== X-Received: by 2002:a05:600c:4f4d:b0:439:3d5c:8c19 with SMTP id 5b1f17b1804b1-439601b7ef9mr63346465e9.24.1739477765503; Thu, 13 Feb 2025 12:16:05 -0800 (PST) Received: from [127.0.0.2] (ip-217-030-074-039.aim-net.cz. [217.30.74.39]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4395a06d237sm57520895e9.21.2025.02.13.12.16.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 12:16:05 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Thu, 13 Feb 2025 21:14:30 +0100 Subject: [PATCH v4 08/10] release.sh: add -f to generate for-next update email Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250213-update-release-v4-8-c06883a8bbd6@kernel.org> References: <20250213-update-release-v4-0-c06883a8bbd6@kernel.org> In-Reply-To: <20250213-update-release-v4-0-c06883a8bbd6@kernel.org> To: linux-xfs@vger.kernel.org Cc: "Darrick J. Wong" , Andrey Albershteyn X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1489; i=aalbersh@kernel.org; h=from:subject:message-id; bh=/3wTB0dZWiuzHweqc57qc93adFoOrjqnjoE6PEajIGc=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIY0tcF/YrZcVtY8vMZJuXFPtPyDhhnnp0TvHq308ulv CYX9B6t3ZHfUcrCIMbFICumyLJOWmtqUpFU/hGDGnmYOaxMIEMYuDgFYCJ7IxgZftW+b4t2vGX0 4/fDR1FCe+WetTvfFK3xUFn9tldNdN9LC0aGJ8qxARZ5SdsPvV+79MFD9/VBzodi4s5FB35slk+ fbnKYBQBPaEr5 X-Developer-Key: i=aalbersh@kernel.org; a=openpgp; fpr=AE1B2A9562721A6FC4307C1F46A7EA18AC33E108 Add --for-next/-f to generate ANNOUNCE email for for-next branch update. This doesn't require new commit/tarball/tags, so skip it. Reviewed-by: Darrick J. Wong Signed-off-by: Andrey Albershteyn --- release.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/release.sh b/release.sh index 696d3ec107ca0cc11ed565734ca7423acfd6d858..b7461e958e6f55f7b8ccf31b53e2d304db11789e 100755 --- a/release.sh +++ b/release.sh @@ -14,12 +14,14 @@ set -e KUP=0 COMMIT=1 LAST_HEAD="" +FOR_NEXT=0 help() { echo "$(basename) - create xfsprogs release" printf "\t[--kup|-k] upload final tarball with KUP\n" printf "\t[--no-commit|-n] don't create release commit\n" printf "\t[--last-head|-l] commit of the last release\n" + printf "\t[--for-next|-f] generate announce email for for-next update\n" } update_version() { @@ -96,6 +98,9 @@ while [ $# -gt 0 ]; do LAST_HEAD=$2 shift ;; + --for-next|-f) + FOR_NEXT=1 + ;; --help|-h) help exit 0 @@ -108,6 +113,17 @@ while [ $# -gt 0 ]; do shift done +if [ $FOR_NEXT -eq 1 ]; then + echo "Push your for-next branch:" + printf "\tgit push origin for-next:for-next\n" + prepare_mail "for-next" + if [ -n "$LAST_HEAD" ]; then + echo "Command to send ANNOUNCE email" + printf "\tneomutt -H $mail_file\n" + fi + exit 0 +fi + if [ -z "$EDITOR" ]; then EDITOR=$(command -v vi) fi From patchwork Thu Feb 13 20:14:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Albershteyn X-Patchwork-Id: 13974001 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A5C1F24BC19 for ; Thu, 13 Feb 2025 20:16:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739477772; cv=none; b=eK/wmrds31pGWagiUTxPk0NDxcFZ/s94Z8aNFR/vsiKVcQMf5/k/sngachkjONWiwQnR4tqXfKZcN9hF/ZgWbK1/FG7Uzm6zDK5cHzHwfFdbRl8YE3Wz7l3Ajh0Mie/jXu2hLCYHBvi99WmMPPvTOZWKCc7oIIPs26DJrhRtESo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739477772; c=relaxed/simple; bh=XNICfqvtAdFyaSy5yFvtRHfxYOmOjIVK99ClUIx4oGk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kxzDMcPbBidt+NqzdvgnxOl9F+/Ic4/Ph5Fj3ZpAnsT/IUDaDg2BXdyRtJJm0D8Vu5KgiabzzfHl0fIArlogN8P8AEOUCmPWsvkGCiJIjscXUjFICJORNcPQpis9hZfjqh2ejXoN6S0LQu11f2N+k32PGQjICxthlCyj+1+z1eQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=XhC3pykS; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XhC3pykS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739477769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+4/i8ubbRyMPAjDq/V5xbwxQmNy53IZMUMQjA3oiP2U=; b=XhC3pykSWoS+SloTIx9IYUUrl6sv0i9ty0qsPyCHAKe/bsnj1IRfuf62p93JjIFJnVsfJ1 QKTEH2w6IjV0yAtNHfToNugTBB/XZv1Y4OtHrVpsy8WpVndQoZmWPkQNc1mkI7amllqPeA ZlOn17yB4ajAxnr33kuT5mLQvVBqig8= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-86-XJRZ1UasPTuqUrh9hJgnUQ-1; Thu, 13 Feb 2025 15:16:08 -0500 X-MC-Unique: XJRZ1UasPTuqUrh9hJgnUQ-1 X-Mimecast-MFC-AGG-ID: XJRZ1UasPTuqUrh9hJgnUQ_1739477767 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-38de0201875so785040f8f.0 for ; Thu, 13 Feb 2025 12:16:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739477766; x=1740082566; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+4/i8ubbRyMPAjDq/V5xbwxQmNy53IZMUMQjA3oiP2U=; b=wm69lr7PNf4TZO+O7HRlY4xaY0aQ4o4sUKQ6+bd+RRW0vXCrNv+PhHzNM0sW8UkgVW L/O4o4kyGE03O4qfJCXZ3k2ZcaGO3QyOrlAgzRKxBCuV3FyGWoMrEauEaXQWSgA1tStL kbherroCLqCYbwnGoifexHErmDxplcHo59SQqkefx2BEW/8wcsht6zS83PHtiZbYcwBj 6NhmzAvDc4xmQH4b9I5GsUDVK3Heyv1nLcoA7wOIP5snobLG7HtMn01cQJLsIDoGXoGa AheIgTCkoQc/Dkcc5CpB6UpdYV+vZ9ookIDLKBB5rH5UXvfahG3mp+7O73pdwzOlM72n w7NQ== X-Gm-Message-State: AOJu0YxSxJp89vVKW18hdMC4iy/QUQfh2MH7oEH3e5ayQjj9hc1xu5CF xnmn1tXIe0E4beDwsFtLysRh5trpiYcpgg8J8gJyEkLEYJdqlvZ6Mqsou3/XmN9NOKKYRsOCEh0 0uTvkga7Nf/2oU2I7eGhCSC0RRA1Vg+rBNh0urkn5ZTQZQL3HlRvcs4p/36tD2Wsm X-Gm-Gg: ASbGncuOim+nz9/okx1UBb12axc6z86HY2npz/l34nNQ85ezfn9CGZk+uj/wCSRawEA 29nRMaFn+6xdXZ6KO3nSeieG99DAm+4g8LtalqVEME1nUdqEM/AiXTsL6So/5q0WYqM2nR4va16 H6fgqwGC8U1Z0cZ3LAGZ2j9cnMc0qhWV1ovjE9Za8C9csOypoHMFdebOunG5F3Lctp+S2eDYXzi Y7HH4RNmMj54V1DEMsvZNYIF3vfo9RRc0vSJS8+lSbnkv3Dlgp9y87HqfNx8neo5k+sb2X6modP 2m4GkDDlzqp3R0/pwbAXz+Nt9TCRMI0= X-Received: by 2002:a05:6000:178b:b0:38d:c55e:ebcf with SMTP id ffacd0b85a97d-38f2451a511mr5180621f8f.52.1739477766561; Thu, 13 Feb 2025 12:16:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IFr1XiW5AZJPmmi7WnXT4ODMT0EYmPXoglelcXIxhXwWnvwn7rX8gsPSlCi4XNJJlK9kTyPnw== X-Received: by 2002:a05:6000:178b:b0:38d:c55e:ebcf with SMTP id ffacd0b85a97d-38f2451a511mr5180602f8f.52.1739477766264; Thu, 13 Feb 2025 12:16:06 -0800 (PST) Received: from [127.0.0.2] (ip-217-030-074-039.aim-net.cz. [217.30.74.39]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4395a06d237sm57520895e9.21.2025.02.13.12.16.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 12:16:05 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Thu, 13 Feb 2025 21:14:31 +0100 Subject: [PATCH v4 09/10] libxfs-apply: drop Cc: to stable release list Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250213-update-release-v4-9-c06883a8bbd6@kernel.org> References: <20250213-update-release-v4-0-c06883a8bbd6@kernel.org> In-Reply-To: <20250213-update-release-v4-0-c06883a8bbd6@kernel.org> To: linux-xfs@vger.kernel.org Cc: Andrey Albershteyn X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=705; i=aalbersh@kernel.org; h=from:subject:message-id; bh=XNICfqvtAdFyaSy5yFvtRHfxYOmOjIVK99ClUIx4oGk=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIY0tcF/bplwbgwQc9WUM1f1YnHSlG2yf89u2D1U63t/ dufNrrMOt5RysIgxsUgK6bIsk5aa2pSkVT+EYMaeZg5rEwgQxi4OAVgIiy3Gf4HTebldXygWLBs R1OQpoHnDQ9x9nVZ+Q/0dj5Z5xF44Hopwz/tJvlLh/Nya1VaLmy68maF56YZPIaPs+1/v1bsNrk S788IAK3jRYI= X-Developer-Key: i=aalbersh@kernel.org; a=openpgp; fpr=AE1B2A9562721A6FC4307C1F46A7EA18AC33E108 These Cc: tags are intended for kernel commits which need to be backported to stable kernels. Maintainers of stable kernel aren't interested in xfsprogs syncs. Signed-off-by: Andrey Albershteyn Reviewed-by: "Darrick J. Wong" --- tools/libxfs-apply | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/libxfs-apply b/tools/libxfs-apply index 097a695f942bb832c2fb1456a0fd8c28c025d1a6..e9672e572d23af296dccfe6499eda9b909f44afd 100755 --- a/tools/libxfs-apply +++ b/tools/libxfs-apply @@ -254,6 +254,7 @@ fixup_header_format() } /^Date:/ { date_seen=1; next } /^difflib/ { next } + /[Cc]{2}: ?.*/ { next } // { if (date_seen == 0) From patchwork Thu Feb 13 20:14:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Albershteyn X-Patchwork-Id: 13974002 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 059E7266185 for ; Thu, 13 Feb 2025 20:16:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739477772; cv=none; b=CVVVvdcayfxvGffwh0bnQgQf4XyQ4UEU5Y4Baq3FZN+TEflGeWX3cCqDTmg2SIkt+MNkjiVF1ccgjVdx3QMdWRQanfCqhdW9jxAHL/3cOVVYtOLIm08CMSze4UPH9rL+bgv66yaq6izbo21RThnNHxjjXN5rR6rHsKpNgkNW3v4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739477772; c=relaxed/simple; bh=YPqxkeHt2mmQV6xNhpuDuyV7Kz3D11AdUuw03o+Rb7I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QAamKXsLf1zcWjg5zPUjuS0S68JfhtqWalxt2a+xmt+lUPdV8ucuhDF+t9TWYqDhL2sqYybtdJP6shE7092GcITqNnLeCSQteazzA9yv7n891getZkNcN5tNKjVTdIyFJGRwL2lXKemYHuylYE2avXd0oEnxh5ci7IJsoSGIcD0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=YG2eF8M9; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YG2eF8M9" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739477770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZbTVlhXmZxgU8mJL+L4bgYmknZkQN7LeUyXKA8ggmbs=; b=YG2eF8M9Sgc32P0hyU9y5fXsjaBLiwxi23oVaiP3411pOdduJOf1uZcCerWVynJxk+kIVS yzc3OBsZRwOuMXLrs3+DDdG23Gt4A15z44VhN4oUyilq2XnQZxqKl8sNUGg4WrGeuxIMvf nNQjrVhEKloH9yGAsY9984crc0x5r+o= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-526-XG7OUCKsPPar9r7bVPp_Fg-1; Thu, 13 Feb 2025 15:16:08 -0500 X-MC-Unique: XG7OUCKsPPar9r7bVPp_Fg-1 X-Mimecast-MFC-AGG-ID: XG7OUCKsPPar9r7bVPp_Fg Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-43933bdcce0so10382945e9.2 for ; Thu, 13 Feb 2025 12:16:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739477767; x=1740082567; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZbTVlhXmZxgU8mJL+L4bgYmknZkQN7LeUyXKA8ggmbs=; b=c9mUcjzXC73h+b63S9Yv/zppdZ5bQLVa/xuOo6PVcLiYQvDGDRYEnwPWHRcUOEGmgj 78Cbnn+8lkxbmQyP5WEe6QxRQwpC5Ynktx/Su+CziUHCo5QV99Vc7CEHPW5B3MkWeaIE QPlCM1EGSsllBvhiistrNRat8NXGO791HlKlGT/nFk268BxIlAOHk7MUxmfYqzSs7QRp VHoR2iqaQoIlXb9UtywwhWV5ugs2yF1eHwcQPAkdb8QBbSb9x+Caops8JmfgzE5hvvLP E6o3Mb0gBGwj2klIPfGftAKzb0Qq57xXSOki9p9S7tarMlcTeirI6iDkkmJ+GO/rhhvh B+fA== X-Gm-Message-State: AOJu0YysJxkY76/sPmIaCcx3O/GCgsfLSkgF1F2K/SOfxz1j1F1YrA5j Ln0AWeIIXjxtRziaFpqrUfUTLy/SLJX09Dx4kR3hv3UzXk7bJ4IIV+u+m2pbsKu4SZ4mrFWtxJw pdqrj9jSvesZHafLTjGmotna7TIsJk5QQ/6qP5g6VD23YokUeNsptJ5Az X-Gm-Gg: ASbGnctdosuVF4CwM9BQZyNWbgMSFNaJnAzfXN7ff5KvIshHRBTz87/ewDoNZfFYS/z Nd9lmfDDD1I6Cf5xoCqSZ987ZtVaHQIDjqAnpUXwgzqDyxiqDW/aO215lB5jSqeEshYlqj4HOe6 Q3lgg0ZmgUV3NFoC86MbMKu8AcTHjDXgcw9Ub9S1C1u6OfzSYOQ+Fji/XzsasqpYGiowGqnD3W4 Zy07BB94Dp5mn79vrRRQRcspubVMk751sqtm3nXSEr8VW3n0jLRZuzeA2dCt5pWR60Uud7ctEji XuoEIdG/kAr2kbNwQ6+eVVZWltNhnoM= X-Received: by 2002:a05:600c:1ca6:b0:439:677d:89a9 with SMTP id 5b1f17b1804b1-439677d8d8cmr2857565e9.31.1739477767403; Thu, 13 Feb 2025 12:16:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IGr+G5uVnyUwqNZ4yFhjyppktYxqxzXe8nUOl2f5OudyzKPRbOyKhsfGVC81Dr3c2jZw9WpFg== X-Received: by 2002:a05:600c:1ca6:b0:439:677d:89a9 with SMTP id 5b1f17b1804b1-439677d8d8cmr2857335e9.31.1739477766983; Thu, 13 Feb 2025 12:16:06 -0800 (PST) Received: from [127.0.0.2] (ip-217-030-074-039.aim-net.cz. [217.30.74.39]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4395a06d237sm57520895e9.21.2025.02.13.12.16.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 12:16:06 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Thu, 13 Feb 2025 21:14:32 +0100 Subject: [PATCH v4 10/10] gitignore: ignore a few newly generated files Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250213-update-release-v4-10-c06883a8bbd6@kernel.org> References: <20250213-update-release-v4-0-c06883a8bbd6@kernel.org> In-Reply-To: <20250213-update-release-v4-0-c06883a8bbd6@kernel.org> To: linux-xfs@vger.kernel.org Cc: Andrey Albershteyn X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=690; i=aalbersh@kernel.org; h=from:subject:message-id; bh=YPqxkeHt2mmQV6xNhpuDuyV7Kz3D11AdUuw03o+Rb7I=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIY0tcF/ZrJLro/4eXc/NKDn1Y1Xqiu3rm7ideEjSnre Ghc4HFe1ZyOUhYGMS4GWTFFlnXSWlOTiqTyjxjUyMPMYWUCGcLAxSkAEzlTxsjw7oRMpVKGgcC1 OS+FC4o6xJgnBt0JZZo8paqmY8pnO+XFjAy74mWfX/q7XHZ1d0/TwTWVp5/PW/SWM+V3zOv1V2z CLubyAQApS0kn X-Developer-Key: i=aalbersh@kernel.org; a=openpgp; fpr=AE1B2A9562721A6FC4307C1F46A7EA18AC33E108 These files are generated from corresponding *.in templates. Signed-off-by: Andrey Albershteyn Reviewed-by: "Darrick J. Wong" --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 756867124a021b195a10fc2a8a598f16aa6514c4..5d971200d5bfb285e680427de193f81d8ab77c06 100644 --- a/.gitignore +++ b/.gitignore @@ -65,12 +65,14 @@ cscope.* /mdrestore/xfs_mdrestore /mkfs/fstyp /mkfs/mkfs.xfs +/mkfs/xfs_protofile /quota/xfs_quota /repair/xfs_repair /rtcp/xfs_rtcp /spaceman/xfs_spaceman /scrub/xfs_scrub /scrub/xfs_scrub_all +/scrub/xfs_scrub_all.timer /scrub/xfs_scrub_fail /scrub/*.cron /scrub/*.service