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

do_deploy installer part2 #373

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

do_deploy installer part2 #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c0a836
build-scripts: Remove installer-part2-image
jandryuk Mar 2, 2020
4e3c691
do_build: Adjust for removal of installer-part2-image
jandryuk Mar 2, 2020
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
1 change: 0 additions & 1 deletion build-scripts/20-xenclient-oe.layer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ openxt_layer_xenclient_oe_images=( \
"xenclient-dom0 xenclient-initramfs cpio.gz" \
"xenclient-dom0 xenclient-dom0 ext3.gz" \
"openxt-installer xenclient-installer cpio.gz" \
"openxt-installer xenclient-installer-part2 tar.bz2" \
"xenclient-uivm xenclient-uivm ext3.vhd.gz" \
"xenclient-ndvm xenclient-ndvm ext3.disk.vhd.gz" \
)
Expand Down
8 changes: 4 additions & 4 deletions build-scripts/oe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,9 @@ build_image() {

# Transfer image and give it the expected name
if [ -f ${SOURCE_IMAGE} ]; then
if [ "$IMAGE_NAME" = "xenclient-installer-part2" ]; then
$RSYNC ${SOURCE_IMAGE} ${TARGET}/raw/control.${EXTENSION}
if [ "$IMAGE_NAME" = "xenclient-installer" ]; then
$RSYNC tmp-glibc/deploy/images/${MACHINE}/control.tar.bz2 \
${TARGET}/raw/control.tar.bz2
$RSYNC tmp-glibc/deploy/images/${MACHINE}/*.acm \
tmp-glibc/deploy/images/${MACHINE}/tboot.gz \
tmp-glibc/deploy/images/${MACHINE}/xen.gz \
Expand All @@ -120,9 +121,8 @@ build_image() {
fi
$RSYNC tmp-glibc/deploy/images/${MACHINE}/bzImage-${MACHINE}.bin \
${TARGET}/netboot/vmlinuz
else
$RSYNC ${SOURCE_IMAGE} ${TARGET}/raw/${REAL_NAME}-rootfs.${EXTENSION}
fi
$RSYNC ${SOURCE_IMAGE} ${TARGET}/raw/${REAL_NAME}-rootfs.${EXTENSION}
fi

# Transfer licenses
Expand Down
29 changes: 2 additions & 27 deletions do_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /bin/bash -e
set -o pipefail

STEPS="setupoe,initramfs,stubinitramfs,dom0,uivm,ndvm,syncvm,installer,installer2,syncui,source,sdk,license,sourceinfo,ship"
STEPS="setupoe,initramfs,stubinitramfs,dom0,uivm,ndvm,syncvm,installer,syncui,source,sdk,license,sourceinfo,ship"

# Additional steps:

Expand Down Expand Up @@ -398,6 +398,7 @@ do_oe_installer_copy()
cp "$binaries/$machine/grub-efi-bootx64.efi" \
"$OUTPUT_DIR/$NAME/raw/grubx64.efi"
cp "$binaries/$machine/isohdpfx.bin" "$OUTPUT_DIR/$NAME/raw/"
cp "$binaries/$machine/control.tar.bz2" "$OUTPUT_DIR/$NAME/raw/"

popd
}
Expand All @@ -410,28 +411,6 @@ do_oe_installer()
do_oe_installer_copy $path "openxt-installer"
}

do_oe_installer_part2_copy()
{
local path="$1"
local machine="$2"
local binaries="tmp-glibc/deploy/images"
pushd "$path"

mkdir -p "$OUTPUT_DIR/$NAME/raw"

cp "$binaries/$machine/xenclient-installer-part2-image-openxt-installer.tar.bz2" "$OUTPUT_DIR/$NAME/raw/control.tar.bz2"

popd
}

do_oe_installer_part2()
{
local path="$1"

do_oe "$path" "openxt-installer" "xenclient-installer-part2-image"
do_oe_installer_part2_copy $path "openxt-installer"
}

do_oe_source_shrink()
{
local path="$1"
Expand Down Expand Up @@ -1369,10 +1348,6 @@ do_build()
do_oe_installer "$path" ;;
installercp)
do_oe_installer_copy "$path" "openxt-installer";;
installer2)
do_oe_installer_part2 "$path" ;;
installer2cp)
do_oe_installer_part2_copy "$path" "xenclient-dom0";;
license*)
do_oe_copy_licenses "$path" ;;
sourceinfo*)
Expand Down