Skip to content

Commit

Permalink
scripts: Restore rpm build directory to default directory
Browse files Browse the repository at this point in the history
Signed-off-by: Xiaoguang Xing <[email protected]>
  • Loading branch information
xingxg2022 committed Nov 25, 2024
1 parent 874948f commit e39fa86
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions scripts/envsetup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,6 @@ function build_rv_fedora_kernel()
local KERNELRELEASE
local RPMBUILD_DIR
local err
RV_KERNEL_BUILD_DIR=$RV_TOP_DIR/build/$CHIP/linux-riscv/fedora

pushd $RV_KERNEL_SRC_DIR
make ARCH=riscv CROSS_COMPILE=$RISCV64_LINUX_CROSS_COMPILE $RV_KERNEL_CONFIG
Expand Down Expand Up @@ -836,7 +835,7 @@ EOT
if [[ ${KERNELRELEASE:0:4} == "6.1." ]]; then
RPMBUILD_DIR=$HOME/rpmbuild
else
RPMBUILD_DIR=$RV_TOP_DIR/build/$CHIP/rpmbuild
RPMBUILD_DIR=$RV_KERNEL_SRC_DIR/rpmbuild
fi

make -j$(nproc) ARCH=riscv CROSS_COMPILE=$RISCV64_LINUX_CROSS_COMPILE LOCALVERSION="" rpm-pkg
Expand Down Expand Up @@ -869,7 +868,6 @@ EOT

function clean_rv_fedora_kernel()
{
RV_KERNEL_BUILD_DIR=$RV_TOP_DIR/build/$CHIP/linux-riscv/fedora
pushd $RV_KERNEL_SRC_DIR
make distclean
popd
Expand All @@ -882,7 +880,6 @@ function build_rv_euler_kernel()
local KERNELRELEASE
local RPMBUILD_DIR
local err
RV_KERNEL_BUILD_DIR=$RV_TOP_DIR/build/$CHIP/linux-riscv/euler

pushd $RV_KERNEL_SRC_DIR
make ARCH=riscv CROSS_COMPILE=$RISCV64_LINUX_CROSS_COMPILE $RV_KERNEL_CONFIG
Expand Down Expand Up @@ -910,7 +907,7 @@ EOT
if [[ ${KERNELRELEASE:0:4} == "6.1." ]]; then
RPMBUILD_DIR=$HOME/rpmbuild
else
RPMBUILD_DIR=$RV_TOP_DIR/build/$CHIP/rpmbuild
RPMBUILD_DIR=$RV_KERNEL_SRC_DIR/rpmbuild
fi

make -j$(nproc) ARCH=riscv CROSS_COMPILE=$RISCV64_LINUX_CROSS_COMPILE LOCALVERSION="" rpm-pkg
Expand Down Expand Up @@ -943,7 +940,6 @@ EOT

function clean_rv_euler_kernel()
{
RV_KERNEL_BUILD_DIR=$RV_TOP_DIR/build/$CHIP/linux-riscv/euler
pushd $RV_KERNEL_SRC_DIR
make distclean
popd
Expand Down

0 comments on commit e39fa86

Please sign in to comment.