overhaul

Author: gquintard

.github/workflows/packages.yml

@@ -15,36 +15,24 @@ jobs:
       matrix:
         arch:
           - ""
-          - "-arm"
+#          - "-arm"
         target:
           - debian-bullseye-deb
-          - debian-bookworm-deb
-          - debian-trixie-deb
-          - ubuntu-jammy-deb
-          - ubuntu-noble-deb
-          - ubuntu-plucky-deb
-          - almalinux-8-rpm
+#          - debian-bookworm-deb
+#          - debian-trixie-deb
+#          - ubuntu-jammy-deb
+#          - ubuntu-noble-deb
+#          - ubuntu-plucky-deb
+#          - almalinux-8-rpm
           - almalinux-9-rpm
-          - almalinux-10-rpm
-          - amazonlinux-2023-rpm
+#          - almalinux-10-rpm
+#          - amazonlinux-2023-rpm
     steps:
       - name: Checkout Code
         uses: actions/checkout@v5
-        with:
-          submodules: true
-
-      - name: Download Varnish
-        run: |
-          source pkg.env
-          curl -LO https://varnish-cache.org/downloads/varnish-${varnish_version}.tgz
 
       - name: Build Varnish packages
         run: |
-          ( cd varnish-cache/; tar cvzf ../debian.tar.gz debian --dereference ; )
-          ( cd varnish-cache/; tar cvzf ../redhat.tar.gz redhat --dereference ; )
-
-          mkdir -p packages
-
           if [ -z "${{ matrix.arch }}" ]; then
             PARAM_ARCH=x86_64
           else
@@ -54,15 +42,18 @@ jobs:
           PARAM_RELEASE=`echo ${{ matrix.target }} | cut -d- -f 2`
           EXT=`echo ${{ matrix.target }} | cut -d- -f 3`
 
+          cp pkg.env varnish/
+
           docker run \
             --rm \
             --security-opt seccomp=unconfined \
-            -e PDIR=packages/$PARAM_DIST/$PARAM_RELEASE/$PARAM_ARCH \
-            -v $(pwd):/varnish-cache \
+            --workdir /workdir/varnish \
+            -v$(pwd):/workdir \
+            -e PDIR=/workdir/packages/ \
             $PARAM_DIST:$PARAM_RELEASE \
-            /varnish-cache/build_scripts/make-$EXT-packages.sh
+            /workdir/build_scripts/make-$EXT-packages.sh
 
-          ls packages/*/*/
+          tree packages
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -136,18 +127,16 @@ jobs:
 
           cp pkg.env $PACKAGE/
 
-          PDIR=new_packages/$PARAM_DIST/$PARAM_RELEASE/$PARAM_ARCH
-          mkdir -p $PDIR
-
           docker run \
             --rm \
-            -e PDIR=/$PDIR \
+            -e PDIR=new_packages/ \
             --workdir /workdir/$PACKAGE \
             -v$(pwd):/workdir \
             -v$(pwd)/packages:/deps \
             -v$(pwd)/new_packages:/new_packages \
             $PARAM_DIST:$PARAM_RELEASE \
-            /workdir/build_scripts/make-$EXT-packages-vmod.sh
+            /workdir/build_scripts/make-$EXT-packages.sh
+        
           tree new_packages
 
       - name: Upload artifacts

build_scripts/make-deb-packages-vmod.sh

@@ -2,50 +2,77 @@
 
 set -eux
 
+source /etc/os-release
+source ./pkg.env
+
 export DEBIAN_FRONTEND=noninteractive
 export DEBCONF_NONINTERACTIVE_SEEN=true
-apt-get update
-apt-get install -y dpkg-dev debhelper devscripts equivs pkg-config apt-utils fakeroot
 
-# Ubuntu 20.04 aarch64 fails when using fakeroot-sysv with:
-#    semop(1): encountered an error: Function not implemented
-update-alternatives --set fakeroot /usr/bin/fakeroot-tcp
+PKG_NAME=$(basename $(pwd))
+DEB_ORIG=${VARS[${PKG_NAME}_version]}.orig.tar.gz
+if [ "`uname -m`" = "x86_64" ]; then
+  ARCH="amd64"
+else
+  ARCH="arm64"
+fi
+PDIR="$PDIR/$ID/${VERSION_ID%.*}/${ARCH}"
 
-cd /varnish-cache
-ls -la
+apt-get update
+apt-get install -y \
+	apt-utils \
+	debhelper \
+	devscripts \
+	dpkg-dev \
+	equivs \
+	fakeroot \
+	pkg-config \
+	python*-docutils \
+	$(test -d /deps && find /deps/ -name '*.deb')
+# Create build folder and copy debian folder there
+mkdir -p ./pkgbuild
+cd pkgbuild
 
-echo "Untar debian..."
-tar xavf debian.tar.gz
+# Save the tarball source file one level up 
+curl -L "${VARS[${PKG_NAME}_source]}" -o ../$DEB_ORIG
+tar xvfz ../$DEB_ORIG --strip 1
 
-echo "Untar orig..."
-tar xavf varnish-*.tgz --strip 1
+# remove potential debian/ package included in the tarball
+rm -rf debian
+cp -Lr ../debian .
 
-echo "Update changelog version..."
-if [ -e .is_weekly ]; then
-    WEEKLY='-weekly'
+# Update changelog version
+if [ "$PKG_NAME" == "varnish" ]; then
+	if [ -e .is_weekly ]; then
+		WEEKLY='-weekly'
+	else
+		WEEKLY=
+	fi
+	VERSION=$(./configure --version | awk 'NR == 1 {print $NF}')$WEEKLY-${package_release}
+	./configure --version
 else
-    WEEKLY=
+	VERSION="$(dpkg -l varnish | awk '$2 == "varnish" {print $3}')"
+	dpkg -l varnish
 fi
-source /etc/os-release
-source ./pkg.env
-VERSION=$(./configure --version | awk 'NR == 1 {print $NF}')$WEEKLY-${package_release}~$VERSION_CODENAME
-sed -i -e "s|@VERSION@|$VERSION|"  "debian/changelog"
 
-echo "Install Build-Depends packages..."
+cat << EOF > debian/changelog
+${PKG_NAME} (${VERSION}) unstable; urgency=low
+
+  * Changelog not maintained, please see
+    https://github.com/varnish/all-packager/releases/tag/v${VERSION%~*}
+
+ -- Varnish Software <opensource@varnish-software.com>
+EOF
+
+cat debian/changelog
+# Install Build-Depends packages
 yes | mk-build-deps --install debian/control || true
 
-echo "Build the packages..."
+# Build the packages
 dpkg-buildpackage -us -uc -j16
 
-echo "Prepare the packages for storage..."
-mkdir -p $PDIR
-mv ../*.deb $PDIR
-
-if [ "`uname -m`" = "x86_64" ]; then
-  ARCH="amd64"
-else
-  ARCH="arm64"
-fi
+# Prepare the packages for storage
+mkdir -p "$PDIR"
+mv ../*.deb "$PDIR"
 
 DSC_FILE=$(ls ../*.dsc)
 DSC_FILE_WO_EXT=$(basename ${DSC_FILE%.*})

build_scripts/make-deb-packages.sh

@@ -2,69 +2,61 @@
 
 set -eux
 
+source ./pkg.env
 source /etc/os-release
+PKG_NAME=$(basename $(pwd))
+if [ "`uname -m`" = "x86_64" ]; then
+  ARCH="amd64"
+else
+  ARCH="arm64"
+fi
+PDIR="$PDIR/$ID/${VERSION_ID%.*}/${ARCH}"
+
+cd redhat
+sed -i -e '' *
+dnf -y install 'dnf-command(config-manager)'
 case "$PLATFORM_ID" in
     platform:el8)
-        dnf -y install 'dnf-command(config-manager)'
-        dnf config-manager --set-enabled powertools
-        dnf -y install epel-release
+	EXTRA_REPO=powertools
         ;;
     platform:el*)
-        dnf -y install 'dnf-command(config-manager)'
-        dnf config-manager --set-enabled crb
-        dnf -y install epel-release
+	EXTRA_REPO=crb
         ;;
 esac
-
-dnf -y install rpm-build dnf-utils
-
-export DIST_DIR=build
-
-cd /varnish-cache
-source ./pkg.env
-rm -rf $DIST_DIR
-mkdir $DIST_DIR
-
-
-echo "Untar redhat..."
-tar xavf redhat.tar.gz -C $DIST_DIR
-
-echo "Untar orig..."
-tar xavf varnish-*.tgz -C $DIST_DIR --strip 1
-
-echo "Build Packages..."
-if [ -e .is_weekly ]; then
-    WEEKLY='.weekly'
+dnf config-manager --set-enabled $EXTRA_REPO
+dnf -y install \
+	dnf-utils \
+	epel-release \
+	findutils \
+	rpm-build \
+	$(test -d /deps/ && find /deps/ -name '*.rpm')
+
+# Update changelog version
+if [ "$PKG_NAME" == "varnish" ]; then
+	if [ -e .is_weekly ]; then
+		WEEKLY='.weekly'
+	else
+		WEEKLY=
+	fi
+	curl -L "${VARS[${PKG_NAME}_source]}" | tar xvfz - --strip 1
+	VERSION=$(./configure --version | awk 'NR == 1 {print $NF}')$WEEKLY
 else
-    WEEKLY=
+	VERSION="$(pkg-config --silence-errors --modversion varnishapi)"
 fi
-VERSION=$("$DIST_DIR"/configure --version | awk 'NR == 1 {print $NF}')$WEEKLY
 
-cp -r -L "$DIST_DIR"/redhat/* "$DIST_DIR"/
-tar zcf "$DIST_DIR.tgz" --exclude "$DIST_DIR/redhat" "$DIST_DIR"/
-
-RPMVERSION="$VERSION"
-
-RESULT_DIR="rpms"
-CUR_DIR="$(pwd)"
-
-rpmbuild() {
-    command rpmbuild \
+mkdir -p SOURCES/
+dnf builddep -y *.spec
+rpmbuild -bb \
+	--undefine=_disable_source_fetch \
+	--undefine=debug_package \
+	--undefine=_debugsource_template \
+	--define "_topdir $(pwd)" \
         --define "_smp_mflags -j10" \
-        --define "_sourcedir $CUR_DIR" \
-        --define "_srcrpmdir $CUR_DIR/${RESULT_DIR}" \
-        --define "_rpmdir $CUR_DIR/${RESULT_DIR}" \
-        --define "versiontag ${RPMVERSION}" \
+        --define "versiontag ${VERSION}" \
         --define "releasetag ${package_release}" \
-        --define "srcname $DIST_DIR" \
-        --define "nocheck 1" \
-        "$@"
-}
-
-dnf builddep -y "$DIST_DIR"/redhat/varnish.spec
-rpmbuild -bs "$DIST_DIR"/redhat/varnish.spec
-rpmbuild --rebuild "$RESULT_DIR"/varnish-*.src.rpm
+        --define "srcurl ${VARS[${PKG_NAME}_source]}" \
+        --define "srcversion ${VARS[${PKG_NAME}_version]}" \
+	*.spec
 
-echo "Prepare the packages for storage..."
-mkdir -p $PDIR
-mv rpms/*/*.rpm $PDIR
+# Prepare the packages for storage
+mv RPMS/*/*.rpm $PDIR

build_scripts/make-rpm-packages-vmod.sh

@@ -1,7 +1,8 @@
 package_release=3
-varnish_version=8.0.0
 
 declare -A VARS
+VARS[varnish_version]=8.0.0
+VARS[varnish_source]=https://varnish-cache.org/downloads/varnish-${VARS[varnish_version]}.tgz
 
 VARS[varnish-modules_version]=0.27.0
 VARS[varnish-modules_source]=https://github.com/varnish/varnish-modules/releases/download/${VARS[varnish-modules_version]}/varnish-modules-${VARS[varnish-modules_version]}.tar.gz