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

Restrict Buster architectures to amd64 for DART #5

Merged
merged 4 commits into from
Oct 12, 2021
Merged

Conversation

j-rivero
Copy link
Contributor

@j-rivero j-rivero commented Oct 7, 2021

We don't have packages for Buster on i386, armhf or arm64. The PR uses restrictions list ([amd64]) to avoid DART dependencies build on these architectures. The PR also modifies the Architecture field in -dartsim- packages to only produce them on amd64.

Tested on Buster/i386:
Build Status

The control file is new completely not to share it with other Ubuntu distributions. The interesting diff I think is this one:

❯ diff control -u ../../../ubuntu/debian/control 
--- control	2021-10-07 17:47:08.997303800 +0200
+++ ../../../ubuntu/debian/control	2021-10-07 17:43:04.187323638 +0200
@@ -16,13 +16,13 @@
                libignition-utils1-dev,
                libignition-utils1-cli-dev,
 # dart without major version number to get versions coming from Debian
-               libdart6-dev (<< 6.10.0) [amd64] | libdart-dev (<< 6.10.0) [amd64],
-               libdart6-collision-bullet-dev (<< 6.10.0) [amd64] | libdart-collision-bullet-dev (<< 6.10.0) [amd64],
-               libdart6-collision-ode-dev (<< 6.10.0) [amd64] | libdart-collision-ode-dev (<< 6.10.0) [amd64],
-               libdart6-external-ikfast-dev (<< 6.10.0) [amd64] | libdart-external-ikfast-dev (<< 6.10.0) [amd64],
-               libdart6-external-odelcpsolver-dev (<< 6.10.0) [amd64] | libdart-external-odelcpsolver-dev (<< 6.10.0) [amd64],
-               libdart6-utils-dev (<< 6.10.0) [amd64] | libdart-utils-dev (<< 6.10.0) [amd64],
-               libdart6-utils-urdf-dev (<< 6.10.0) [amd64] | libdart-utils-urdf-dev (<< 6.10.0) [amd64],
+               libdart6-dev (<< 6.10.0) | libdart-dev (<< 6.10.0),
+               libdart6-collision-bullet-dev (<< 6.10.0) | libdart-collision-bullet-dev (<< 6.10.0),
+               libdart6-collision-ode-dev (<< 6.10.0) | libdart-collision-ode-dev (<< 6.10.0),
+               libdart6-external-ikfast-dev (<< 6.10.0) | libdart-external-ikfast-dev (<< 6.10.0),
+               libdart6-external-odelcpsolver-dev (<< 6.10.0) | libdart-external-odelcpsolver-dev (<< 6.10.0),
+               libdart6-utils-dev (<< 6.10.0) | libdart-utils-dev (<< 6.10.0),
+               libdart6-utils-urdf-dev (<< 6.10.0) | libdart-utils-urdf-dev (<< 6.10.0),
                libsdformat12-dev
 Vcs-Browser: https://github.com/ignition-release/ign-physics5-release
 Vcs-Git: https://github.com/ignition-release/ign-physics5-release
@@ -102,7 +102,7 @@
   Main shared library
 
 Package: libignition-physics5-dartsim-dev
-Architecture: amd64
+Architecture: any
 Section: libdevel
 Depends: libignition-physics5-core-dev (= ${binary:Version}),
          libignition-physics5-sdf-dev (= ${binary:Version}),
@@ -131,7 +131,7 @@
   Dartsim component, development files
 
 Package: libignition-physics5-dartsim
-Architecture: amd64
+Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -240,7 +240,7 @@
 Section: libdevel
 Depends: libignition-physics5-core-dev (= ${binary:Version}),
          libignition-physics5-bullet-dev (= ${binary:Version}),
-         libignition-physics5-dartsim-dev (= ${binary:Version}) [amd64],
+         libignition-physics5-dartsim-dev (= ${binary:Version}),
          libignition-physics5-heightmap-dev (= ${binary:Version}),
          libignition-physics5-mesh-dev (= ${binary:Version}),
          libignition-physics5-sdf-dev (= ${binary:Version}),

@scpeters
Copy link
Contributor

scpeters commented Oct 7, 2021

can you revert #4 in this PR as well since the buster arm* builds will work again?

@j-rivero
Copy link
Contributor Author

can you revert #4 in this PR as well since the buster arm* builds will work again?

Yes, thanks. c64e550

@j-rivero j-rivero merged commit 5680419 into main Oct 12, 2021
@scpeters scpeters deleted the restrict_arches branch October 28, 2021 05:16
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