From patchwork Wed Feb 26 14:50: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: 13992617 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 45EA0221739 for ; Wed, 26 Feb 2025 14:50:52 +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=1740581454; cv=none; b=IbFxHabNCeW58g7OQrPNvLCpFppX+Nf721PkRhlO8/y1r7snU4W0VVyy87EKAnq5i830g66ZwzuK8caAjBzgKOiZ8g6cijA5Q+ePnt7jhCvUqxkfDDvzJZzvR+PaUBezMhRtGWDXFlaW0JYga6tN5/VxACQnvV30ERlmySyd4tQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740581454; c=relaxed/simple; bh=r8NE2PVa/ZrAaOBQWgPWkabf8eqQcrLO6lplelO8GLk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KwNZerBKAD1ja2v5myukn4C6cqx9KeflWkJvXRMsxTtwGrKAUpcOjJfOzU5AAPZ9JsxHX5DXP3sUa1a8zi+nSBJHE4dCE+CPNXwqtDpZMVW1zD5bwIz4Ei0hkpR1LJcAB9MPLIAIegEc3GWwT5J3hvHzgXbhMPStHIdERBqiGDo= 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=i+KQQhAX; 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="i+KQQhAX" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740581452; 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=6p3yZF2ojbKPOjvfClYCWTgw5eOy5VAaFnC3+essAGY=; b=i+KQQhAXNFJs1In9NQmqLxYoh5Lgd7jr2eBGXW/a4MjUeqznyY8T5PeLZS07z/RDzAIy8f +hs6RLRkcvNC6PZpFUb5SCwExtowaZSM9M9Q6bZZSLa3n2dxOHanqqQefGH/xD/1hvfHlA nZr+T5RsuvpjKzBBkdkQ+eIBSD526MI= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-661-l5T_VMSSN6yDpo3pof7jng-1; Wed, 26 Feb 2025 09:50:48 -0500 X-MC-Unique: l5T_VMSSN6yDpo3pof7jng-1 X-Mimecast-MFC-AGG-ID: l5T_VMSSN6yDpo3pof7jng_1740581447 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-abbaac605c3so688992566b.0 for ; Wed, 26 Feb 2025 06:50:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740581447; x=1741186247; 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=6p3yZF2ojbKPOjvfClYCWTgw5eOy5VAaFnC3+essAGY=; b=wk0P+99T8gv468HpO5aVecPQKoR9tc3EBbOCj/kSykqiri9M+c7qRvO6CLX88KUlQU Uqh95uddIlRyl0GAM6MHkhUGIC3TI0G7x39lq6n+xaCDC/uXAbtkcOLm4uJhqoNcS04H 4vjebcu5Ku+zmo6XKWyZEMkPyExCiMVsSoRs/omAvuKqtxxCYbkr/QLR8+JRdjh0l93W GEThKB8Zq8rgCVPOATG1BziMkcUus//yYRBeMzl9TK7uf7f8xTYponbSlVF1JhEfou20 /ood8K9fSVvg77javboZzw3ukXrdVr8Q4mxjkATUeVIjO7RFFS+xzPflHNY1bji8FeMf hc2Q== X-Gm-Message-State: AOJu0Yxv2VNJyRgHxbogvQ1x+ofM5M/7RjDzhQkeqO33G8pHQFzt5wGu bwhD6EKypk+NDAwooHUd1weN3qKfsPApYNSnOfDv5eX0YTS2nxpRVspm88I3W3lm7j9BAqdKjCr 5nr/aykiraUyGRrivg16EPWV9kUPUMQ63IUtiAXO1MWoBkdz/IoY4NVCW X-Gm-Gg: ASbGnctSejpTGT83Qk6QNOTN0lCUlQtsobssw9B8wSdFd47RSEqtA5Ep8OYtqT8QV5D wnpcGb7zNpVtcA9Vy1WoE3UaizQbSpTnioseBnDFJ+rjAkyMy1DeDGfnwzyNCcqM4cLuhgt+P9p TAueXru1R4q7sQY2WFpPpHyiLvXPHx38ymSYPTsPv+BNAAUGYrugSRvggx0P3yDDSoBl4hwgGGo qQb+VrtffrUEaogCF5+7c7Z8qWsPe9g9/LO5mJPbkD9iuWA1yhyraaWgQTLIOCfAWX8K7YLqWCG XDnQrrQiIXfQKzqfy2NfR6BC+pFcE3Y/PNwxpiS8Fw== X-Received: by 2002:a17:906:c148:b0:aae:85a9:e2d with SMTP id a640c23a62f3a-abc0de13a1emr2471887666b.45.1740581446022; Wed, 26 Feb 2025 06:50:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IEAC9hG7oEXuq9BTFXg/wurwmCZ+o1EQgn4SBBoWHeX0Ql0tr3Zf8OXDOKSYpkPCC+iQ2c6Ug== X-Received: by 2002:a17:906:c148:b0:aae:85a9:e2d with SMTP id a640c23a62f3a-abc0de13a1emr2471884566b.45.1740581445661; Wed, 26 Feb 2025 06:50:45 -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 a640c23a62f3a-abed1cd564esm337731666b.21.2025.02.26.06.50.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:50:45 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Wed, 26 Feb 2025 15:50:26 +0100 Subject: [PATCH v5 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: <20250226-update-release-v5-1-481914e40c36@kernel.org> References: <20250226-update-release-v5-0-481914e40c36@kernel.org> In-Reply-To: <20250226-update-release-v5-0-481914e40c36@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=2042; i=aalbersh@kernel.org; h=from:subject:message-id; bh=r8NE2PVa/ZrAaOBQWgPWkabf8eqQcrLO6lplelO8GLk=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIY0vdrOavWvutMWTPjws9p36W98p9fey3lM1fzzAbZY 7naOokOjmwdpSwMYlwMsmKKLOuktaYmFUnlHzGokYeZw8oEMoSBi1MAJuK7nuEXE5PkDg+Rq9w3 v79tUOf92Xfsg1PgljJLrs8B5Rn2duLLGBk2bw33iFu2RGpDZPljbcG5l1Ufz/Q42/zrZn3uKqV c7RoOAPStRgs= X-Developer-Key: i=aalbersh@kernel.org; a=openpgp; fpr=AE1B2A9562721A6FC4307C1F46A7EA18AC33E108 Reviewed-by: Darrick J. Wong Signed-off-by: Andrey Albershteyn --- release.sh | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/release.sh b/release.sh index 577257a354d442e1cc0a2b9381b11ffbe2f64a71..ea08ab334954e5b8aa40278a40cf7aceec2488cc 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,42 @@ 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" +if [ $? -ne 0 ]; then + echo "Can not verify signature of tarball" + exit 1 +fi + +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 Wed Feb 26 14:50: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: 13992616 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 464EC222577 for ; Wed, 26 Feb 2025 14:50:53 +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=1740581454; cv=none; b=Ebk8JRaM1+rXrVrjX2q6+5HD3H5UkdFX05jORMVumXcurNgGQcY/VYZoQ9Fc+6Iu067qFOzMn8SUfr1yoCGBvTAPayeR2mYj2deAU9AWcAP4VmCueaM0dg4NBv9/vk05+7sE7U0xKLPG3vASxh5GLWSycMyo7yo9GOJVFarKODk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740581454; c=relaxed/simple; bh=MJ2Tul8N2/Gt2ODedDqE5IKqlFtdcKI9WnGeZyve120=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aJiITP6NLGY2/+y0furPZENBtByuK3WM47qGt/UgbID2fqz6/Yam1xjjdQFdizm8yr3eQtIGAJFKdMqw3R12WWEvIXM9AqOwLhYpJgC+nynH9wNiK/Qackp6Sr5o6hFt6yD2Il45bCa7c1OEZqpAG3VwWxFZQyZCKVX+lxJO23o= 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=XmkpD/X5; 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="XmkpD/X5" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740581452; 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=rya/hX8b8xYRoVXX2cpJVN5QpYydeDi0E+n4A3XI0zA=; b=XmkpD/X5GpF3Nx1dTyWPNPekJQIUuJG8m6r3JACogOgqpnBCHdmM37eSodiG1FW1P1AWu+ X1HpDrUI9xwg/NMekgqc8zEkZvNiqhjMRKGRqErSWlPYB6CCbrhzZSnkSuy94az6BFC4Iw LmHsx9DqanWw8gxVPRNVucDtM9zpckM= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-204-jdemVXSRM0O95slC9kFTog-1; Wed, 26 Feb 2025 09:50:51 -0500 X-MC-Unique: jdemVXSRM0O95slC9kFTog-1 X-Mimecast-MFC-AGG-ID: jdemVXSRM0O95slC9kFTog_1740581450 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-abef9384a3bso48328166b.3 for ; Wed, 26 Feb 2025 06:50:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740581449; x=1741186249; 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=rya/hX8b8xYRoVXX2cpJVN5QpYydeDi0E+n4A3XI0zA=; b=uisAlEqsOfOjh2wcYfLPg9+am9mBB3+I89cjTIAld2s9OH78N5dzShDLDu/WJ9bb/C AVohTdSKlTLajm8utPlF88nIFFWijiyYS2D9lfh65sTvSE0IUHmlXJcm6asIftSYzOEd 20r5vImTzOAWtNwEYey6+0RQ7x5uxgWNdlucraNSGjOvXQehas/GRDNZFz3me5zQ0p+6 4Q+74YL/yGjYrtAsjQeie+GTFg7W/YQrD65zKC8P2DmCMSpwRmQzE4O1WtYYyt3UerIC IuS6yFBk4289WWHVpbOoFeQTljwLedM919QVNWLzbyhhVyEE1RD1KjpAA2OS87jnR5Ad qt2A== X-Gm-Message-State: AOJu0Yz1x6gkIEY7Y0YZ1odnKI22nfMda1iljyV7qvkH2UBcimP5A5uM kwRmp38XYGN3RL+HkZmxGGvZkGHoRqDByEHG5pjqEMPJTauJsuwFsSqFA01xBzaxB58IhiY4KvQ HvW23YuKynVPtwqCVXhWr6P4XoFHoQEHRk4S322BFA1tgOkTXn+q6KTZJShctLrdt X-Gm-Gg: ASbGnctRSVHevkx1lHw8S8RWISDdPHv0gqQyQ9+iu1nF8rQeSFTThhY54qB+Ob5XjGR foQ05/wKaXiO4HacOKdRa3NhXF7m1YHjaZiWNYPpGeNsnbywqu6Dq/xlAI3x4sEcJIYubqsq79T rlCRcISjLSerdYHxX54E2vRI4ocpoGWehlYU/fY6Mp/K72e/+eR/51PyENOf+4dIDs8mzW+Mt2m W3XypD3f+oeeGecBN0ha/1bg4RcZ8/4rDxcPjzUINteBBmQzJZEEKz//NR5GC2bquOVXXGF0tpS GEUs2nMsIbvIm0nzrdhUcxYoCFG/K7mDJRQY7csX8A== X-Received: by 2002:a17:906:31d7:b0:ab7:a274:d3df with SMTP id a640c23a62f3a-abeeed5e9b4mr404002666b.20.1740581448657; Wed, 26 Feb 2025 06:50:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IF3xJj7Q4Gbnz+/VjWlH1syRtj83iH2HrOLTDUuJ1cL0FnolQyqflphJcy1qDndXJmrjHX85A== X-Received: by 2002:a17:906:31d7:b0:ab7:a274:d3df with SMTP id a640c23a62f3a-abeeed5e9b4mr403984966b.20.1740581446705; Wed, 26 Feb 2025 06:50:46 -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 a640c23a62f3a-abed1cd564esm337731666b.21.2025.02.26.06.50.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:50:45 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Wed, 26 Feb 2025 15:50:27 +0100 Subject: [PATCH v5 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: <20250226-update-release-v5-2-481914e40c36@kernel.org> References: <20250226-update-release-v5-0-481914e40c36@kernel.org> In-Reply-To: <20250226-update-release-v5-0-481914e40c36@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=1387; i=aalbersh@kernel.org; h=from:subject:message-id; bh=MJ2Tul8N2/Gt2ODedDqE5IKqlFtdcKI9WnGeZyve120=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIY0vdrOZ/qflcwr2Lm5PK923enXHGcopbof+9FU9YTk cJ1jS6rkn52lLIwiHExyIopsqyT1pqaVCSVf8SgRh5mDisTyBAGLk4BmIjiUoa/Qkv/L6mYIeK/ N8h61uWHB03cgk7c+zpf9vZal2nP5jrtfM/w3/XTtuPMvXULFrHZs3a1crbd8TqyZ5vuOpn74rM TD9gf5QQA0YJMYA== 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 ea08ab334954e5b8aa40278a40cf7aceec2488cc..42bee75bb6fde7056c1770157f253eb5f492036d 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 $0) - prepare xfsprogs release tarball or for-next update" + 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" \ @@ -56,4 +80,11 @@ fi 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 Wed Feb 26 14:50: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: 13992614 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 A2AC52222A5 for ; Wed, 26 Feb 2025 14:50:52 +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=1740581454; cv=none; b=L+kTGQNnod0Dc2GGEDHkD0JgCzB2Bj+I5gyp0trQU9AhvlG6FHbKU/J+K1nbEwsRoZT0NZ0EjGm3kE3IU8x1+6E+U5N6uNfjVZgdy++GyShd30Qd4C3Xt0WxFPvylEFG7t55zS5NVa+HJOOvcnXDIKlo+7RSH3w13EgsR0zQAF0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740581454; c=relaxed/simple; bh=b6VpuGhmjnJeY+MT0xwbMPhoDdQyVcCuT5ElFhmbhFw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Pvh4V1rPd+/8/5BRcelzs1F5FsQCh16iGvKZHfifL98dqgvhVKBbj57XGgIHyN6lxoG1seAjUlMQ6DIXAptKdnrcH+5muDf5l0SwBO3ucolpMfTAgrJ5AD6ImlZVNuHTxagQOjOT317Lq9lA3g8Mi8cSUEY/Jw0am3lpzKfee6g= 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=JJpk20UC; 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="JJpk20UC" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740581451; 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=N4vx4VBQ6GbCq2IqZ3u6bl+vK4FweiYa9dSee+sAslA=; b=JJpk20UCiAjjR++EUB1WwhO1YryyZ7Bw6Iypmm5VfXM9AahcfG6vntXzXj73g8H5kRFs5J LTxL7Za4dAlonaSEJ4QMU8g2AL7k8P18/RPFCxYNwwYVJ9JVOkxp06xuK58GFHZD2KUqeG v+B6wvUyO98NN525c9sWSvKwJthMqz8= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-627-Fb3DE9CZPXSb_2lRX7bcQw-1; Wed, 26 Feb 2025 09:50:49 -0500 X-MC-Unique: Fb3DE9CZPXSb_2lRX7bcQw-1 X-Mimecast-MFC-AGG-ID: Fb3DE9CZPXSb_2lRX7bcQw_1740581448 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-abba4c6d9ddso780128466b.1 for ; Wed, 26 Feb 2025 06:50:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740581448; x=1741186248; 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=N4vx4VBQ6GbCq2IqZ3u6bl+vK4FweiYa9dSee+sAslA=; b=m2MQGT7q/juwbAMw4kjxio5E3dWkybF4QvBFaom3hoBde6/NyGHfHEgWxi/4BTU7Zj UneYGB1Vaorzha2Mqmgr1JHZznY1QyhRJIdDxw7/4T1cfxTxutjygGTdKergC/ZSEQxT DZ9wvvRZsK558snVSLS9Lo6Foa/hs06gyZyDNjjuVDZ2bcHR5q1sYmajEL+xVm4ZGUva jaEtEwuOmbvqWcyd53vi8Pxkozn6To61k5VJipdx7q6kV7IATUcU0bNq+KngQ7JhHJH7 9pA+x2Vys9mXdFG63mjGuh7Z1WjIGN3mReaUP2m8Yp3P+HmufhCWFP4dWEpi2q/LORNN p0bw== X-Gm-Message-State: AOJu0Yyykgv1JWKgs/jFfcc/Hdw6Suni/tXGNWhX2tj1ivFiX9AybyGE ZuTUSFSj4ni+fFCV0yUyN4JkIE69JRnM/fQeNTWccxQkf2U9yMq4Ra7JdBPRl+waclGfuUTsvQ8 KgpC1X43Qc9Zq6IO1eKjlwvvat3wJA3tWUPcU5bQnWISv4JAMWmlY8xrF X-Gm-Gg: ASbGncud67p7q6oS6IWeiQavUmAkiTXmaUVyx14DheJKpchc3l1/puIQg4a3eDM9AzW JHriRsxhcaETQKeYAzfOrkZN1YicgWfiJYjI4rv3MCFGNzYe5Ctaf744JdfNzeoGpiz8pHqPJws UYG76XqoOcmVBiNhQxVBO/kH5AQO64yhvsvSITK91Oxi6UdE5Pb4vFMqqdGBJhZVsWLez1YS53V 8AJPU+Xvy8NS3KTyWr/urtlvGHlgJKGA0EX8ApG+TPiUd7EtwzCBnrxb5NIHPa6IY8lMTC2fSG+ s/cA+VLMCNTOUM+5kyks5dFuLTZnnc1r1aIDoPmSSg== X-Received: by 2002:a17:906:6a22:b0:aba:6204:1c03 with SMTP id a640c23a62f3a-abc0df5d89fmr2521170066b.57.1740581447941; Wed, 26 Feb 2025 06:50:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IG5KQZWIST/nMrryAAjeVIMaR9mEBJFmjzaEn7XACtdinURzx/Yw9Sm6Cv0oDuTDaUeDiAt1Q== X-Received: by 2002:a17:906:6a22:b0:aba:6204:1c03 with SMTP id a640c23a62f3a-abc0df5d89fmr2521166466b.57.1740581447545; Wed, 26 Feb 2025 06:50:47 -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 a640c23a62f3a-abed1cd564esm337731666b.21.2025.02.26.06.50.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:50:47 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Wed, 26 Feb 2025 15:50:28 +0100 Subject: [PATCH v5 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: <20250226-update-release-v5-3-481914e40c36@kernel.org> References: <20250226-update-release-v5-0-481914e40c36@kernel.org> In-Reply-To: <20250226-update-release-v5-0-481914e40c36@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=3871; i=aalbersh@kernel.org; h=from:subject:message-id; bh=b6VpuGhmjnJeY+MT0xwbMPhoDdQyVcCuT5ElFhmbhFw=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIY0vdrOU84aMCe1Ls0OJal8/aB2qCgBXp5JtP5onZsa jEUvfXp/MaOUhYGMS4GWTFFlnXSWlOTiqTyjxjUyMPMYWUCGcLAxSkAExHVZ/gfd9zV/Lf/vo4w Xs76iumKm6x8VwusmWq8bNHuQwuOPeDMZGS4uVMz/rNa4c8THus41nLWfv7amLzeIGtLWtqFwji xGVO5AWcBRgg= 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 42bee75bb6fde7056c1770157f253eb5f492036d..385607f636d965ad98f0f3115e6f34d9e4042592 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 $0) - prepare xfsprogs release tarball or for-next update" 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 @@ -87,4 +126,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 Wed Feb 26 14:50: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: 13992615 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 A9AEF222566 for ; Wed, 26 Feb 2025 14:50:52 +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=1740581454; cv=none; b=YAoUPcgbotkQaDl8/f/TPQu3zRHyghCQAkMHF//gpYZpnagqr4hDqEkkaO/FjjO0r22pH/Mqc4Cxg5n9SARCr+TnWoC3gVcZoOEZpH6/k34u5UODwin3MEVWLOOHbJb8GgqZEeE2DMSp9H0MAEMUSJ/sYy/UxF2jJXhzS89uwKs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740581454; c=relaxed/simple; bh=HU9n5NvoPomLXLF6LgaJXXpRdjxvBbILUZwTjWna110=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VlYLiq85P4DMzCWdXEJxDJ263k/atswOUknqWOdvqNj/7og0hl1xSagfdK0n0FE05i2917pmXUz9N1f6xCnYXtIFnW8bMSTbGv8ml/o/3iutnrv6H/2ddpiPmn+2Deo25xsmVq0NLazYJCX0Heb21AbRgBQZkm5Re02q1L2BUSg= 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=RgRohG9S; 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="RgRohG9S" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740581451; 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=RgRohG9STbpZRL/9lmkyNyLgZ35RAR2zq+IMY8X0Oqev/9YZXEyakTN2dV3j8BJUIkDiVq 03Ijri6D4lQbLd/3VSVPkfofwvXVON7oMg2ug5nfIE8hfgJj54uxgl7U1H/0PD9c2t3OvC jvvAIQr5te4h2+tKli3v8feZWymKYek= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-578-Cf1zXvD2OvGWkDRFuymXqg-1; Wed, 26 Feb 2025 09:50:50 -0500 X-MC-Unique: Cf1zXvD2OvGWkDRFuymXqg-1 X-Mimecast-MFC-AGG-ID: Cf1zXvD2OvGWkDRFuymXqg_1740581449 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4399a5afcb3so63351365e9.3 for ; Wed, 26 Feb 2025 06:50:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740581449; x=1741186249; 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=HccVV6ssBnDowgFAgbrL4I+17iR6KA7tIkCamBIZ6VBLmHZa3emO3lCo9uGB5W9w4U MgL4eA/01d2JgCfrjabqk7aiM/qewXNHySAajlhO4cp2SzJ1oCtLHC5TK3wbLr55HvrZ J+nAZNPvKTAR1B2y0LPgY7CDcvwDqEKIBzCF7lODXYG/+wlRedBvAhzJ2Y/vjD96W+Ie YrRNB0O85uU9wjq9EH33Z5JgYUN3rdDVw8RduOfzDBBvJK0VBe/39SElMveElVATNLGT oa44D+/MvFPe0+gWlTBeaCfjYsxrjOkRai7KGA6HrvH153c/pRAUjiYeRqQAa9tuUT3s cNZw== X-Gm-Message-State: AOJu0YxzZlqnfC8XUUG8079lk2SXhOtHqmMnVOK86lDQ13pDguWRx2Rz L+FokzMjrOsWnODR6wPEkx/RzBTWh+PmHtdDbfhgjI+JTDk2n2axGffjnYLEm1X/zbo1sp5iA4/ VcacodvV/U654BkP+Ay8i7mv1l7x7+Ym8zXyj/grumbD/Wjn1OFc0L6wN X-Gm-Gg: ASbGncuauOO1Wm8F4u+h5SAm1d082Dp/vU51KTX1AfeIKrmVpy1x+/a5GC6l8M8GLgf XP1NhsXftX0v305TgXOWqEOJ30p/MsrfMTvvd86lSS/FZ6T56VdqQ01FSPB/CLs6b0JkFCJVp4t SjOjCS52ymh0zNrci9CrFJ/GCl+YEUA0eycP0IZ2LcOSRGNR7FjN8a7GuiD1OYweeLx4a3mTK1j AOpGz0jOj1xW3HSC3pFKqZQeu2P8yJFO0D5X848P9SwhO4VeI70+LVL+TUEjUHGhjJS4+jtQES8 iV8ZQ7aRkEq/C/+ZZDmKqgfiJGr2XFhtKk3EvrE/7g== X-Received: by 2002:a05:6000:1f8f:b0:38e:48a6:280b with SMTP id ffacd0b85a97d-390cc631ac9mr7594973f8f.34.1740581449019; Wed, 26 Feb 2025 06:50:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IFeFD/DQPsHaVSdJ/tUgQmtYO/WuEoPN1w+SH0YcoiPxMkH/5DSVMqE15RMqgMP+komvViUhw== X-Received: by 2002:a05:6000:1f8f:b0:38e:48a6:280b with SMTP id ffacd0b85a97d-390cc631ac9mr7594936f8f.34.1740581448559; Wed, 26 Feb 2025 06:50:48 -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 a640c23a62f3a-abed1cd564esm337731666b.21.2025.02.26.06.50.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:50:47 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Wed, 26 Feb 2025 15:50:29 +0100 Subject: [PATCH v5 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: <20250226-update-release-v5-4-481914e40c36@kernel.org> References: <20250226-update-release-v5-0-481914e40c36@kernel.org> In-Reply-To: <20250226-update-release-v5-0-481914e40c36@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/JXEGuOHHIyn1ZIY0vdrOX8VjZQ8U8gbETk902NrQWZ0G+Odb9MCOZutQ 5Zyp+mEvu8oZWEQ42KQFVNkWSetNTWpSCr/iEGNPMwcViaQIQxcnAIwkY1iDP+DWWwWXdrvxXNt 7WK95evdKrzMHY0nrOZ8M1vmgu7bj75ODP9sd599qngtPDuC117hvpLUU9e+FyorL1QUyKsFPRP wv8sCAL1eQ7I= 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 Wed Feb 26 14:50: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: 13992618 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 C4DA72222A1 for ; Wed, 26 Feb 2025 14:50:55 +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=1740581457; cv=none; b=kkTWwNHU0F7u5l/fOKs5sqdu5JJVIk8IWP+Ry8aAYwBeVaYEyf14wrT4a5RkArnERt+G6Qfw8RWYjwUNjvppky4R4CWhhfRxjBWfxLMDS0quNVQwb41kWL/6FXKSKIWb/vfnZcI0/yz0B1A1SdxY4aQZFeL+bv/zBj3YjcRGqfg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740581457; c=relaxed/simple; bh=peniH+DoGXFkb53GxKcQx5eQOqXnoRSKLDoia0Z9haM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MMQvmDQNGxdpty8oDIeoB34cFZ8etHMPyeTHjjVWsTsR9bc8572y7noARRnRs8h6pwBa5XPvt0donU3DdCbrgHav6CY03uPhVrxrbNinA4DMBiDbLAQrYxrCvsvcCt5wcdMuf0U7CADH1lHMG9DVTuAYYvO/QXcLDTAm7umMxn8= 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=EOtSSbHg; 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="EOtSSbHg" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740581454; 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=DKpCQd9SYnqagMEVbWdcxpNkMgcZ1ncGzrsX/EvMtTE=; b=EOtSSbHg/ISprvO7y/X5VqKAvrMceIxcvLnF5S5qL14XQP7/aWxInyIa/MxUtPiOoNg2OL q8Wu3dmlRvt6Z7xEz1hYsFGEqWGjweUkf0ozVV+yFIekyt6edWW6DEYOlaWQsKSYVl/xzG QoALFvePIUzrv+XKzqzroXHgt7/3XUw= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-606-oFExS77OO2eTksGtb6X6Fw-1; Wed, 26 Feb 2025 09:50:52 -0500 X-MC-Unique: oFExS77OO2eTksGtb6X6Fw-1 X-Mimecast-MFC-AGG-ID: oFExS77OO2eTksGtb6X6Fw_1740581452 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-5e067bbd3bcso7099510a12.3 for ; Wed, 26 Feb 2025 06:50:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740581451; x=1741186251; 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=DKpCQd9SYnqagMEVbWdcxpNkMgcZ1ncGzrsX/EvMtTE=; b=SIsy2f8MHXXmRIAGYldQ9knAhOmwsiYaMUbHM36GqWorMm6OEfsXtUHUZhZfNudMkh BKEhDYeHt35FPNfFLJ36DH3MI894RtrLt32Jd3/xDyJG6DFuCZaGuDEYj6Q2XNWSmWy/ IeF16IbrjcZ8GlGCdsUzzh0K86WbzP5LOWWtq6y2g2yO39Wcg0ln3zVqRLBcglP14JFR y2AnG8M39+5WJ0Rud4QIJMjt6arkpC+zQRa1sT142/qWJm2P+yQaEmTpz4xuPleYx4Te g1sbbF2ZlCCSpSlZzsgSxSmqZsnpMW7WOhTvrfNhIibdZxTXWo7GCU8dKA/xS6L340oj o6KA== X-Gm-Message-State: AOJu0YzhQGP8hYRwuzET3JWkHgB+FCxeNIOnBjaGQNOx7Q3HkAo0Ehrg dpbohx0bsBI1x7dkZrgjF9UiWOjgmMNiqeG+KGZuhN6AwbmRuGeaTlt38yC9YH1UFPiUm8aNLtA FKNj7pm08o8Nm52B2SezqXij0VLLc/VMjtzdz0qYav5I9jyFV73ApnGzy X-Gm-Gg: ASbGncunEN7802LPeTtJ3MmsIdvK1mcuuFzkTRFV9vfZbY5KulYKXFDS/pR+3gVZLh9 9Eh7D4XIzGmtZCQoj6S5WSuSz8ExjItoPu0m/PFTo6BpXfp9D8e9FBKhmyzHIq5up1olU8+EVL0 +FultIpxEXtlOGgYgq4WJeB5RI229HxSBOoSIPf8KcmXw+M4GCDy4v5hZSLKL8SHibuuLX4UNLi KdwLbhCovlbamCMHC/NRGhI6kBWHEJdNEROBIgkyxkmQgGZoTGHULIwEYqUzCNmS8l8UvBSLo0L tpfs2/yb4cDyRlIqjybWxqR5BrPd4IXdNjO46kYrpw== X-Received: by 2002:a17:906:3081:b0:ab7:fc9a:28e2 with SMTP id a640c23a62f3a-abed1068fafmr747038866b.47.1740581451551; Wed, 26 Feb 2025 06:50:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IG2pTtCfXtsrDPD11Mmq827lwbTroShh8zdKbUE+ErRya7j0cWOEej+b0XdfewXOUMnFLV6IA== X-Received: by 2002:a17:906:3081:b0:ab7:fc9a:28e2 with SMTP id a640c23a62f3a-abed1068fafmr747036166b.47.1740581451136; Wed, 26 Feb 2025 06:50:51 -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 a640c23a62f3a-abed1cd564esm337731666b.21.2025.02.26.06.50.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:50:48 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Wed, 26 Feb 2025 15:50:30 +0100 Subject: [PATCH v5 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: <20250226-update-release-v5-5-481914e40c36@kernel.org> References: <20250226-update-release-v5-0-481914e40c36@kernel.org> In-Reply-To: <20250226-update-release-v5-0-481914e40c36@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=5847; i=aalbersh@kernel.org; h=from:subject:message-id; bh=peniH+DoGXFkb53GxKcQx5eQOqXnoRSKLDoia0Z9haM=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIY0vdrOespCu7RClbzzmhz2nthzbV7Ky6+nJ8gdKnGf pOJLsOXrY4dpSwMYlwMsmKKLOuktaYmFUnlHzGokYeZw8oEMoSBi1MAJnLoH8P/ki6zyv7kZZl+ +rkaBX43PuVHn47se3zub53j/Dv8U76wMzK0Sv6QXmLys7BCQC7503PTrrlehqsyfat6/kpt3xU RksUKAPDrR1o= 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: Darrick J. Wong Reviewed-by: Darrick J. Wong Signed-off-by: Andrey Albershteyn --- 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 Wed Feb 26 14:50: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: 13992619 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 8144C222577 for ; Wed, 26 Feb 2025 14:50:56 +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=1740581458; cv=none; b=upIcr5iFWdUUvYrMN5OleFdwIZo1YPy03I8ugduhamWN9JOI9MmSb+/FR79A0JHpgSIeTORoACK2R2j7ffCGKlShIN+lUydpE5uskD1NA+5YldgJTypF2vUgGDBBOfwLpgAIpnwSufkyBUlmUas75G9qTCBVHRpyWlPuKo06/zo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740581458; c=relaxed/simple; bh=nWXniU+15Xc5fVHjiKp7hiPT8D01Okf4RRSq4ClOuxU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AMYtbuUJvWnh5lparUoeRaJf1mJVvef0IYhQpOTolWrkjWeuICGsUg196d7S7rJzGDH1RXtpqc3t9XDwGO7Tzm8uVkpfkIDMPaoSFCGyRvkSUUZbukrsgiiB6LNZSeSl/d9NXQnMeqYqtj0isuFS233bXkPhog+ZwBmHjxMeC4A= 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=L/8Qjyns; 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="L/8Qjyns" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740581455; 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=TKPtXsMH69xJKPgfxR6xbzqEWHadgfTeIRJ9Po3KV5I=; b=L/8QjynsvOc5lc2T4NxcBHJJhf5OqMwdc61pJtlKEKE9/+EKp5nnehM0eXArI6tyHRb72N e9ElJ6SHZBaOU6WAkCip4cWJkM4oHs/u4io+AEItpYFEH3nr+lpv+o8OPA3zeXI/bqkZhx jrou7KEHWUbSNUW5dqVUpiibNSa+18Q= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-657-4VWlAgBIMgCgKNAyGNfQ2w-1; Wed, 26 Feb 2025 09:50:54 -0500 X-MC-Unique: 4VWlAgBIMgCgKNAyGNfQ2w-1 X-Mimecast-MFC-AGG-ID: 4VWlAgBIMgCgKNAyGNfQ2w_1740581453 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-abb93de227dso656416966b.1 for ; Wed, 26 Feb 2025 06:50:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740581452; x=1741186252; 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=TKPtXsMH69xJKPgfxR6xbzqEWHadgfTeIRJ9Po3KV5I=; b=B+YFkk5YVSmVC1Vs7JfsHdD76HnDj88iS7YObJAH5XkqyX70bTjfQBDcR+oucYN3MW C/1gsU6iNumcr+dHi3O1bmDnLVhYA53AU7pgYFo8i8c/rTEh5zxMMzsbdG2uPmSvXePC d6gA/Fjy9U5+VcOhCCsBhTqYq1QCewVkG9h9DbSlBFnfpjcd05vWNaBIn2k5nuXXYLn3 WMdQlUz4TLfJ9GwRoljXGpnfjYvD0pX0wKQcofW3a1lnWKKCPbRcBM9rHdmZbJEiz2SF IukOWxCdFyg5ZA2FCpfdWsifv3XsU2MAmhoyjsec4sIkb4mGySDU2tReAPr3G4eVoeEy Lwgg== X-Gm-Message-State: AOJu0YyBxrc+DvsE+6fgSHECFCYIV7eb3z3w8W0XJa/OcJCEZ2Ck2a6H JO8rGwe9x40sHpDum3kzX7oE1JSGDG4aeQns2wA5uNVL+wQ+DlbWfVULxU7HKpyTL+13YTs29QZ VTTTB/MUzh/LRRdIrX9nCPOLGb9hy5y+GJH9BsQT+Uh0jgXqBdR+oQgig X-Gm-Gg: ASbGncve5xDblhL679YFjIXA3C0W/gAmeJmrj2/dPnm0oZfOVbelVAjSTYqgbYSRcx4 LCjLTxSSiJADb8XZydv+lbc74Qwje2XDMjaDTprrtGE3fGd9pv+Iy3+uEDUM2IAvyJUpRkGpsSm qzmU2TJfzYoZVFs359AaJOM0Sp7Sd+ksgzlwFajwdayc3yTUUQMQWKE2fUyiLqyceBGZrzPBMQc T9D5B/EaLdbh+1I2ECt8ETG2YbnBaNZbbV23hnAKnsJOyHNS3MKqbhJgeMfiQGe6e+GCttDnFSj 6ma2qsEYcXqft0p8Xpkl2eR14kLqPB+yfLpDVblJ3w== X-Received: by 2002:a17:907:7753:b0:abb:e7ed:d603 with SMTP id a640c23a62f3a-abed0c76db8mr804354266b.9.1740581452586; Wed, 26 Feb 2025 06:50:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IFYBkKPk62N3G7pEZ1dz89MOAvGyorK44fGFWGmJo7gRoGMTd+nn9OdZiytzlWWn9myeqeGzw== X-Received: by 2002:a17:907:7753:b0:abb:e7ed:d603 with SMTP id a640c23a62f3a-abed0c76db8mr804351366b.9.1740581452205; Wed, 26 Feb 2025 06:50:52 -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 a640c23a62f3a-abed1cd564esm337731666b.21.2025.02.26.06.50.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:50:51 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Wed, 26 Feb 2025 15:50:31 +0100 Subject: [PATCH v5 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: <20250226-update-release-v5-6-481914e40c36@kernel.org> References: <20250226-update-release-v5-0-481914e40c36@kernel.org> In-Reply-To: <20250226-update-release-v5-0-481914e40c36@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=1798; i=aalbersh@kernel.org; h=from:subject:message-id; bh=nWXniU+15Xc5fVHjiKp7hiPT8D01Okf4RRSq4ClOuxU=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIY0vdrOR/6aR+QpfczbfcC1U132MOdjkT6p64LmMZbw vo9LnThj4qOUhYGMS4GWTFFlnXSWlOTiqTyjxjUyMPMYWUCGcLAxSkAEzl2k5Fh/9y4l22z+5ld H7n4xkyyCay5YaOqfe7FrpbWLfnycv+PMTKcNPEyc1X5Hv8/88XZx3GXjba+utWt+C7zjX6Y+l5 t9mwuABqeR8s= 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. Reviewed-by: Darrick J. Wong Signed-off-by: Andrey Albershteyn --- 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 Wed Feb 26 14:50: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: 13992620 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 50731223329 for ; Wed, 26 Feb 2025 14:50:56 +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=1740581458; cv=none; b=fit+E1ouP/mXiRWASL6dCU5fpX+J1wZ0wqf5Odd1a5bJKuAxJk1XkNFbcdSJIG3rhWTryFr8kpm8yGY2IGQ613X9Wv31H0bh8PUXeJPMYAqxkawhxEX/pLK2z51QArRTAdYmspoWI18MqQMt83iGWH+i+lkrAdmjaoO6IQw10UI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740581458; c=relaxed/simple; bh=6O0S7TWkHSEtg09ESsQ6vxXaH4L57S+mQLcdc4N9Y0E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=s0/kjNKeiBRYR+EQZJdk+FxFGm09Efhgh2NfPobm13OwtsWXahOyAovK6sxbdikQHt42nzCxDISWhYLQI4QPuAHR7ZPlScdmr9l6wU+jUGvZW1rBgm8yZi+8kpNCyxJ2AACVDb8U9mlrowEQ9YfSDffRYiO0gkMTh3Bkcj+Vifs= 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=Rp0tOoWA; 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="Rp0tOoWA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740581456; 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=gxR62M3Qycv1E9pVPUB0zdr4XAEKWfS7eyOmlP2oXC4=; b=Rp0tOoWAlPn8gG6QAcZN2IQqYr06F2Jn2tTUeNpEIcibgc8/nEBIBOmvRAKgsz33NsGU0S hwAyZ6loM1KsA9KzdfzHZ8E+7VFlFPI6RqeB1zbDPZt7dX7FPcbuZlUpo4JzgqQ6ia99Hu 9v69UyDo2WRQEFh7X7dq8KvAznqlHTc= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-608-Kr9edyIiOK-WHairzSVyvQ-1; Wed, 26 Feb 2025 09:50:54 -0500 X-MC-Unique: Kr9edyIiOK-WHairzSVyvQ-1 X-Mimecast-MFC-AGG-ID: Kr9edyIiOK-WHairzSVyvQ_1740581454 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-abbba16956bso987315266b.2 for ; Wed, 26 Feb 2025 06:50:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740581453; x=1741186253; 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=gxR62M3Qycv1E9pVPUB0zdr4XAEKWfS7eyOmlP2oXC4=; b=Mhijcmh1TfPfYySgj2j505WzNqStGgjN5vH7RfiIM6iBH96dL3L8iMR1wUq3vuZlwK 6bPU5pJsonzw9ueJ/NfuTFVufUuagr5b9AbZb6wtrEaqcdv53Kx1wLL6A0UuAfTGNND/ +HwYfvy5Wvasrx7X+3NTiDFMZBpJrIR7iqBBTV3iA4KbjxRI8FiHECo3UtgUGLHMt7eZ WajKQJlOBq6pry3PtiVlP3a+4SAklp5xKHmD7oEZqyduR+346rKYhSXD3KPfm1N7XNXM J07LQnv3waaov/FzBDeJMjwj5xN18x0/5KRbZD5inGzzAHkdBvXBnosFoXaTV5oh4wVu 0LFA== X-Gm-Message-State: AOJu0Yx1NroSvAtWdegNdxPvbtuT16Xc9srgQvftE8SQmx6c4kVsMC0Z +3OogkEqmFuT67DATz5Id3mW2qS78V3Sd9tdvhO1zhGsD16PldS7DUHcxADNzj3VZkQXilE3WV0 IQBEbobDQVS1iLAcMQsgo/CRHll8e65Vr9XhgDIlgEiGk51lHMlULRvXH X-Gm-Gg: ASbGncvB/aQpbp/mffFiGolXMWWW4fZLCd2w6vso0HNnceqG8N+/C4d/mWMKLdJlSNG AoIBWJhSMtOVHKoUNPoIMBcZFF4joRqSOKcXKHLfxbU1ZLDlz5cmwlIn3IPkhN3VPyPYrYuu79l hksXIDjf7Y53liOStscXfj4dFfwDKOxg+IiqLHsKK1IIwSEhgUa7uT7mRFk1k+eXozrB9TjooyL IqLPEeYkGilDrrn5JPxBielYHVF8Hq8QOC8LQ09LLCmMMAAgMnNu0Z7Su7ZLMTGa0p4YwioDK8t iD+kEm+YdEG5JGV1tPJxci9qaODHk20pyqW1xo535Q== X-Received: by 2002:a17:907:7f90:b0:ab7:bc17:b3a4 with SMTP id a640c23a62f3a-abed0e098a3mr1080763966b.34.1740581453542; Wed, 26 Feb 2025 06:50:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IGKJy8zmUFXlBn83Yjn1DIxH0zDl6L7+jDSw/6TW2uA+uck0JNKLyBk0NU0k+wQIhC8ojUt2g== X-Received: by 2002:a17:907:7f90:b0:ab7:bc17:b3a4 with SMTP id a640c23a62f3a-abed0e098a3mr1080759566b.34.1740581453089; Wed, 26 Feb 2025 06:50:53 -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 a640c23a62f3a-abed1cd564esm337731666b.21.2025.02.26.06.50.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:50:52 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Wed, 26 Feb 2025 15:50:32 +0100 Subject: [PATCH v5 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: <20250226-update-release-v5-7-481914e40c36@kernel.org> References: <20250226-update-release-v5-0-481914e40c36@kernel.org> In-Reply-To: <20250226-update-release-v5-0-481914e40c36@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=2633; i=aalbersh@kernel.org; h=from:subject:message-id; bh=6O0S7TWkHSEtg09ESsQ6vxXaH4L57S+mQLcdc4N9Y0E=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIY0vdrOWeZhiocWazDfNSguqrk7XmHfqdVh76JVXxy2 cZhJ8ClxtFRysIgxsUgK6bIsk5aa2pSkVT+EYMaeZg5rEwgQxi4OAVgIrt7GBn27T9iF2P/Xnun A29Pe4WW/tOUVB7H/9nyc/46vnkS2vORkeGyhOSSVNOeCmvnKSZT/1xbrjJ/Udh/u9ffLl5eq7i laj4vAK/JRdw= 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 385607f636d965ad98f0f3115e6f34d9e4042592..1c0c767863d6fe6572315ba26b58f66f8668a93c 100755 --- a/release.sh +++ b/release.sh @@ -13,11 +13,13 @@ set -e KUP=0 COMMIT=1 +LAST_HEAD="" help() { echo "$(basename $0) - prepare xfsprogs release tarball or for-next update" 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 --separator ', ') +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 @@ -126,6 +174,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 Wed Feb 26 14:50:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Albershteyn X-Patchwork-Id: 13992621 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 0109A2222A1 for ; Wed, 26 Feb 2025 14:50:57 +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=1740581459; cv=none; b=R+gyLy7vD6gDbxaBpp1Wy5cFxFjazjuR/OT8K0dVJOsPDaldbmH2wAp/HPJuyH68f/Prb2sKPRcr5Nx352GkUj+KiiJm62ByQRMVbRld8LjWzGsjpAQQ3qdKZWQDUNDywKyEhWrhLobrw1u4ZHKqiDP1bX2idLbhYGJKRAucbBo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740581459; c=relaxed/simple; bh=tcBXIs0YL5aKKCC18HjtEyX22AtuwMFsrtdVirpJIAI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pQLjeCEXx0Xw2HWFapU6Hju00ciUY6PyXaqdHzr8v2O7Ax1OkVZOdsAcS/5zsyqCoHlgoBw7LTWNuvbikMH4C8Um5vXJArG+T6CMK3Bdhhj3T73Pges0YluHX5vB0ars1FuouAXDH9TAjdA2vUQLMZPb1oYkGxZL4O0sjgT9b1Q= 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=ftgvar9C; 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="ftgvar9C" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740581457; 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=VPCMimwk8BJggPriOZYINqGW555s3k20gz7o97Ni02E=; b=ftgvar9C0Ja+btq5wYC8514SZByg4+YXCFwtOsCWH7HDYYFmmAMIlsLFowRMxInFCi7aAI iDVbidAWpW/3WBJ8bVw4yxG3eWVQ+UkW4zYmpxrcgLQpFjIl62ulCdA+uL7GHiVWm5wLtM Ziocia2dBWXoBmNIaIPuC92Q/syMRYI= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-303-Ns2ItG7wMLCeLV28dOfcyw-1; Wed, 26 Feb 2025 09:50:55 -0500 X-MC-Unique: Ns2ItG7wMLCeLV28dOfcyw-1 X-Mimecast-MFC-AGG-ID: Ns2ItG7wMLCeLV28dOfcyw_1740581455 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-abba896add9so667693166b.1 for ; Wed, 26 Feb 2025 06:50:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740581454; x=1741186254; 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=VPCMimwk8BJggPriOZYINqGW555s3k20gz7o97Ni02E=; b=vYfYGaF9uEXwOZIjVMKCioGs98ajsACPcZtNZLUYig4IHV0OujppaRrPH8kn5tDMiN /+/pwyukaUArDYytEpCqfLE21N92M1VUt9QeqpAYnymjj5cc8Nwr0pm7i0d2RP0qUoCa Kf9eryEn30hKuuym0rrAVjP4kxKGKPVXTV+Hi3Tt5BamTCnGZl+NUS1txYQ9+R28Devp w4KNc/MeHRntopi18IBJ28ZrYrXuIyAJnN0cXdAawshYYa6EKkXSE8Qs1eLIdhQO9z7Q IJtoVFKHK3j39RjiaJ+wHar9+mxtBZExH6aJcc5whD3dPS7w5L5RTssby5NhtVV3KAa9 ZNmA== X-Gm-Message-State: AOJu0YwoPzE3NWcx9bADnpei1zHJNszTIHan0s7Y4A5lC4UwaB5LLIM2 dvi0pdBcMAhwZZNykpMl+2SRw2KNc/NOh2PGVAeQROYfjD1qUUwNCsZOxOBxY5YcDZOQ8S8qyJ+ x+bLpDhuk8+REMb2XtenJkAMJVotwlTcAQ/LK4jNA+0y2pLscrJzPwewTCINTvFNR X-Gm-Gg: ASbGnctmFvyW6jb/BQavf1d3JmZTWvfn+d3ziFrz6dj4t3FrZHXxSTXbd8isBUVNM+s KxShDYCpgCEG7YnIix6mOiIWJSEMnB3T2oxs6r/o4WmGG6DvhAaSvi0LivMrp/yBJd6guD9s5KT 5oBnecgcBsb5h9kWd2n7pLxMSbqKfpyyRpvyazFrFGsVs878y5Usipk45qMGrwG5w/dVijC05PS 09GNr/etenpJhvEoPk3E0X44UDMK1QOItBU/mUcpjJkKXUJOBFRJ2c2QxqiGOAw09voOXnqNYKb V3SUKqCanX0du0OFsLcvsHfIEL+2UwCHn0VT/PPHlw== X-Received: by 2002:a17:906:80e:b0:abc:c34:4134 with SMTP id a640c23a62f3a-abc0c344449mr1842448966b.18.1740581454116; Wed, 26 Feb 2025 06:50:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IGJVNJC7BRPjjRdNaLZa8fRTNmOoQg3O6NpqwAn7UB8GSGoZLr4NqAjH4VpXLqJvxQbg/4pgA== X-Received: by 2002:a17:906:80e:b0:abc:c34:4134 with SMTP id a640c23a62f3a-abc0c344449mr1842446566b.18.1740581453742; Wed, 26 Feb 2025 06:50:53 -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 a640c23a62f3a-abed1cd564esm337731666b.21.2025.02.26.06.50.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:50:53 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Wed, 26 Feb 2025 15:50:33 +0100 Subject: [PATCH v5 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: <20250226-update-release-v5-8-481914e40c36@kernel.org> References: <20250226-update-release-v5-0-481914e40c36@kernel.org> In-Reply-To: <20250226-update-release-v5-0-481914e40c36@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=1520; i=aalbersh@kernel.org; h=from:subject:message-id; bh=tcBXIs0YL5aKKCC18HjtEyX22AtuwMFsrtdVirpJIAI=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIY0vdrOZ+qEnycxVGgoB87ie3htr+JN7jKkh/PfxR4Q itlZfdup6MdpSwMYlwMsmKKLOuktaYmFUnlHzGokYeZw8oEMoSBi1MAJvIyi+G/X1l7mZvtJe0j 7c8S52z+kSfto6P+8mRKs8imZfaPFTrnMvz3vB+37EfSc9b+3/1zIqb+DxdsrZaZVmUveOvNzwv 2S+XZAIiwShU= 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 1c0c767863d6fe6572315ba26b58f66f8668a93c..32084fb9fd904cf308135f842a20a5f9e8a99615 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 $0) - prepare xfsprogs release tarball or for-next update" 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 Wed Feb 26 14:50:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Albershteyn X-Patchwork-Id: 13992622 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 705B7223329 for ; Wed, 26 Feb 2025 14:50:59 +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=1740581460; cv=none; b=eO/MQ78aOSWJC4ZoJAKlvvQP7q4zenj8LZoZkAswVeMWMoWMkPeBFM0Mw0N8UfBzgaQHGr96qDUM8Xh/13dc76gxX7gVMqbJrr9/lJryjjoxy6utsXK/9f8AR5ty4VZK7ohZibDqoCcoGI33+rl83VUKd4coUGci3oQMHMm6fEM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740581460; c=relaxed/simple; bh=nWvjm6cpb14hU+FqgOnmVG258uMgBHPs+yDKlXhkLeg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KRfN6EuHOJQdmJMcxnUazcRWo/4fE1GfVfFWdLql1ZgIgtVB/oQhwJiqXrnHG9/v8Hxcq7EdRqekgEy59ZaFB8zOOX/7zR8cHTIgFfvqC9sWoJwgjQsMIA35IQqGyYM9xP0KCzX67u10lVYl1E27cTOnQofyyJRnpCJ+XQzwhZc= 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=gw4cItNK; 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="gw4cItNK" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740581458; 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=NwiAJGUBqoHtqbtyksEnkOa3/uNAyh+3E+UmCkjj06Q=; b=gw4cItNKbvHvpviTES0g9IxTJVOOLWaT8qumQxogTxxFqulcISZ5zYJ+pT75CsYsEMjwYE dWT8uu3/g5X95OXYIIBHLB/DELZXGDh68i5DFw/ibXaPowrHChQMAQ+x9cEpgsOn4xF2YE w3S+4kSYuoE1LOSFUwd1xlVhBZTILVg= 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-389-Vyhtyl7RPpqryIdkEF8eow-1; Wed, 26 Feb 2025 09:50:56 -0500 X-MC-Unique: Vyhtyl7RPpqryIdkEF8eow-1 X-Mimecast-MFC-AGG-ID: Vyhtyl7RPpqryIdkEF8eow_1740581456 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-38f27bddeeeso7211084f8f.3 for ; Wed, 26 Feb 2025 06:50:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740581456; x=1741186256; 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=NwiAJGUBqoHtqbtyksEnkOa3/uNAyh+3E+UmCkjj06Q=; b=OvkzcQ+4yRZzyK3Z5Qki+anORHm3yS8B/g5/jpLfQmFuDRMf4CaBy8ntmkMOF8s59s REF9ZK6nj2l2+ScXzYnwodP31psVkxwvhjGwGois8XXLywQiO8gLcVRa3Al14iVrt8vT zE/kjzXKJqfdS3rtncAB5mwnXCjVnjxBqOUDWfUMasVSrQEW16x6bzlemmJkaq4UJbfk 2Fo5aoxg9hd9eehJCe2VEBKIrwEpCghZqwKBq09SFpCOjze9JIo+svFXqbvThf+ngLtn g0j9tTLMjOhFgyIRPM0+ipuhXpSehRa/r8CeXEdj64bePkHPmeAJfBzRrrXqpbraUcwp xCog== X-Gm-Message-State: AOJu0YwRTpH6sI3xHVfBmcRR+kdtWvrw+IZJrU8p1rlrraCOhD9Iwp00 P1/EBK2jt62Lx+yzKzgSxwR1RULMawiwsJmVpqkkZax6vi3fl3WHQMlyif5f44NYUreagy4iRYu 1GZtH1AKTW25te3J0IujTftNinONGMLZpzlwCVfLjsscVciE183ypnHTa X-Gm-Gg: ASbGncsVL/b2GwCpbtCJV6Ct2LpGutu75ojZsM1Gy+jCopoCcZWdaWxhemDTfkzatXo Zt20e6QrVHd6n4xWtjuYu5tbFVPg2x+/REHqZEC/Ixsj2ayRVzx9KEuG28P6Le+aYsIdom6nz/d vNSZhHfwJklUI6sGvch1hc3BPi+SeOlHouyfKDoVfyPzbJA1zgqVT/BigBA2u3m5+cKYT5EpA8K XA2OzeopVLRZNLU6QDM4iUaBDPgqNp0NuSN0n6AAfhsSoN13xroP5YvBJK3lLduMe2hkJJhlWPR uCphoKHMq69DjXZnVTfyzmUoSRN/KuI9nq1e4Nvm7Q== X-Received: by 2002:a5d:64eb:0:b0:390:d73a:4848 with SMTP id ffacd0b85a97d-390d73a48d9mr2992285f8f.47.1740581455615; Wed, 26 Feb 2025 06:50:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IFG84N7nM9pIVoN9vkgGJon/ykyeoRCNCvu6O3Af2Lx2OMMBXtFbhAJyk4Hje75zIEFiWe+TQ== X-Received: by 2002:a5d:64eb:0:b0:390:d73a:4848 with SMTP id ffacd0b85a97d-390d73a48d9mr2992256f8f.47.1740581455290; Wed, 26 Feb 2025 06:50:55 -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 a640c23a62f3a-abed1cd564esm337731666b.21.2025.02.26.06.50.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:50:54 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Wed, 26 Feb 2025 15:50:34 +0100 Subject: [PATCH v5 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: <20250226-update-release-v5-9-481914e40c36@kernel.org> References: <20250226-update-release-v5-0-481914e40c36@kernel.org> In-Reply-To: <20250226-update-release-v5-0-481914e40c36@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=755; i=aalbersh@kernel.org; h=from:subject:message-id; bh=nWvjm6cpb14hU+FqgOnmVG258uMgBHPs+yDKlXhkLeg=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIY0vdrOasE3i24b99h+uVLDrvxtLV2PLyPg9ZcKD+6S C7Ze59W/peOUhYGMS4GWTFFlnXSWlOTiqTyjxjUyMPMYWUCGcLAxSkAE9EMYWRY6z7/e5+BaUzN xK493vuf5ng+WNZ740ZqfW+y2rZjhiYOjAz/o/Trzh9dL/PecH93+7bdTxKzeIoF1txonfPzbmv RXT0WAOeHSJU= 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. Reviewed-by: Darrick J. Wong Signed-off-by: Andrey Albershteyn --- 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 Wed Feb 26 14:50:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Albershteyn X-Patchwork-Id: 13992623 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 294F42236FF for ; Wed, 26 Feb 2025 14:50:59 +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=1740581461; cv=none; b=iwuG0HyVDlguSs/s58B+nFBORfNUchDud1/hzhd1zJ3TUPjD5Pb0u18aN36xbhz9Y2ud7oQwloU2GjHlTEeI7O8Xqs7bRYfXNk6tlvyvdjmpTHxIOjCfwAZWXEzdms5pFccRvEHQEgZd/yR1xinGXz8uq08lXheUdU3DZHooNaI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740581461; c=relaxed/simple; bh=q9tJlYi77GrKLPykRovUUwGWEwJBZVRr1Q8LS8Gdh9g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=svAMP5nBpDGuPa4iZKkce7UhcXE1rSRqY7ueYbtxtMCDJEAYvpPaLVMNSzAimOy6zAT5/76pVB97iiCzmLc8kDUEBEyzZ/KNzB8lC1lakTr0nqVzodf2qnogC0y9vAkCngVBVkWPBmunrjkjByEEHnOwM1PcPmauGrnfFVlAZCg= 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=HxXK4Ndl; 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="HxXK4Ndl" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740581459; 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=XKRAVc6MlEKZqA0vjtnDJqkLrXz8aO/sEmAAN+dRDIY=; b=HxXK4Ndlu9hHSv7AyKRTwklQ2O8FndQYsZNna4pyXaw7oMtdDW3InBZkH2DMmLwUhEn1Sq mwsq9rENxwqp+tuLfCeaOwk347WIIwuXrA6F2df40jxcO33IrXY6n7nn034i+QWYAU5AOD Yf05SWd7d4xXY/I9j1bTzNqS2FhzTXw= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-100-GDm4jSTHPfiIheRgaSEDwQ-1; Wed, 26 Feb 2025 09:50:57 -0500 X-MC-Unique: GDm4jSTHPfiIheRgaSEDwQ-1 X-Mimecast-MFC-AGG-ID: GDm4jSTHPfiIheRgaSEDwQ_1740581456 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-abafbdf4399so115669166b.0 for ; Wed, 26 Feb 2025 06:50:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740581456; x=1741186256; 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=XKRAVc6MlEKZqA0vjtnDJqkLrXz8aO/sEmAAN+dRDIY=; b=JOYQib6gbiuJRi4HKg5qjFqSnt4sWVEu/IcSA1jty2Pw9fHICgkqkEpqqYxnhXSKSk k6ViYK2DUWpvznfFpPk5ych6hKxdSd+DU07XuTyWRDIfQoTnkXT8DdU1aquViSpOtS/q QCy2+Wlo4Un0OKi+1go1oGjGpfKm+v48Rc+wGGXaQkzGxGtRFt5kxgdnW0QLWepqSeWO Eca2UARA9n0mrX9xQiBuh4ckCrZPfI8ntW7EhY66xK3LrwGoYD7FhHVkxte8wEIXJ50w RG4sLgSkty4P9MIB5UMyhdxIBLJkTMkY2mqJSxSGzK1T1oKJFPK7gWaWl67HhkVYtM9w XRnw== X-Gm-Message-State: AOJu0YxHLgmf4qYVuyLzsB5ZMVj8KhsfAtY2WU9P7V8ptHGPip2SSFcl NTU5DqTb/03buXp78lAMncUhlIth9Qt5ioKylgAKJosE25laXL/e6/d8Gr7lUWSa+PU045BzZ+B 5EaffAc72gYAuci/8+2ruy3Di6Nq/P34N5mhGipWANUBA/txjlw9/acf9ZgHcDjNi X-Gm-Gg: ASbGncsxifRoGfD3G0cs4v+juOhZkYEZMTr7rPw6VGHDFb01KPUX4XD+vhdS+nXRunx wIPQS8e6CP2FZZ0TkvhNKuLBprZNTYVp+2y9D7KxD8ZDJmfW8Fg+KB8Sei4uMmeLC7kfvszlOac wONhM+VanVgKyPb6yCNoS7mg+dutaD0u9M1qta5Vynihqi8g1HbOA/INXT7n116tYQQawcRCp/V s7XGFROshx8lZrmFyD3akUkDcR6LxHkVZN3PqvjRuRWMFHI/tUa4Ucb/qFAWsmQLS8y1biAU5FD qepuVwk+tNdOSK6WhGpPlSWH2pk5eMxRYZP06kka4Q== X-Received: by 2002:a17:907:1c0e:b0:abb:e048:4f5e with SMTP id a640c23a62f3a-abc0b14d715mr2266040166b.29.1740581456214; Wed, 26 Feb 2025 06:50:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IFeN/dKRVrf1EQ99zVDB5yHlA+mrjXjCzSeqsMG+q+BNoIjA/duaXD39LhxvOPswQNYskiSRw== X-Received: by 2002:a17:907:1c0e:b0:abb:e048:4f5e with SMTP id a640c23a62f3a-abc0b14d715mr2266036866b.29.1740581455809; Wed, 26 Feb 2025 06:50:55 -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 a640c23a62f3a-abed1cd564esm337731666b.21.2025.02.26.06.50.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 06:50:55 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Wed, 26 Feb 2025 15:50:35 +0100 Subject: [PATCH v5 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: <20250226-update-release-v5-10-481914e40c36@kernel.org> References: <20250226-update-release-v5-0-481914e40c36@kernel.org> In-Reply-To: <20250226-update-release-v5-0-481914e40c36@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=740; i=aalbersh@kernel.org; h=from:subject:message-id; bh=q9tJlYi77GrKLPykRovUUwGWEwJBZVRr1Q8LS8Gdh9g=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIY0vdruXRpzm9svNQSHXRx56+7jrYpLvEfv8V5ONmmp bI1NnP8+9lRysIgxsUgK6bIsk5aa2pSkVT+EYMaeZg5rEwgQxi4OAVgImvfM/wzqUnfUZx50G9S 9vvNoU37r+/4XWm05W7I5tqJHr4TW9l2MzK0Gz7+Ib+//uUH05Kw60ekugTV+ixcP724GzHR+3D Y0e9cAOe4S3o= X-Developer-Key: i=aalbersh@kernel.org; a=openpgp; fpr=AE1B2A9562721A6FC4307C1F46A7EA18AC33E108 These files are generated from corresponding *.in templates. Reviewed-by: Darrick J. Wong Signed-off-by: Andrey Albershteyn --- .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