Skip to content

Commit 96f0d9c

Browse files
committed
Developing build rpm package with container Ubuntu 20.04 and Qt6
1 parent 9c0ecc8 commit 96f0d9c

1 file changed

Lines changed: 5 additions & 9 deletions

File tree

.github/workflows/build-rpm-qt6-amd64.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,14 @@ jobs:
137137
run: |
138138
mkdir -p ${{ env.BUILD_RPM_DIR }}/BUILD
139139
mkdir -p ${{ env.BUILD_RPM_DIR }}/RPMS
140-
mkdir -p ${{ env.BUILD_RPM_DIR }}/SOURCES/omodism
140+
mkdir -p ${{ env.BUILD_RPM_DIR }}/SOURCES/omodsim
141141
mkdir -p ${{ env.BUILD_RPM_DIR }}/SPECS
142142
mkdir -p ${{ env.BUILD_RPM_DIR }}/SRPMS
143143
144144
- name: Copy files to BUILD_RPM_DIR
145145
run: |
146146
rsync -a .pkg/rpm/* ${{ env.BUILD_RPM_DIR }}/SPECS
147-
rsync -a .pkg/usr/* ${{ env.BUILD_RPM_DIR }}/SOURCES/omodism/usr
147+
rsync -a .pkg/usr/* ${{ env.BUILD_RPM_DIR }}/SOURCES/omodsim/usr
148148
149149
- name: Install cqtdeployer from sources
150150
run: |
@@ -165,13 +165,13 @@ jobs:
165165
- name: Bundle Qt libraries and plugins throught cqtdeployer
166166
run: |
167167
CQtDeployer -bin ${{ env.BUILD_DIR }}/omodsim \
168-
-targetDir ${{ env.BUILD_RPM_DIR }}/SOURCES/omodism/opt/OpenModSim \
168+
-targetDir ${{ env.BUILD_RPM_DIR }}/SOURCES/omodsim/opt/OpenModSim \
169169
-libDir ${{ env.QT_INSTALL_DIR }}/${{ env.QT_VERSION }}/${{ env.CMAKE_COMPILER }}/lib \
170170
-ignore libcrypto.so.3,libmysqlclient.so.21,libpq.so.5,libssl.so.3,libqsqlmimer.so,libqsqlmysql.so,libqsqlodbc.so,libqsqlpsql.so \
171171
-extraLibs icudata,icui18n,icuuc
172172
173173
- name: Copy OpenModsim docs
174-
run: rsync -a "${{ env.BUILD_DIR }}/docs/" "${{ env.BUILD_RPM_DIR }}/SOURCES/omodism/opt/OpenModSim/docs/"
174+
run: rsync -a "${{ env.BUILD_DIR }}/docs/" "${{ env.BUILD_RPM_DIR }}/SOURCES/omodsim/opt/OpenModSim/docs/"
175175

176176
- name: Create RPM spec file
177177
run: |
@@ -182,11 +182,7 @@ jobs:
182182
cat -n ${{ env.BUILD_RPM_DIR }}/SPECS/omodsim.spec
183183
184184
- name: Patch binary file
185-
run: patchelf --set-rpath /opt/OpenModSim/lib "${{ env.BUILD_RPM_DIR }}/SOURCES/omodism/opt/OpenModSim/bin/omodsim"
186-
187-
- name: List SOURCES/omodism content (Debug View)
188-
run: |
189-
ls -laR ${{ env.BUILD_RPM_DIR }}/SOURCES/omodism/
185+
run: patchelf --set-rpath /opt/OpenModSim/lib "${{ env.BUILD_RPM_DIR }}/SOURCES/omodsim/opt/OpenModSim/bin/omodsim"
190186

191187
- name: Build RPM package
192188
working-directory: ${{ env.BUILD_RPM_DIR }}

0 commit comments

Comments
 (0)