diff --git a/Jenkinsfile b/Jenkinsfile index 1920093..5b29635 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,38 +37,6 @@ node('docker && linux-build') { ''' } - stage('Sources') { - sh '''#!/bin/bash - set -xe - - export HOME=$WORKSPACE - export USER=jenkins - - repo init -u https://github.com/ayufan-rock64/linux-manifests -b default --depth=1 --no-clone-bundle - repo sync -j 20 -c --force-sync - ''' - } - - stage('U-boot') { - sh '''#!/bin/bash - set -xe - export CCACHE_DIR=$WORKSPACE/ccache - for i in $BOARD_TARGETs; do - make u-boot-build BOARD_TARGET=$i - done - ''' - } - - stage('Kernel') { - sh '''#!/bin/bash - set -xe - export CCACHE_DIR=$WORKSPACE/ccache - for i in $BOARD_TARGETs; do - make kernel-build KERNEL_DIR=kernel BOARD_TARGET=$i - done - ''' - } - stage('Images') { sh '''#!/bin/bash set -xe @@ -87,41 +55,6 @@ node('docker && linux-build') { "GITHUB_USER=$GITHUB_USER", "GITHUB_REPO=$GITHUB_REPO" ]) { - stage('Freeze') { - sh '''#!/bin/bash - # use -ve, otherwise we could leak GITHUB_TOKEN... - set -ve - shopt -s nullglob - - export HOME=$WORKSPACE - export USER=jenkins - - repo manifest -r -o manifest.xml - ''' - } - - stage('Tagging') { - sh '''#!/bin/bash - # use -ve, otherwise we could leak GITHUB_TOKEN... - set -ve - repo forall -g tagged -e -c git tag "$GITHUB_USER/$GITHUB_REPO/$VERSION" - ''' - - if (params.GITHUB_UPLOAD) { - retry(2) { - sh '''#!/bin/bash - # use -ve, otherwise we could leak GITHUB_TOKEN... - set -ve - echo "machine github.com login user password $GITHUB_TOKEN" > ~/.netrc - repo forall -g tagged -e -c git push ayufan "$GITHUB_USER/$GITHUB_REPO/$VERSION" -f - rm ~/.netrc - ''' - } - } else { - echo 'Flagged as an no tagging release job' - } - } - stage('Release') { if (params.GITHUB_UPLOAD) { sh '''#!/bin/bash @@ -139,7 +72,7 @@ node('docker && linux-build') { --name "manifest.xml" \ --file "manifest.xml" - for file in *.xz *.deb; do + for file in *.xz; do github-release upload \ --tag "${VERSION}" \ --name "$(basename "$file")" \ diff --git a/recipes/release-contents.md b/recipes/release-contents.md index 6cf42a3..b0e5502 100644 --- a/recipes/release-contents.md +++ b/recipes/release-contents.md @@ -25,7 +25,7 @@ Every build contains the following files available for download: * U-boot flash and erase images (since `0.6.10`) * Source code for all build scripts -Let's focus on the Debian package `linux-rock64-package-0.x.x_all.deb`, whose contents can be [found here](https://github.com/ayufan-rock64/linux-build/tree/master/package/root). +Let's focus on the Debian package `linux-rock64-package-0.x.x_all.deb`, whose contents can be [found here](https://github.com/ayufan-rock64/linux-package). This package is installed on all builds. It's essentially the _"custom"_ stuff added to each base OS. diff --git a/rootfs/make_rootfs.sh b/rootfs/make_rootfs.sh index d5339f7..9546ef2 100755 --- a/rootfs/make_rootfs.sh +++ b/rootfs/make_rootfs.sh @@ -221,7 +221,8 @@ do_chroot apt-get -y install dosfstools curl xz-utils iw rfkill wpasupplicant op nano git build-essential vim jq wget ca-certificates software-properties-common dirmngr \ gdisk parted figlet htop fake-hwclock usbutils sysstat fping iperf3 iozone3 ntp \ network-manager psmisc u-boot-tools ifupdown resolvconf \ - net-tools mtd-utils rsync device-tree-compiler debsums pciutils + net-tools mtd-utils rsync device-tree-compiler debsums pciutils \ + linux-${MODEL} if [[ "$DISTRIB" == "debian" ]]; then do_chroot apt-get -y install firmware-realtek