diff options
| author | Runar Borge <runar@borge.nu> | 2019-01-16 23:19:30 +0100 |
|---|---|---|
| committer | Runar Borge <runar@borge.nu> | 2019-01-17 09:28:46 +0100 |
| commit | f2358fc9262cfde1f711374b4be28b0532a269aa (patch) | |
| tree | 52fbe94e827f03683c157848114818836c9fa836 | |
| parent | 4b01d95b118b88c12f48284a91ee71fc04d60cb5 (diff) | |
| download | vyos-build-f2358fc9262cfde1f711374b4be28b0532a269aa.tar.gz vyos-build-f2358fc9262cfde1f711374b4be28b0532a269aa.zip | |
Added display of the current commit id on built packages
| -rwxr-xr-x | scripts/build-submodules | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/scripts/build-submodules b/scripts/build-submodules index 9bbc7ed5..960b37ea 100755 --- a/scripts/build-submodules +++ b/scripts/build-submodules @@ -91,10 +91,11 @@ package_in_buildlist() { build_package() { PKG=$1 + COMMITID=$(git log --pretty=format:'%h' -n 1--git-dir $PKGDIR/$PKG) if ! package_in_buildlist $1; then return 0 fi - status_start "Building package: $PKG" + status_start "Building package: $PKG Commit id: $COMMITID" if [ ! -d "$PKGDIR/$PKG/debian" ]; then status_skip "No source for: $PKG" return 1 @@ -115,9 +116,10 @@ echo "Cleaning up buildfiles..." rm -rf $PKGDIR/*.deb rm -rf $PKGDIR/*.changes rm -rf $PKGDIR/*.buildlog +COMMITID=$(git log --pretty=format:'%h' -n 1--git-dir $PKGDIR) echo "-----------------------------------------------------" echo "Starting build process for all packages" -echo "" +echo "vyos-build Commit ID: $COMMITID" initialize_packages() { status_start "Initializing packages" @@ -145,7 +147,6 @@ build_frr() { if ! package_in_buildlist "frr"; then return 0 fi - status_start "Building package: $PKG (Git commit/tag: $FRR_VER)" if [ ! -f "$PKGDIR/$PKG/README.md" ]; then status_skip "No source for: $PKG" @@ -251,10 +252,12 @@ done # KERNEL build_kernel() { + PKG="vyos-kernel" if ! package_in_buildlist "vyos-kernel"; then return 0 fi - status_start "Building-package: vyos-kernel" + COMMITID=$(git log --pretty=format:'%h' -n 1--git-dir $PKGDIR/$PKG) + status_start "Building-package: vyos-kernel Commit ID:$COMMITID" if [ ! -f "$PKGDIR/vyos-kernel/Makefile" ]; then status_skip "No source for: vyos-kernel" return 0 @@ -289,10 +292,12 @@ fi # WIREGUARD build_wireguard() { + PKG="vyos-wireguard" if ! package_in_buildlist "vyos-wireguard"; then return 0 fi - status_start "Building package: vyos-wireguard" + COMMITID=$(git log --pretty=format:'%h' -n 1--git-dir $PKGDIR/$PKG) + status_start "Building package: vyos-wireguard Commit ID:$COMMITID" if [ ! -d "$PKGDIR/vyos-wireguard/debian" ]; then status_skip "No source for: vyos-wireguard" @@ -339,10 +344,12 @@ fi # ACCEL-PPP build_accel-ppp() { + PKG="vyos-accel-ppp" if ! package_in_buildlist "accel-ppp"; then return 0 fi - status_start "Building package: vyos-accel-ppp" + COMMITID=$(git log --pretty=format:'%h' -n 1--git-dir $PKGDIR/$PKG) + status_start "Building package: vyos-accel-ppp Commit ID: $COMMITID" if [ ! -d "$PKGDIR/vyos-accel-ppp/debian" ]; then status_skip "No source for: vyos-accel-ppp" return 0 |