Skip to content

Commit

Permalink
Fix -dev split rule (#173)
Browse files Browse the repository at this point in the history
  • Loading branch information
at-wat authored Jul 29, 2024
1 parent 4c52671 commit 51f3d26
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 7 deletions.
9 changes: 9 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,15 @@ jobs:
run: |
echo "Checking dev package"
ls -l /tmp/apks/*/* | grep -e "${{ steps.test-data.outputs.apk-pkg-name }}-dev-[[:alnum:]\._git]\+-r0.apk"
- name: Show package contents
run: |
for apk in /tmp/apks/*/*/*.apk; do
echo "-----"
echo ${apk}
echo "-----"
tar -tvf ${apk} 2>/dev/null
echo
done
- name: Login to GitHub Container Registry
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
Expand Down
17 changes: 10 additions & 7 deletions generate_rospkg_apkbuild/APKBUILD.em.sh
Original file line number Diff line number Diff line change
Expand Up @@ -396,14 +396,17 @@ dev() {
mkdir -p $subpkgdir
install_if="${subpkgname%-dev}=$pkgver-r$pkgrel ros-dev"

if ls $pkgdir/usr/ros/*/lib/pkgconfig >/dev/null 2>/dev/null; then
amove 'usr/ros/*/lib/pkgconfig'
fi
if ls $pkgdir/usr/ros/*/share/*/cmake >/dev/null 2>/dev/null; then
amove 'usr/ros/*/share/*/cmake'
fi
cd $pkgdir || return 0

default_dev
for i in \
usr/ros/*/lib/pkgconfig \
usr/ros/*/share/*/cmake \
usr/ros/*/include \
$(find usr/ros/*/lib -name -name '*.[choa]' -o -name '*.prl' 2>/dev/null); do
if [ -e "$i" ] || [ -L "$i" ]; then
amove "$i"
fi
done
}
@[end if]
if [ -f ./apkbuild_hook.sh ]; then
Expand Down

0 comments on commit 51f3d26

Please sign in to comment.