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

Package e2fsprogs with ubuntu-image and select the appropriate conf at runtime #170

Merged
merged 20 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Move tools to a dedicated directory
Signed-off-by: Paul Mars <paul.mars@canonical.com>
  • Loading branch information
upils committed Jun 18, 2024
commit b95dda0aa61d88ca4dc9f09f5524a68937daa800
2 changes: 1 addition & 1 deletion snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ parts:
build-attributes: [ enable-patchelf ]
override-build: |
# Check if mkfs configuration for every series are up to date
./check-mkfs-confs.sh
./tools/check-mkfs-confs.sh
mv mkfs "$SNAPCRAFT_PART_INSTALL"/etc/ubuntu-image/
ins_bin=$SNAPCRAFT_PART_INSTALL/bin/
mkdir -p "$ins_bin"
Expand Down
File renamed without changes.
6 changes: 6 additions & 0 deletions collect-mkfs-confs.sh → tools/collect-mkfs-confs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ DB="$WORKDIR"/mkfs/db

rm -r "${MKFS_CONF:?}"/* || true

if [ -d "$DB" ]; then
rm "$DB"
fi

mkdir -p "$MKFS_CONF"
mkdir -p "$TMP_DIR"/pkg

Expand All @@ -26,6 +30,8 @@ for FULL_SERIES in $TOTAL_SERIES; do
SERIES_CODENAME=$(echo "$FULL_SERIES" | cut -d " " -f 2)
SERIES_RELEASE_POCKET="$SERIES_RELEASE"-updates

# Collect configurations from amd64 packages for now. This is working under the assumption the configuration
# is the same for every arch. This may be wrong now or in the future.
cd "$TMP_DIR" && \
pull-lp-debs -a amd64 -p debs -d "$PKG $SERIES_RELEASE"-updates > in_updates.txt || true
IN_UPDATES=$(grep "Found" "$TMP_DIR"/in_updates.txt || true)
Expand Down