diff --git a/pkg-scripts/README b/pkg-scripts/README index 5c465be661..f4ef24eed4 100644 --- a/pkg-scripts/README +++ b/pkg-scripts/README @@ -18,10 +18,10 @@ Ubuntu: It will attempt construct a .deb file in the pkg-scripts folder Amazon Linux 2: - ./athena-server.spec + ./make-rpm-server This script will retrieve the current git commit date and hash and assemble a version from it. - It will attempt construct a .deb file in the pkg-scripts folder + It will attempt construct an .rpm file in the pkg-scripts folder Docker: ./make-docker-server diff --git a/pkg-scripts/make-rpm-server b/pkg-scripts/make-rpm-server index f0e4c3728a..d7cf0f5e78 100755 --- a/pkg-scripts/make-rpm-server +++ b/pkg-scripts/make-rpm-server @@ -7,6 +7,21 @@ GITDATE=`git -C $ATHENA/source log -n 1 --format=raw | grep author | cut -d">" - GITCOMMIT=`git -C $ATHENA/source rev-parse HEAD | cut -c 1-7` VERSION=0.86.0_K1_${GITDATE}_${GITCOMMIT} +SOFILES=`ls \ + $ATHENA/build/libraries/*/*.so \ + $ATHENA/qt5-install/lib/libQt5Network.so.*.*.* \ + $ATHENA/qt5-install/lib/libQt5Core.so.*.*.* \ + $ATHENA/qt5-install/lib/libQt5Widgets.so.*.*.* \ + $ATHENA/qt5-install/lib/libQt5Gui.so.*.*.* \ + $ATHENA/qt5-install/lib/libQt5Script.so.*.*.* \ + $ATHENA/qt5-install/lib/libQt5Quick.so.*.*.* \ + $ATHENA/qt5-install/lib/libQt5WebSockets.so.*.*.* \ + $ATHENA/qt5-install/lib/libQt5Qml.so.*.*.* \ + $ATHENA/qt5-install/lib/libQt5ScriptTools.so.*.*.* \ + $ATHENA/build/ext/makefiles/quazip/project/lib/libquazip5.so.*.*.* \ + | sed 's/\./\\\./g' \ + | paste -d'|' -s` + DEPENDS=mesa-libGL,`ls \ $ATHENA/build/assignment-client/assignment-client \ $ATHENA/build/domain-server/domain-server \ @@ -27,7 +42,8 @@ DEPENDS=mesa-libGL,`ls \ | xargs -I {} sh -c 'objdump -p {} | grep NEEDED' \ | awk '{print $2}' \ | sort | uniq \ - | grep -v ^libQt5 | grep -v ^libquazip | grep -v ^libGL \ + | egrep -v "^($SOFILES)$" \ + | grep -v ^libGL \ | xargs -I {} sh -c "ldconfig -p | grep {} | tr ' ' '\n' | grep /" \ | xargs rpm -qf --queryformat "%{NAME}\n" \ | sort | uniq \