Merge pull request #740 from amazonlinux/br-migrations

Update rpm2migrations process for Bottlerocket
bottlerocket-os · Feb 14, 2020 · 93e9850 · 93e9850
2 parents 404f846 + 96be1a6
commit 93e9850
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -94,7 +94,7 @@ USER root
 RUN --mount=target=/host \
     mkdir -p /local/rpms /local/migrations ./rpmbuild/RPMS \
     && ln -s /host/build/*.rpm ./rpmbuild/RPMS \
-    && cp /host/build/thar-${ARCH}-migrations-*.rpm /local/migrations \
+    && cp /host/build/bottlerocket-${ARCH}-migrations-*.rpm /local/migrations \
     && createrepo_c \
         -o ./rpmbuild/RPMS \
         -x '*-debuginfo-*.rpm' \

diff --git a/tools/rpm2migrations b/tools/rpm2migrations
@@ -14,9 +14,9 @@ done
 
 mkdir -p "${OUTPUT_DIR}"
 
-MIGRATIONS_ARCHIVE="thar-${ARCH}-${VARIANT}-${VERSION_ID}-${BUILD_ID}-migrations.tar"
+MIGRATIONS_ARCHIVE="bottlerocket-${ARCH}-${VARIANT}-${VERSION_ID}-${BUILD_ID}-migrations.tar"
 ROOT_TEMP="$(mktemp -d)"
-SYS_ROOT="${ARCH}-thar-linux-gnu/sys-root"
+SYS_ROOT="${ARCH}-bottlerocket-linux-gnu/sys-root"
 MIGRATIONS_DIR="${ROOT_TEMP}/${SYS_ROOT}/usr/share/migrations"
 
 # "Install" the migrations (just puts them in $MIGRATIONS_DIR)