Skip to content

Commit

Permalink
Split minimal and core
Browse files Browse the repository at this point in the history
Signed-off-by: Ryan Friedman <ryanfriedman5410+github@gmail.com>
  • Loading branch information
Ryanf55 committed Jan 24, 2024
1 parent acd9dc3 commit 6022716
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
21 changes: 5 additions & 16 deletions meta-ros-common/recipes-core/images/ros-image-core.bb
Original file line number Diff line number Diff line change
@@ -1,20 +1,9 @@
require ${COREBASE}/meta/recipes-core/images/core-image-minimal.bb
require ros-image-minimal.bb

SUMMARY = "A small image just capable of starting core ROS."
DESCRIPTION = "${SUMMARY}"
DESCRIPTION = "Extends ros-image-minimal with standard Linux tools normally in Ubuntu Server that are used by ROS."

inherit ros_distro_${ROS_DISTRO}
inherit ${ROS_DISTRO_TYPE}_image

IMAGE_INSTALL:append = " \
ros-core \
"

# The deploy code requires bash and
# normal linux utilities not busybox ones.
# See https://github.com/ros/meta-ros/issues/1068#issuecomment-1908098993
CORE_IMAGE_EXTRA_INSTALL += "\
bash coreutils util-linux tar gzip bzip2 kmod \
python3-modules python3-misc \
e2fsprogs e2fsprogs-mke2fs parted \
"
bash \
"

11 changes: 11 additions & 0 deletions meta-ros-common/recipes-core/images/ros-image-minimal.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
require ${COREBASE}/meta/recipes-core/images/core-image-minimal.bb

SUMMARY = "A minimal image just capable of starting core ROS."
DESCRIPTION = "${SUMMARY}"

inherit ros_distro_${ROS_DISTRO}
inherit ${ROS_DISTRO_TYPE}_image

IMAGE_INSTALL:append = " \
ros-core \
"

0 comments on commit 6022716

Please sign in to comment.