* https://github.com/SELinuxProject/selinux/pull/271
@ 2020-11-27 8:52 Petr Lautrbach
2020-11-27 8:52 ` [PATCH 1/3] Introduce VERSION file for selinux Petr Lautrbach
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Petr Lautrbach @ 2020-11-27 8:52 UTC (permalink / raw
To: selinux; +Cc: Hu Keping
Resending patches for review from https://github.com/SELinuxProject/selinux/pull/271
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/3] Introduce VERSION file for selinux
2020-11-27 8:52 https://github.com/SELinuxProject/selinux/pull/271 Petr Lautrbach
@ 2020-11-27 8:52 ` Petr Lautrbach
2020-11-27 8:52 ` [PATCH 2/3] Use X.Y instead of date for release tag Petr Lautrbach
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Petr Lautrbach @ 2020-11-27 8:52 UTC (permalink / raw
To: selinux; +Cc: Hu Keping
From: Hu Keping <hukeping@huawei.com>
Init it to 3.1 as the same with the other 14 VERSION files
in this project.
Signed-off-by: Hu Keping <hukeping@huawei.com>
---
VERSION | 1 +
1 file changed, 1 insertion(+)
create mode 100644 VERSION
diff --git a/VERSION b/VERSION
new file mode 100644
index 000000000000..8c50098d8aed
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+3.1
--
2.29.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] Use X.Y instead of date for release tag
2020-11-27 8:52 https://github.com/SELinuxProject/selinux/pull/271 Petr Lautrbach
2020-11-27 8:52 ` [PATCH 1/3] Introduce VERSION file for selinux Petr Lautrbach
@ 2020-11-27 8:52 ` Petr Lautrbach
2020-11-27 8:52 ` [PATCH 3/3] Simplify the tarball generating scripts Petr Lautrbach
2020-11-27 9:36 ` https://github.com/SELinuxProject/selinux/pull/271 Petr Lautrbach
3 siblings, 0 replies; 6+ messages in thread
From: Petr Lautrbach @ 2020-11-27 8:52 UTC (permalink / raw
To: selinux; +Cc: Hu Keping
From: Hu Keping <hukeping@huawei.com>
As per discussed at github issue[1] and mailing list[2], we consider
a version format of X.Y starting at 3.2.
[1]: https://github.com/SELinuxProject/selinux/issues/270
[2]: https://lore.kernel.org/selinux/87d004wan2.fsf@redhat.com/T/#u
Signed-off-by: Hu Keping <hukeping@huawei.com>
---
scripts/release | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/release b/scripts/release
index 0781374954e4..040aaf68e86a 100755
--- a/scripts/release
+++ b/scripts/release
@@ -7,7 +7,7 @@ if [ \! -d $WIKIDIR ]; then
git clone git@github.com:SELinuxProject/selinux.wiki.git $WIKIDIR
fi
-RELEASE_TAG=$(date '+%Y%m%d')
+RELEASE_TAG=`cat VERSION`
DEST=releases/$RELEASE_TAG
DIRS="libsepol libselinux libsemanage checkpolicy secilc policycoreutils mcstrans restorecond semodule-utils"
DIRS_NEED_PREFIX="dbus gui python sandbox"
@@ -43,7 +43,7 @@ echo "Add the following to the $WIKIDIR/Releases.md wiki page:"
echo ""
-echo "## Release $(date '+%Y-%m-%d')"
+echo "## Release $RELEASE_TAG"
echo ""
--
2.29.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] Simplify the tarball generating scripts
2020-11-27 8:52 https://github.com/SELinuxProject/selinux/pull/271 Petr Lautrbach
2020-11-27 8:52 ` [PATCH 1/3] Introduce VERSION file for selinux Petr Lautrbach
2020-11-27 8:52 ` [PATCH 2/3] Use X.Y instead of date for release tag Petr Lautrbach
@ 2020-11-27 8:52 ` Petr Lautrbach
2020-11-27 9:36 ` https://github.com/SELinuxProject/selinux/pull/271 Petr Lautrbach
3 siblings, 0 replies; 6+ messages in thread
From: Petr Lautrbach @ 2020-11-27 8:52 UTC (permalink / raw
To: selinux; +Cc: Hu Keping
From: Hu Keping <hukeping@huawei.com>
Since the format of git archive is inferred from the output file,
it's safe to remove the pipe for gzip.
Signed-off-by: Hu Keping <hukeping@huawei.com>
---
scripts/release | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/release b/scripts/release
index 040aaf68e86a..895a0e1ca1a1 100755
--- a/scripts/release
+++ b/scripts/release
@@ -22,7 +22,7 @@ for i in $DIRS; do
VERS=`cat VERSION`
ARCHIVE=$i-$VERS.tar.gz
git tag $i-$VERS > /dev/null 2>&1
- git archive --format=tar --prefix=$i-$VERS/ $i-$VERS | gzip > ../$DEST/$ARCHIVE
+ git archive -o ../$DEST/$ARCHIVE --prefix=$i-$VERS/ $i-$VERS
cd ..
done
@@ -31,7 +31,7 @@ for i in $DIRS_NEED_PREFIX; do
VERS=`cat VERSION`
ARCHIVE=selinux-$i-$VERS.tar.gz
git tag selinux-$i-$VERS > /dev/null 2>&1
- git archive --format=tar --prefix=selinux-$i-$VERS/ selinux-$i-$VERS | gzip > ../$DEST/$ARCHIVE
+ git archive -o ../$DEST/$ARCHIVE --prefix=selinux-$i-$VERS/ selinux-$i-$VERS
cd ..
done
--
2.29.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: https://github.com/SELinuxProject/selinux/pull/271
2020-11-27 8:52 https://github.com/SELinuxProject/selinux/pull/271 Petr Lautrbach
` (2 preceding siblings ...)
2020-11-27 8:52 ` [PATCH 3/3] Simplify the tarball generating scripts Petr Lautrbach
@ 2020-11-27 9:36 ` Petr Lautrbach
2020-12-02 17:34 ` https://github.com/SELinuxProject/selinux/pull/271 Petr Lautrbach
3 siblings, 1 reply; 6+ messages in thread
From: Petr Lautrbach @ 2020-11-27 9:36 UTC (permalink / raw
To: selinux; +Cc: Hu Keping
Petr Lautrbach <plautrba@redhat.com> writes:
> Resending patches for review from https://github.com/SELinuxProject/selinux/pull/271
Acked-by: Petr Lautrbach <plautrba@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: https://github.com/SELinuxProject/selinux/pull/271
2020-11-27 9:36 ` https://github.com/SELinuxProject/selinux/pull/271 Petr Lautrbach
@ 2020-12-02 17:34 ` Petr Lautrbach
0 siblings, 0 replies; 6+ messages in thread
From: Petr Lautrbach @ 2020-12-02 17:34 UTC (permalink / raw
To: selinux; +Cc: Hu Keping
Petr Lautrbach <plautrba@redhat.com> writes:
> Petr Lautrbach <plautrba@redhat.com> writes:
>
>> Resending patches for review from https://github.com/SELinuxProject/selinux/pull/271
>
> Acked-by: Petr Lautrbach <plautrba@redhat.com>
Merged, thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-12-02 17:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-27 8:52 https://github.com/SELinuxProject/selinux/pull/271 Petr Lautrbach
2020-11-27 8:52 ` [PATCH 1/3] Introduce VERSION file for selinux Petr Lautrbach
2020-11-27 8:52 ` [PATCH 2/3] Use X.Y instead of date for release tag Petr Lautrbach
2020-11-27 8:52 ` [PATCH 3/3] Simplify the tarball generating scripts Petr Lautrbach
2020-11-27 9:36 ` https://github.com/SELinuxProject/selinux/pull/271 Petr Lautrbach
2020-12-02 17:34 ` https://github.com/SELinuxProject/selinux/pull/271 Petr Lautrbach
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).