Skip to contentSkip to conversation

https://github.com/SELinuxProject/selinux/pull/271

PATCH New Petr Lautrbach 1 participant 6 messages Nov 27, 2020 – Dec 2, 2020 SELinux security module

lore
Share & tools
lore
#1 lore raw

PATCH 1/3 Introduce VERSION file for selinux

From: Hu Keping <[email protected]>

Init it to 3.1 as the same with the other 14 VERSION files in this project.

---
 VERSION | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 VERSION
VERSION new file +1 -0
new file mode 100644
index 000000000000..8c50098d8aed
@@ -0,0 +1 @@
+3.1
Signature · 1 line
2.29.2
#2 lore raw

PATCH 2/3 Use X.Y instead of date for release tag

In reply to Petr Lautrbach

From: Hu Keping <[email protected]>

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/[email protected]/T/#u

---
 scripts/release | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
scripts/release +2 -2
index 0781374954e4..040aaf68e86a 100755
@@ -7,7 +7,7 @@ if [ \! -d $WIKIDIR ]; then
     git clone [email protected]: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 ""
 
Signature · 1 line
2.29.2
#3 lore raw

PATCH 3/3 Simplify the tarball generating scripts

In reply to Petr Lautrbach

From: Hu Keping <[email protected]>

Since the format of git archive is inferred from the output file, it's safe to remove the pipe for gzip.

---
 scripts/release | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
scripts/release +2 -2
index 040aaf68e86a..895a0e1ca1a1 100755
@@ -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
 
Signature · 1 line
2.29.2