Skip to contentSkip to conversation

Patchset in preparation for ipvsadm release v1.27

PATCH In review Jesper Dangaard Brouer 4 participants 10 messages Sep 5, 2013 – Sep 6, 2013 IPVS

lore
Share & tools
lore
#0 lore raw

cover Patchset in preparation for ipvsadm release v1.27

Here are some patches in preparation for the upcomming ipvsadm release v1.27. No real coded changes to ipvsadm, just maintainer related updates and changes.

If nobody objects and when Simon ACKs, I'm going to apply this patchset myself to the ipvsadm git tree:

https://git.kernel.org/cgit/utils/kernel/ipvsadm/ipvsadm.git

---

Jesper Dangaard Brouer (3):
Make README more generic and reference new kernel.org location Add MAINTAINERS style file
Maintainer script for releasing tarballs

 MAINTAINERS        |   33 ++++++++++++++
 README             |   26 ++++++++---
 release-tarball.sh |  123 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 174 insertions(+), 8 deletions(-)
 create mode 100644 MAINTAINERS
 create mode 100755 release-tarball.sh
Signature · 5 lines
Best regards,
  Jesper Dangaard Brouer
  MSc.CS, Sr. Network Kernel Developer at Red Hat
  Author of http://www.iptv-analyzer.org
  LinkedIn: http://www.linkedin.com/in/brouer
#1 lore raw

PATCH 1/3 Make README more generic and reference new kernel.org location

The old README were written for Version 1.20 - 18th September 2001. Change this to be more generic for future releases.

Make it clear that SCM/git repository have been moved to kernel.org:
https://git.kernel.org/cgit/utils/kernel/ipvsadm/ipvsadm.git

And release tarball also have moved to kernel.org:
https://kernel.org/pub/linux/utils/kernel/ipvsadm/

---
 README |   26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)
README +17 -7
index 54474e5..2e62008 100644
@@ -1,21 +1,31 @@
 --------------------------------------------------------------------------
 
-ipvsadm - Version 1.20 - 18th September 2001
+ipvsadm
 
 This is free software.  See below for details.
 
-ipvsadm is a utility to administer the IP virtual server services
-offered by the Linux kernel with IP virtual server support.
+ipvsadm is a utility to administer the IP Virtual Server (IPVS)
+services offered by the Linux kernel with IPVS support to create a
+wide range of load-balancer setups.
 
-This version of ipvsadm requires IPVS module v0.9.7 for kernel 2.4 or
-later.  Check out the Linux Virtual Server Project home page on the
+Check out the Linux Virtual Server Project home page on the
 World Wide Web:
 	http://www.LinuxVirtualServer.org/
 	or
 	http://www.Linux-VS.org/
-for the most recent information and original sources about ipvsadm.
+for the most recent information about ipvsadm.
 
-To make, make sure your Linux kernel is already patched with IPVS and 
+Releases can be downloaded from:
+ https://kernel.org/pub/linux/utils/kernel/ipvsadm/
+
+The source code is available via git from kernel.org:
+ https://git.kernel.org/cgit/utils/kernel/ipvsadm/ipvsadm.git
+ git://git.kernel.org/pub/scm/utils/kernel/ipvsadm/ipvsadm.git
+
+A wikipage is available at:
+ http://kb.linuxvirtualserver.org/wiki/Main_Page
+
+To make, make sure your Linux kernel is compiled with IPVS, e.g. by invoking
 "make menuconfig" or "make xconfig" to setup the right compiling options, 
 see the README of the virtual server patch for detail, then simply type
 	make
@@ -35,7 +45,7 @@ in the source directory.
 
 
 Wensong Zhang <[email protected]>
#2 lore raw

PATCH 2/3 Add MAINTAINERS style file

In reply to Jesper Dangaard Brouer

Adding a MAINTAINERS file, to make it more clear who is maintaining the different parts of the IPVS project.

Borrowing the kernel style MAINTAINERS listing.

---
 MAINTAINERS |   33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 MAINTAINERS
MAINTAINERS new file +33 -0
new file mode 100644
index 0000000..bd14d45
@@ -0,0 +1,33 @@
+
+List of maintainers for the different parts of the IPVS project.
+(using kernel style MAINTAINERS listing)
+
+Userspace ipvsadm tool (this tool)
+M:	Jesper Dangaard Brouer <[email protected]>
+M:	Simon Horman <[email protected]>
+T:	git://git.kernel.org/pub/scm/utils/kernel/ipvsadm/ipvsadm.git
+W:	https://kernel.org/pub/linux/utils/kernel/ipvsadm/ (tarballs)
+L:	[email protected]
+L:	[email protected]
+
+Kernel IPVS
+M:	Simon Horman <[email protected]>
+M:	Julian Anastasov <[email protected]>
+M:	Wensong Zhang <[email protected]>
+L:	[email protected]
+L:	[email protected]
+S:	Maintained
+F:	Documentation/networking/ipvs-sysctl.txt
+F:	include/net/ip_vs.h
+F:	include/uapi/linux/ip_vs.h
+F:	net/netfilter/ipvs/
+
+Homepage: http://www.linuxvirtualserver.org/
+M:	Wensong Zhang <[email protected]>
+W:	http://www.linuxvirtualserver.org/
+W:	http://www.Linux-vs.org/
+
+Wikipage: http://kb.linuxvirtualserver.org/
+M:	Wensong Zhang <[email protected]>
+M:	Jesper Dangaard Brouer <[email protected]>
+W:	http://kb.linuxvirtualserver.org/wiki/Main_Page
#3 lore raw

PATCH 3/3 Maintainer script for releasing tarballs

In reply to Jesper Dangaard Brouer

Adding a script (release-tarball.sh) for making a release tarball, where we avoid including files not related to the git repository, by using git archive to a temp dir (mktemp).

You need to create a git tag corrosponding with the version in the file VERSION, before you can make a release. For testing purposes, its possible to give a commit id on the command line via "-c" option.

The script also creates a GPG signed file output of the uncompressed tarball (which is needed by kernel.org upload utility). A specific GPGKEY ID can be specified on the command line via "-g" option.

The release tarballs and GPG signing files are placed in the directory "release/".

---
 release-tarball.sh |  123 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 123 insertions(+)
 create mode 100755 release-tarball.sh
release-tarball.sh new file +123 -0
new file mode 100755
index 0000000..2333fde
@@ -0,0 +1,123 @@
+#!/bin/bash
+#
+# Script for making a release tarball, where we avoid including files
+# not related to the git repository, by using git archive to a temp
+# dir (mktemp).
+#
+# You need to create a git tag corrosponding with the version in the
+# file VERSION, before you can make a release.  For testing purposes,
+# its possible to give a commit id on the command line via "-c" option.
+#
+# The script also creates a GPG signed file output of the uncompressed
+# tarball (which is needed by kernel.org upload utility).  A specific
+# GPGKEY ID can be specified on the command line via "-g" option.
+#
+# The release tarballs and GPG signing files are placed in the
+# directory "release/".
+#
+set -e
+NAME=ipvsadm
+#PREV_VERSION=1.xx # disabled in script
+
+if [ -e VERSION ]; then
+    export VERSION=$(cat VERSION)
+else
+    echo "ERROR - Cannot find version file"
+    exit 1
+fi
+VERSION_TAG="v${VERSION}"
+# Notice VERSION can be overridden by command line arg -c
+
+##  --- Parse command line arguments ---
+while getopts "c:g:" option; do
+    case $option in
+	c)
+	    COMMIT=$OPTARG
+	    echo "[WARNING] using git commit/id ($COMMIT) instead of release tag"
+	    VERSION=$COMMIT
+	    VERSION_TAG=$COMMIT
+	    git show $COMMIT > /dev/null
+	    ;;
+	g)
+	    SPECIFIC_GPGKEY=$OPTARG
+	    echo "[NOTICE] Using GPG signing key: $SPECIFIC_GPGKEY"
+	    gpg --list-key "$SPECIFIC_GPGKEY" > /dev/null
+	    ;;
+	?|*)
+	    echo ""
+	    echo "[ERROR] Unknown parameter \"$OPTARG\""
+	    exit 2
+    esac
+done
+shift $[ OPTIND - 1 ]
+
+if [ -n "$SPECIFIC_GPGKEY" ]; then
+    GPGKEY="-u $SPECIFIC_GPGKEY"
+fi
+
+echo "Creating tarball for release tag: $VERSION_TAG"
+echo "================================="
+
+read -p "Are you sure, you want to create a release tarball (y/n)? " -n 1 -r
+echo ""
+if [[ ! "$REPLY" =~ ^[Yy]$ ]]; then
+    exit 1
+fi
+
+# Create a unique tempdir, to avoid leftovers from older release builds
+TMPDIR=`mktemp -dt $NAME.XXXXXXXXXX`
+trap 'rm -rf $TMPDIR' EXIT
+#echo "TMPDIR:$TMPDIR"
+PKGDIR="$TMPDIR/${NAME}-${VERSION}"
+#echo PKGDIR:$PKGDIR
+RELDIR=release
+if [ ! -d $RELDIR ]; then
+    mkdir -p $RELDIR
+fi
+
+# Compression packer tool
+packer=gzip
+packext=gz
+
+TARBALL="$RELDIR/$NAME-$VERSION.tar";
+#CHANGES="$RELDIR/changes-$NAME-$PREV_VERSION-$VERSION.txt";
+
+#mkdir -p "$TMPDIR"
+#echo " -- Git shortlog v$PREV_VERSION..$VERSION_TAG"
+#git shortlog "v$PREV_VERSION..$VERSION_TAG" > "$CHANGES"
+
+echo " -- Git archiving version tag $VERSION_TAG"
+git archive --prefix="$NAME-$VERSION/" "$VERSION_TAG" | tar -xC "$TMPDIR/"
+
+#pushd "$PKGDIR" > /dev/null && {
+#    echo " -- Generating configure scripts..."
+#    sh autogen.sh
+#    popd > /dev/null
+#}
+
+# Create .spec file
+export RELEASE=1
+if [ -f ipvsadm.spec.in ]; then
+    echo " -- Creating .spec file"
+    sed -e "s/@@VERSION@@/${VERSION}/g" \
+	-e "s/@@RELEASE@@/${RELEASE}/g" \
+	< ipvsadm.spec.in > ${PKGDIR}/ipvsadm.spec
+fi
+
+echo " -- Creating tarball $TARBALL"
+#tar --use=${packer} -C "$TMPDIR" -cf "$TARBALL" "$NAME-$VERSION";
+tar -C "$TMPDIR" -cf "$TARBALL" "$NAME-$VERSION";
+
+#(Disabled checksums are auto created by kernel.org kup scripts)
+#echo " -- Calculating checksums"
+#md5sum "$TARBALL"  > "${TARBALL}.md5sum";
+#sha1sum "$TARBALL" > "${TARBALL}.sha1sum";
+
+echo " -- You need to sign the tarball (uncompressed)"
+gpg  $GPGKEY --armor --detach-sign "$TARBALL";
+
+echo " -- Compress tarball to ${TARBALL}.${packext}"
+${packer} "$TARBALL"
+
+echo "MANUAL: Upload to kernel.org, via command:"
+echo kup put ${TARBALL}.${packext} ${TARBALL}.asc /pub/linux/utils/kernel/ipvsadm/
maintainer
#4 lore raw
In reply to Jesper Dangaard Brouer

Hello,

Quoted 8 lines · Jesper Dangaard Brouer

Here are some patches in preparation for the upcomming ipvsadm release v1.27. No real coded changes to ipvsadm, just maintainer related updates and changes.

If nobody objects and when Simon ACKs, I'm going to apply this patchset myself to the ipvsadm git tree:

https://git.kernel.org/cgit/utils/kernel/ipvsadm/ipvsadm.git

Patchset looks ok to me.

Quoted 8 lines

---

Jesper Dangaard Brouer (3):
Make README more generic and reference new kernel.org location Add MAINTAINERS style file
Maintainer script for releasing tarballs

Quoted 6 lines
 MAINTAINERS        |   33 ++++++++++++++
 README             |   26 ++++++++---
 release-tarball.sh |  123 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 174 insertions(+), 8 deletions(-)
 create mode 100644 MAINTAINERS
 create mode 100755 release-tarball.sh

Regards

--
Julian Anastasov <[email protected]>

maintainer Acked-by
#5 lore raw
Quoted 9 lines · Julian Anastasov

Hello,

Quoted 4 lines · Jesper Dangaard Brouer

Here are some patches in preparation for the upcomming ipvsadm release v1.27. No real coded changes to ipvsadm, just maintainer related updates and changes.

Quoted 6 lines
Quoted 4 lines

If nobody objects and when Simon ACKs, I'm going to apply this patchset myself to the ipvsadm git tree:

https://git.kernel.org/cgit/utils/kernel/ipvsadm/ipvsadm.git

Patchset looks ok to me.

It looks good to me too.

Please feel free to push this if you haven't done so already.

Quoted 21 lines
Quoted 9 lines

---

Jesper Dangaard Brouer (3):
Make README more generic and reference new kernel.org location Add MAINTAINERS style file
Maintainer script for releasing tarballs

Quoted 6 lines
 MAINTAINERS        |   33 ++++++++++++++
 README             |   26 ++++++++---
 release-tarball.sh |  123 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 174 insertions(+), 8 deletions(-)
 create mode 100644 MAINTAINERS
 create mode 100755 release-tarball.sh

Regards

--
Julian Anastasov <[email protected]>

#6 lore raw
Quoted 13 lines · On Fri, 6 Sep 2013 11:20:25 +0900 Simon Horman <[email protected]> wrote:
Quoted 12 lines · Julian Anastasov
Quoted 8 lines · Jesper Dangaard Brouer

Here are some patches in preparation for the upcomming ipvsadm release v1.27. No real coded changes to ipvsadm, just maintainer related updates and changes.

If nobody objects and when Simon ACKs, I'm going to apply this patchset myself to the ipvsadm git tree:

https://git.kernel.org/cgit/utils/kernel/ipvsadm/ipvsadm.git

Quoted 7 lines
Quoted 1 line

Patchset looks ok to me.

It looks good to me too.

Please feel free to push this if you haven't done so already.

Thanks. I just did a push of the patches to ipvsadm.git :-)

Signature · 5 lines
Best regards,
  Jesper Dangaard Brouer
  MSc.CS, Sr. Network Kernel Developer at Red Hat
  Author of http://www.iptv-analyzer.org
  LinkedIn: http://www.linkedin.com/in/brouer
maintainer
#7 lore raw
Quoted 18 lines · Jesper Dangaard Brouer
Quoted 15 lines · On Fri, 6 Sep 2013 11:20:25 +0900 Simon Horman <[email protected]> wrote:
Quoted 13 lines · Julian Anastasov
Quoted 8 lines · Jesper Dangaard Brouer

Here are some patches in preparation for the upcomming ipvsadm release v1.27. No real coded changes to ipvsadm, just maintainer related updates and changes.

If nobody objects and when Simon ACKs, I'm going to apply this patchset myself to the ipvsadm git tree:

https://git.kernel.org/cgit/utils/kernel/ipvsadm/ipvsadm.git

Patchset looks ok to me.

Quoted 7 lines
Quoted 5 lines

It looks good to me too.

Please feel free to push this if you haven't done so already.

Thanks. I just did a push of the patches to ipvsadm.git :-)

Great. Are we waiting on anything to make a release?

#8 lore raw
Quoted 1 line · On Fri, 6 Sep 2013 17:05:45 +0900 Simon Horman <[email protected]> wrote:

Great. Are we waiting on anything to make a release?

Nope. Not really. I can do the release today/now if you like?

Signature · 5 lines
Best regards,
  Jesper Dangaard Brouer
  MSc.CS, Sr. Network Kernel Developer at Red Hat
  Author of http://www.iptv-analyzer.org
  LinkedIn: http://www.linkedin.com/in/brouer
maintainer
#9 lore raw
Quoted 6 lines · Jesper Dangaard Brouer
Quoted 1 line · On Fri, 6 Sep 2013 17:05:45 +0900 Simon Horman <[email protected]> wrote:

Great. Are we waiting on anything to make a release?

Nope. Not really. I can do the release today/now if you like?

I think that is an excellent idea.