diff --git a/make-rpm.sh b/make-rpm.sh index b0e4b11..fbd4502 100755 --- a/make-rpm.sh +++ b/make-rpm.sh @@ -4,7 +4,8 @@ GLIBC_DOWNLOAD_URL=https://kojipkgs.fedoraproject.org//packages/glibc/2.38/1.fc3 GLIBC_COMMON_DOWNLOAD_URL=https://kojipkgs.fedoraproject.org//packages/glibc/2.38/1.fc39/x86_64/glibc-common-2.38-1.fc39.x86_64.rpm LIBSTDCxx_DOWNLOAD_URL=https://kojipkgs.fedoraproject.org//packages/gcc/13.2.1/1.fc39/x86_64/libstdc++-13.2.1-1.fc39.x86_64.rpm -ABL_VERSION=7 +ABL_VERSION=8 +ABL_RPM_RELEASE=1 check(){ if [ "$1" != 0 ] @@ -132,7 +133,7 @@ echo "%global _binary_payload w9.gzdio" >> ~/rpmbuild/SPECS/additional-base-lib. # use gzip to compress for compatibility. echo "Name: additional-base-lib" >> ~/rpmbuild/SPECS/additional-base-lib.spec echo "Version: $GLIBC_VERSION.$GLIBC_RELEASE.$ABL_VERSION" >> ~/rpmbuild/SPECS/additional-base-lib.spec -echo "Release: 1" >> ~/rpmbuild/SPECS/additional-base-lib.spec +echo "Release: $ABL_RPM_RELEASE" >> ~/rpmbuild/SPECS/additional-base-lib.spec echo "Summary: A script to run programs with newer libc." >> ~/rpmbuild/SPECS/additional-base-lib.spec echo "License: Mix" >> ~/rpmbuild/SPECS/additional-base-lib.spec echo "URL: https://gitee.com/deepin-community-store/additional-base-lib" >> ~/rpmbuild/SPECS/additional-base-lib.spec @@ -154,8 +155,6 @@ echo "%files" >> ~/rpmbuild/SPECS/additional-base-lib.spec echo "%dir /usr/$SYSTEM_LIBRARY_DIR/additional-base-lib" >> ~/rpmbuild/SPECS/additional-base-lib.spec echo "/usr/$SYSTEM_LIBRARY_DIR/additional-base-lib/*" >> ~/rpmbuild/SPECS/additional-base-lib.spec echo "/usr/bin/ablrun" >> ~/rpmbuild/SPECS/additional-base-lib.spec -echo "/usr/bin/ablrun-appimage" >> ~/rpmbuild/SPECS/additional-base-lib.spec -echo "/usr/bin/ablrun-normal" >> ~/rpmbuild/SPECS/additional-base-lib.spec check $? echo @@ -167,28 +166,16 @@ mkdir ~/rpmbuild/BUILD/abl-rpm/usr/bin echo echo "gather files:" -echo "copy ablrun script..." -cp ./scripts/ablrun ~/rpmbuild/BUILD/abl-rpm/usr/bin/ablrun -check $? - -echo "copy ablrun-appimage script..." -cp ./scripts/ablrun-appimage ~/rpmbuild/BUILD/abl-rpm/usr/bin/ablrun-appimage -check $? - -echo "generate ablrun-normal script..." -echo "#!/bin/bash" > ~/rpmbuild/BUILD/abl-rpm/usr/bin/ablrun-normal -echo "ABL_TARGET_LD_SO_PATH=$LD_SO_LOCATION" >> ~/rpmbuild/BUILD/abl-rpm/usr/bin/ablrun-normal -echo "ABL_DIR_PREFIX=$SYSTEM_LIBRARY_DIR" >> ~/rpmbuild/BUILD/abl-rpm/usr/bin/ablrun-normal -cat ./scripts/ablrun-normal_part >> ~/rpmbuild/BUILD/abl-rpm/usr/bin/ablrun-normal +echo "generate ablrun script..." +echo "#!/bin/bash" > ~/rpmbuild/BUILD/abl-rpm/usr/bin/ablrun +echo "ABL_TARGET_LD_SO_PATH=$LD_SO_LOCATION" >> ~/rpmbuild/BUILD/abl-rpm/usr/bin/ablrun +echo "ABL_DIR_PREFIX=$SYSTEM_LIBRARY_DIR" >> ~/rpmbuild/BUILD/abl-rpm/usr/bin/ablrun +cat ./scripts/ablrun_part >> ~/rpmbuild/BUILD/abl-rpm/usr/bin/ablrun check $? echo "chmod..." chmod a+x ~/rpmbuild/BUILD/abl-rpm/usr/bin/ablrun check $? -chmod a+x ~/rpmbuild/BUILD/abl-rpm/usr/bin/ablrun-appimage -check $? -chmod a+x ~/rpmbuild/BUILD/abl-rpm/usr/bin/ablrun-normal -check $? rooted_readlink(){ rrl_result=$1