Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix -dev split rule #173

Merged
merged 6 commits into from
Jul 29, 2024
Merged

Fix -dev split rule #173

merged 6 commits into from
Jul 29, 2024

Conversation

at-wat
Copy link
Member

@at-wat at-wat commented Jul 29, 2024

Files like /usr/ros/noetic/share/rviz/ogre_media/materials/glsl120/include/pack_depth.frag in rviz was moved to -dev package but it's required runtime.
Unuse abuild's default dev split function and define custom one.

 -----
/tmp/apks/noetic/x86_64/ros-noetic-rospack-2.6.2_git20210326162248-r0.apk
-----
-rw-r--r-- 0/0             512 2024-07-29 06:58 .SIGN.RSA.-66a73da8.rsa.pub
-rw-r--r-- root/root       762 2024-07-29 06:58 .PKGINFO
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/ros/
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/ros/noetic/
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/ros/noetic/bin/
-rwxr-xr-x root/root     14472 2024-07-29 06:58 usr/ros/noetic/bin/rospack
-rwxr-xr-x root/root     14472 2024-07-29 06:58 usr/ros/noetic/bin/rosstack
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/ros/noetic/lib/
-rwxr-xr-x root/root    317392 2024-07-29 06:58 usr/ros/noetic/lib/librospack.so
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/ros/noetic/share/
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/ros/noetic/share/rospack/
-rw-r--r-- root/root      1697 2024-07-29 06:58 usr/ros/noetic/share/rospack/package.xml

-----
/tmp/apks/noetic/x86_64/ros-noetic-rospack-dbg-2.6.2_git20210326162248-r0.apk
-----
-rw-r--r-- 0/0             512 2024-07-29 06:58 .SIGN.RSA.-66a73da8.rsa.pub
-rw-r--r-- root/root       544 2024-07-29 06:58 .PKGINFO
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/lib/
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/lib/debug/
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/lib/debug/usr/
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/lib/debug/usr/ros/
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/lib/debug/usr/ros/noetic/
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/lib/debug/usr/ros/noetic/bin/
-rwxr-xr-x root/root     65784 2024-07-29 06:58 usr/lib/debug/usr/ros/noetic/bin/rospack.debug
-rwxr-xr-x root/root     65480 2024-07-29 06:58 usr/lib/debug/usr/ros/noetic/bin/rosstack.debug
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/lib/debug/usr/ros/noetic/lib/
-rwxr-xr-x root/root   4753400 2024-07-29 06:58 usr/lib/debug/usr/ros/noetic/lib/librospack.so.debug

-----
/tmp/apks/noetic/x86_64/ros-noetic-rospack-dev-2.6.2_git20210326162248-r0.apk
-----
-rw-r--r-- 0/0             512 2024-07-29 06:58 .SIGN.RSA.-66a73da8.rsa.pub
-rw-r--r-- root/root       594 2024-07-29 06:58 .PKGINFO
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/ros/
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/ros/noetic/
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/ros/noetic/include/
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/ros/noetic/include/rospack/
-rw-r--r-- root/root      3255 2024-07-29 06:58 usr/ros/noetic/include/rospack/macros.h
-rw-r--r-- root/root     26444 2024-07-29 06:58 usr/ros/noetic/include/rospack/rospack.h
-rw-r--r-- root/root      3168 2024-07-29 06:58 usr/ros/noetic/include/rospack/rospack_backcompat.h
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/ros/noetic/lib/
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/ros/noetic/lib/pkgconfig/
-rw-r--r-- root/root       343 2024-07-29 06:58 usr/ros/noetic/lib/pkgconfig/rospack.pc
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/ros/noetic/share/
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/ros/noetic/share/rospack/
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/ros/noetic/share/rospack/cmake/
-rw-r--r-- root/root       426 2024-07-29 06:58 usr/ros/noetic/share/rospack/cmake/rospackConfig-version.cmake
-rw-r--r-- root/root      9183 2024-07-29 06:58 usr/ros/noetic/share/rospack/cmake/rospackConfig.cmake

-----
/tmp/apks/noetic/x86_64/ros-noetic-rospack-doc-2.6.2_git20210326162248-r0.apk
-----
-rw-r--r-- 0/0             512 2024-07-29 06:58 .SIGN.RSA.-66a73da8.rsa.pub
-rw-r--r-- root/root       509 2024-07-29 06:58 .PKGINFO
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/share/
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/share/licenses/
drwxr-xr-x root/root         0 2024-07-29 06:58 usr/share/licenses/ros-noetic-rospack/
-rw------- root/root      1511 2024-07-29 06:58 usr/share/licenses/ros-noetic-rospack/LICENSE.0
-rw------- root/root      1527 2024-07-29 06:58 usr/share/licenses/ros-noetic-rospack/LICENSE.1
-rw------- root/root      1546 2024-07-29 06:58 usr/share/licenses/ros-noetic-rospack/LICENSE.2
-rw------- root/root      1525 2024-07-29 06:58 usr/share/licenses/ros-noetic-rospack/LICENSE.3

@at-wat at-wat self-assigned this Jul 29, 2024
@at-wat at-wat requested a review from f-fl0 July 29, 2024 07:02
.github/workflows/build.yaml Outdated Show resolved Hide resolved
@at-wat at-wat merged commit 51f3d26 into master Jul 29, 2024
3 checks passed
@at-wat at-wat deleted the fix-dev-split branch July 29, 2024 07:39
@at-wat at-wat mentioned this pull request Jul 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants