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.

Sign up for GitHub

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

Debian generator support for architecture_independent flag #705

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Debian generator support for architecture_independent flag #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions bloom/generators/debian/generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,11 @@ def generate_substitutions_from_package(
data['format'] = 'native' if native else 'quilt'
# Package name
data['Package'] = sanitize_package_name(package.name)
# Architecture
exported_tags = [e.tagname for e in package.exports]
architecture_independent = 'metapackage' in exported_tags or \
'architecture_independent' in exported_tags
data['Architecture'] = 'all' if architecture_independent else 'any'
# Installation prefix
data['InstallationPrefix'] = installation_prefix
# Resolve dependencies
Expand Down
2 changes: 1 addition & 1 deletion bloom/generators/debian/templates/ament_cmake/control.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Homepage: @(Homepage)
Standards-Version: 3.9.2

Package: @(Package)
Architecture: any
Architecture: @(Architecture)
Depends: ${shlibs:Depends}, ${misc:Depends}, @(', '.join(Depends))
@[if Conflicts]Conflicts: @(', '.join(Conflicts))@\n@[end if]@
@[if Replaces]Replaces: @(', '.join(Replaces))@\n@[end if]@
Expand Down
2 changes: 1 addition & 1 deletion bloom/generators/debian/templates/ament_python/control.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Homepage: @(Homepage)
Standards-Version: 3.9.2

Package: @(Package)
Architecture: any
Architecture: @(Architecture)
Depends: ${python3:Depends}, ${misc:Depends}, @(', '.join(Depends))
@[if Conflicts]Conflicts: @(', '.join(Conflicts))@\n@[end if]@
@[if Replaces]Replaces: @(', '.join(Replaces))@\n@[end if]@
Expand Down
2 changes: 1 addition & 1 deletion bloom/generators/debian/templates/catkin/control.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Homepage: @(Homepage)
Standards-Version: 3.9.2

Package: @(Package)
Architecture: any
Architecture: @(Architecture)
Depends: ${shlibs:Depends}, ${misc:Depends}, @(', '.join(Depends))
@[if Conflicts]Conflicts: @(', '.join(Conflicts))@\n@[end if]@
@[if Replaces]Replaces: @(', '.join(Replaces))@\n@[end if]@
Expand Down
2 changes: 1 addition & 1 deletion bloom/generators/debian/templates/cmake/control.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Homepage: @(Homepage)
Standards-Version: 3.9.2

Package: @(Package)
Architecture: any
Architecture: @(Architecture)
Depends: ${shlibs:Depends}, ${misc:Depends}, @(', '.join(Depends))
@[if Conflicts]Conflicts: @(', '.join(Conflicts))@\n@[end if]@
@[if Replaces]Replaces: @(', '.join(Replaces))@\n@[end if]@
Expand Down