Fix -dev split rule

.github/workflows/build.yaml

@@ -66,11 +66,23 @@ jobs:
           ls -l /tmp/apks/*/* | grep -e "${{ steps.test-data.outputs.apk-pkg-name }}-doc-[[:alnum:]\._git]\+-r0.apk"
           echo "Checking main package"
           ls -l /tmp/apks/*/* | grep -e "${{ steps.test-data.outputs.apk-pkg-name }}-[[:alnum:]\._git]\+-r0.apk"
+
+          mkdir -p /tmp/pkg-main
+          cd /tmp/pkg-main
       - name: Test split-dev
         if: steps.test-data.outputs.split-dev
         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' }}

generate_rospkg_apkbuild/APKBUILD.em.sh

@@ -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