vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

build-submodules: Changed relative paths to full-paths on most commands

Browse Source
This commit is contained in:
Runar Borge 2019-01-11 21:48:21 +01:00
parent 988a099f98
commit f672f325bb
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
scripts/build-submodules
View File

@ -64,13 +64,13 @@ error_msg() {
echo -ne " $1\n" echo -ne " $1\n"
} }
ROOTDIR="$(pwd)" ROOTDIR="$(pwd)"
PKGDIR="$(pwd)/packages" PKGDIR="$ROOTDIR/packages"
SCRIPTDIR="$ROOTDIR/scripts"
build_package() { build_package() {
PKG=$1 PKG=$1
status_start "Building package: $PKG" status_start "Building package: $PKG"
if [ ! -d "packages/$PKG/debian" ]; then if [ ! -d "$PKGDIR/$PKG/debian" ]; then
status_skip "No source for: $PKG" status_skip "No source for: $PKG"
return 1 return 1
fi fi
@ -166,14 +166,14 @@ done
# KERNEL # KERNEL
build_kernel() { build_kernel() {
status_start "Building-package: vyos-kernel" status_start "Building-package: vyos-kernel"
if [ ! -f "packages/vyos-kernel/Makefile" ]; then if [ ! -f "$PKGDIR/vyos-kernel/Makefile" ]; then
status_skip "No source for: vyos-kernel" status_skip "No source for: vyos-kernel"
return 0 return 0
fi fi
( set -e; set -x ( set -e; set -x
cd packages/vyos-kernel > /dev/null cd $PKGDIR/vyos-kernel > /dev/null
bash -c '../../scripts/build-kernel' bash -c "$SCRIPTDIR/build-kernel"
) >>$PKGDIR/vyos-kernel.buildlog 2>&1 ) >>$PKGDIR/vyos-kernel.buildlog 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
status_fail status_fail
@ -184,9 +184,9 @@ build_kernel() {
return 1 return 1
fi fi
VERSION=$(grep "^VERSION" Makefile | grep -Eo '[0-9]{1,4}') VERSION=$(grep "^VERSION" $PKGDIR/vyos-kernel/Makefile | grep -Eo '[0-9]{1,4}')
PATCHLEVEL=$(grep "^PATCHLEVEL" Makefile | grep -Eo '[0-9]{1,4}') PATCHLEVEL=$(grep "^PATCHLEVEL" $PKGDIR/vyos-kernel/Makefile | grep -Eo '[0-9]{1,4}')
SUBLEVEL=$(grep "^SUBLEVEL" Makefile | grep -Eo '[0-9]{1,4}') SUBLEVEL=$(grep "^SUBLEVEL" $PKGDIR/vyos-kernel/Makefile | grep -Eo '[0-9]{1,4}')
ARCH=$(dpkg --print-architecture) ARCH=$(dpkg --print-architecture)
echo "$VERSION.$PATCHLEVEL.$SUBLEVEL" > $ROOTDIR/data/kernel_version echo "$VERSION.$PATCHLEVEL.$SUBLEVEL" > $ROOTDIR/data/kernel_version
status_ok status_ok
@ -198,32 +198,32 @@ build_kernel
build_wireguard() { build_wireguard() {
status_start "Building package: vyos-wireguard" status_start "Building package: vyos-wireguard"
if [ ! -d "packages/vyos-wireguard/debian" ]; then if [ ! -d "$PKGDIR/vyos-wireguard/debian" ]; then
status_skip "No source for: vyos-wireguard" status_skip "No source for: vyos-wireguard"
return 0 return 0
fi fi
if [ ! -f "packages/vyos-kernel/Makefile" ]; then if [ ! -f "$PKGDIR/vyos-kernel/Makefile" ]; then
status_fail status_fail
error_msg "No Makefile found in kernel package" error_msg "No Makefile found in kernel package"
return 1 return 1
fi fi
if ! grep -q "KBUILD_OUTPUT" packages/vyos-kernel/Makefile; then if ! grep -q "KBUILD_OUTPUT" $PKGDIR/vyos-kernel/Makefile; then
status_fail status_fail
error_msg "Failed to build package vyos-wireguard, no kernel source found\n" error_msg "Failed to build package vyos-wireguard, no kernel source found\n"
return 1 return 1
fi fi
VERSION=$(grep "^VERSION" packages/vyos-kernel/Makefile | grep -Eo '[0-9]{1,4}') VERSION=$(grep "^VERSION" $PKGDIR/vyos-kernel/Makefile | grep -Eo '[0-9]{1,4}')
PATCHLEVEL=$(grep "^PATCHLEVEL" packages/vyos-kernel/Makefile | grep -Eo '[0-9]{1,4}') PATCHLEVEL=$(grep "^PATCHLEVEL" $PKGDIR/vyos-kernel/Makefile | grep -Eo '[0-9]{1,4}')
SUBLEVEL=$(grep "^SUBLEVEL" packages/vyos-kernel/Makefile | grep -Eo '[0-9]{1,4}') SUBLEVEL=$(grep "^SUBLEVEL" $PKGDIR/vyos-kernel/Makefile | grep -Eo '[0-9]{1,4}')
ARCH=$(dpkg --print-architecture) ARCH=$(dpkg --print-architecture)
# Collect kernel information # Collect kernel information
( set -e; set -x ( set -e; set -x
cd packages/vyos-wireguard cd $PKGDIR/vyos-wireguard
echo "src/wireguard.ko /lib/modules/$VERSION.$PATCHLEVEL.$SUBLEVEL-$ARCH-vyos/extra" | tee debian/wireguard-modules.install echo "src/wireguard.ko /lib/modules/$VERSION.$PATCHLEVEL.$SUBLEVEL-$ARCH-vyos/extra" | tee debian/wireguard-modules.install
bash -c 'KERNELDIR=/vyos/packages/vyos-kernel dpkg-buildpackage -uc -us -tc -b' KERNELDIR=$PKGDIR/vyos-kernel dpkg-buildpackage -uc -us -tc -b
) >>$PKGDIR/vyos-wireguard.buildlog 2>&1 ) >>$PKGDIR/vyos-wireguard.buildlog 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
status_fail status_fail
@ -241,29 +241,29 @@ build_wireguard
# ACCEL-PPP # ACCEL-PPP
build_accel-ppp() { build_accel-ppp() {
status_start "Building package: vyos-accel-ppp" status_start "Building package: vyos-accel-ppp"
if [ ! -d "packages/vyos-accel-ppp/debian" ]; then if [ ! -d "$PKGDIR/vyos-accel-ppp/debian" ]; then
status_skip "No source for: vyos-accel-ppp" status_skip "No source for: vyos-accel-ppp"
return 0 return 0
fi fi
if [ ! -f "packages/vyos-kernel/Makefile" ]; then if [ ! -f "$PKGDIR/vyos-kernel/Makefile" ]; then
status_fail status_fail
error_msg "No Makefile found in kernel package" error_msg "No Makefile found in kernel package"
return 1 return 1
fi fi
if ! grep -q "KBUILD_OUTPUT" packages/vyos-kernel/Makefile; then if ! grep -q "KBUILD_OUTPUT" $PKGDIR/vyos-kernel/Makefile; then
status_fail status_fail
error_msg "Failed to build package vyos-accel-ppp, no kernel source found\n" error_msg "Failed to build package vyos-accel-ppp, no kernel source found\n"
fi fi
# Collect kernel information # Collect kernel information
VERSION=$(grep "^VERSION" packages/vyos-kernel/Makefile | grep -Eo '[0-9]{1,4}') VERSION=$(grep "^VERSION" $PKGDIR/vyos-kernel/Makefile | grep -Eo '[0-9]{1,4}')
PATCHLEVEL=$(grep "^PATCHLEVEL" packages/vyos-kernel/Makefile | grep -Eo '[0-9]{1,4}') PATCHLEVEL=$(grep "^PATCHLEVEL" $PKGDIR/vyos-kernel/Makefile | grep -Eo '[0-9]{1,4}')
SUBLEVEL=$(grep "^SUBLEVEL" packages/vyos-kernel/Makefile | grep -Eo '[0-9]{1,4}') SUBLEVEL=$(grep "^SUBLEVEL" $PKGDIR/vyos-kernel/Makefile | grep -Eo '[0-9]{1,4}')
ARCH=$(dpkg --print-architecture) ARCH=$(dpkg --print-architecture)
( set -e; set -x ( set -e; set -x
pushd packages/vyos-accel-ppp > /dev/null cd $PKGDIR/vyos-accel-ppp
echo "lib/modules/$VERSION.$PATCHLEVEL.$SUBLEVEL-$ARCH-vyos/extra/*.ko" | tee debian/vyos-accel-ppp-ipoe-kmod.install echo "lib/modules/$VERSION.$PATCHLEVEL.$SUBLEVEL-$ARCH-vyos/extra/*.ko" | tee debian/vyos-accel-ppp-ipoe-kmod.install
sed -i "s#[0-9].[0-9][0-9].[0-9]-amd64-vyos#$VERSION.$PATCHLEVEL.$SUBLEVEL-$ARCH-vyos#g" debian/rules sed -i "s#[0-9].[0-9][0-9].[0-9]-amd64-vyos#$VERSION.$PATCHLEVEL.$SUBLEVEL-$ARCH-vyos#g" debian/rules
KERNELDIR=$PKGDIR/vyos-kernel dpkg-buildpackage -uc -us -tc -b KERNELDIR=$PKGDIR/vyos-kernel dpkg-buildpackage -uc -us -tc -b