diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/linux-kernel/Jenkinsfile | 2 | ||||
| -rw-r--r-- | packages/pam_tacplus/Jenkinsfile | 30 | ||||
| -rwxr-xr-x | packages/strongswan/build.sh | 5 | ||||
| -rw-r--r-- | packages/strongswan/patches/0004-VyOS-disable-options-enabled-by-Debian-that-are-unus.patch | 10 | ||||
| -rw-r--r-- | packages/vyos-build-container/Jenkinsfile | 69 | ||||
| -rwxr-xr-x | packages/vyos-build-container/build.sh | 24 |
6 files changed, 120 insertions, 20 deletions
diff --git a/packages/linux-kernel/Jenkinsfile b/packages/linux-kernel/Jenkinsfile index b8766611..f5b27e4f 100644 --- a/packages/linux-kernel/Jenkinsfile +++ b/packages/linux-kernel/Jenkinsfile @@ -72,4 +72,4 @@ def pkgList = [ ] // Start package build using library function from https://github.com/vyos/vyos-build -buildPackage('Kernel', pkgList, null, true, "**/packages/linux-kernel/**") +buildPackage('Kernel', pkgList, null, true, "(.*packages/linux-kernel/.+|.*data/defaults.+)", "ec2_amd64", "REGEXP") diff --git a/packages/pam_tacplus/Jenkinsfile b/packages/pam_tacplus/Jenkinsfile index 3ac6909a..33a36d57 100644 --- a/packages/pam_tacplus/Jenkinsfile +++ b/packages/pam_tacplus/Jenkinsfile @@ -19,16 +19,20 @@ // @Library annotation is not an import statement! @Library('vyos-build@sagitta')_ -def pkgList = [ - ['name': 'pam_tacplus-debian', - 'scmCommit': '50c6fd7', - 'scmUrl': 'https://github.com/kravietz/pam_tacplus-debian', - 'buildCmd': '/bin/true'], - ['name': 'pam_tacplus', - 'scmCommit': '4f91b0d', - 'scmUrl': 'https://github.com/kravietz/pam_tacplus', - 'buildCmd': 'cd ..; ./build.sh'], -] - -// Start package build using library function from https://github.com/vyos/vyos-build -buildPackage('pam_tacplus', pkgList, null, true, "**/packages/pam_tacplus/**") +// +// DISABLED: This is wrong version, the vyos-missing/packages/libnss-tacplus already builds the libpam-tacplus anyway. +// +// def pkgList = [ +// ['name': 'pam_tacplus-debian', +// 'scmCommit': '50c6fd7', +// 'scmUrl': 'https://github.com/kravietz/pam_tacplus-debian', +// 'buildCmd': '/bin/true'], +// ['name': 'pam_tacplus', +// 'scmCommit': '7908a7faa0205beda9ea198bdd3aa37868be6da2', +// 'scmUrl': 'https://github.com/kravietz/pam_tacplus', +// 'buildCmd': 'cd ..; ./build.sh'], +// ] +// +// // Start package build using library function from https://github.com/vyos/vyos-build +// buildPackage('pam_tacplus', pkgList, null, true, "**/packages/pam_tacplus/**") +//
\ No newline at end of file diff --git a/packages/strongswan/build.sh b/packages/strongswan/build.sh index c0dab4d5..8afca39e 100755 --- a/packages/strongswan/build.sh +++ b/packages/strongswan/build.sh @@ -53,4 +53,7 @@ echo "I: bump version" dch -v "5.9.11-2+vyos0" "Patchset for DMVPN support" -b echo "I: Build Debian Package" -dpkg-buildpackage -uc -us -tc -b -d +dpkg-buildpackage -uc -us -b -d + +cd src/libcharon/plugins/vici/python +python setup.py --command-packages=stdeb.command bdist_deb diff --git a/packages/strongswan/patches/0004-VyOS-disable-options-enabled-by-Debian-that-are-unus.patch b/packages/strongswan/patches/0004-VyOS-disable-options-enabled-by-Debian-that-are-unus.patch index 57a622e8..d9dd8dd7 100644 --- a/packages/strongswan/patches/0004-VyOS-disable-options-enabled-by-Debian-that-are-unus.patch +++ b/packages/strongswan/patches/0004-VyOS-disable-options-enabled-by-Debian-that-are-unus.patch @@ -81,8 +81,8 @@ index 2fed1f10f..fa0d21a0c 100755 @@ -3,6 +3,15 @@ export DEB_LDFLAGS_MAINT_APPEND=-Wl,-O1 #export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs export DEB_BUILD_MAINT_OPTIONS=hardening=+all - -+CONFIGUREARGS_VYOS := --disable-warnings \ + ++CONFIGUREARGS_VYOS := --disable-warnings --enable-python-eggs \ + --disable-ldap \ + --disable-led \ + --disable-nm \ @@ -96,11 +96,11 @@ index 2fed1f10f..fa0d21a0c 100755 --enable-agent \ @@ -88,7 +97,7 @@ ifeq ($(DEB_HOST_ARCH_OS),kfreebsd) deb_systemdsystemunitdir = $(shell pkg-config --variable=systemdsystemunitdir systemd | sed s,^/,,) - + override_dh_auto_configure: - dh_auto_configure -- $(CONFIGUREARGS) + dh_auto_configure -- $(CONFIGUREARGS) $(CONFIGUREARGS_VYOS) - + override_dh_auto_clean: dh_auto_clean diff --git a/debian/strongswan-nm.install b/debian/strongswan-nm.install @@ -110,6 +110,6 @@ index b0c05d94f..e69de29bb 100644 @@ -1,2 +0,0 @@ -usr/lib/ipsec/charon-nm -usr/share/dbus-1/system.d/nm-strongswan-service.conf --- +-- 2.30.2 diff --git a/packages/vyos-build-container/Jenkinsfile b/packages/vyos-build-container/Jenkinsfile new file mode 100644 index 00000000..31afdbb9 --- /dev/null +++ b/packages/vyos-build-container/Jenkinsfile @@ -0,0 +1,69 @@ +// Copyright (C) 2020-2024 VyOS maintainers and contributors +// +// This program is free software; you can redistribute it and/or modify +// in order to easy exprort images built to 'external' world +// it under the terms of the GNU General Public License version 2 or later as +// published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +@NonCPS + +// Using a version specifier library, use 'sagitta' branch. The underscore (_) +// is not a typo! You need this underscore if the line immediately after the +// @Library annotation is not an import statement! +@Library('vyos-build@sagitta')_ + +pipeline { + agent none + options { + disableConcurrentBuilds() + timeout(time: 240, unit: 'MINUTES') + timestamps() + buildDiscarder(logRotator(numToKeepStr: '10')) + } + stages { + stage('Build') { + agent { + label "ec2_amd64" + } + when { + anyOf { + changeset pattern: "**/docker/*", caseSensitive: true + triggeredBy cause: "UserIdCause" + } + } + steps { + script { + // Checkout git repository which hold 'Jenkinsfile' + checkout scm + + // Display Git commit Id used with the Jenkinsfile on the Job 'Build History' pane + def commitId = sh(returnStdout: true, script: 'git rev-parse --short=11 HEAD').trim() + currentBuild.description = 'Git SHA1: ' + commitId + + // Fetch sources and build docker image + dir(getJenkinsfilePath() + 'vyos-build') { + checkout([$class: 'GitSCM', + doGenerateSubmoduleConfigurations: false, + extensions: [[$class: 'CleanCheckout']], + branches: [[name: env.BRANCH_NAME]], + userRemoteConfigs: [[url: 'https://github.com/dd010101/vyos-build.git']]]) + + sh 'cd ..; ./build.sh' + } + } + } + post { + cleanup { + deleteDir() + } + } + } + } +} diff --git a/packages/vyos-build-container/build.sh b/packages/vyos-build-container/build.sh new file mode 100755 index 00000000..5a526220 --- /dev/null +++ b/packages/vyos-build-container/build.sh @@ -0,0 +1,24 @@ +#!/bin/sh +set -e + +cd vyos-build/docker + +echo "Inspecting current image of ${BRANCH_NAME}..." +previousImageId=$(docker images --filter=reference="vyos/vyos-build:${BRANCH_NAME}" --format "{{.ID}}") + +echo "Building docker build container for branch ${BRANCH_NAME}..." +docker build --no-cache -t "vyos/vyos-build:${BRANCH_NAME}" . + +echo "Pushing ${BRANCH_NAME} image to registry ${CUSTOM_DOCKER_REPO}..." +docker tag "vyos/vyos-build:${BRANCH_NAME}" "${CUSTOM_DOCKER_REPO}/vyos/vyos-build:${BRANCH_NAME}" +docker push "${CUSTOM_DOCKER_REPO}/vyos/vyos-build:$BRANCH_NAME" + +echo "Cleaning previous image of ${BRANCH_NAME}..." +if [ "$previousImageId" != "" ]; then + docker rmi --force "$previousImageId" || true +fi + +echo "Cleaning local registry..." +docker exec registry registry garbage-collect /etc/docker/registry/config.yml --delete-untagged=true + +echo "Image ${BRANCH_NAME} was successfully built and pushed to registry ${CUSTOM_DOCKER_REPO}." |