rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-02 07:15:41 +00:00
Code Issues Releases Wiki Activity

Various fixes for ARM build

Browse Source
This commit is contained in:
Darren Shepherd
2016-06-29 22:09:37 -07:00
parent 93b4949cce
commit 70bf02df1f
6 changed files with 78 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/package-initrd
View File

@@ -10,6 +10,10 @@ INITRD=${ARTIFACTS}/initrd
mkdir -p ${ARTIFACTS}
if [ ! -f ${ARTIFACTS}/vmlinuz ]; then
exit 0
fi
if [ "$COMPRESS" == "" ]; then
COMPRESS="gzip -1"
fi

3
scripts/package-installer
View File

@@ -8,8 +8,7 @@ source ./scripts/version
DOCKERFILE=./scripts/installer/Dockerfile.${ARCH}
if [ ! -f $DOCKERFILE ] || [ ! -f dist/artifacts/vmlinuz ] || [ ! -f dist/artifacts/initrd ]; then
echo "Error: ${DOCKERFILE}, dist/artifacts/vmlinuz or dist/artifacts/initrd is missing"
exit 1
exit 0
fi
mkdir -p ./scripts/installer/build

3
scripts/package-iso
View File

@@ -11,8 +11,7 @@ mkdir -p ${CD}/boot/isolinux
mkdir -p ${CD}/boot/isolinux
if [ ! -f ${ARTIFACTS}/vmlinuz ] || [ ! -f ${ARTIFACTS}/initrd ]; then
echo "Error: vmlinuz or initrd is missing in ${ARTIFACTS}/"
exit 1
exit 0
fi
cp ${ARTIFACTS}/initrd ${CD}/boot

11
scripts/package-rootfs
View File

@@ -16,8 +16,10 @@ INITRD=${ARTIFACTS}/initrd
mkdir -p ${ARTIFACTS} ${PREPOP_DIR}
if [ "$(docker info | grep 'Storage Driver: ' | sed 's/Storage Driver: //')" != "overlay" ]; then
echo Overlay storage driver is require do create rootfs.tar 1>&2
exit 1
echo Overlay storage driver is require to prepackage exploded images
echo packaging images.tar instead
tar czf ${ARTIFACTS}/rootfs.tar.gz --exclude lib/modules --exclude lib/firmware -C ${INITRD_DIR} .
exit 0
fi
DFS=$(docker run -d --privileged -v /lib/modules/$(uname -r):/lib/modules/$(uname -r) ${DFS_IMAGE}${SUFFIX} ${DFS_ARGS})
@@ -27,7 +29,4 @@ docker stop ${DFS}
docker run --rm --volumes-from=${DFS} rancher/os-base tar -c -C /var/lib/docker ./image | tar -x -C ${PREPOP_DIR}
docker run --rm --volumes-from=${DFS} rancher/os-base tar -c -C /var/lib/docker ./overlay | tar -x -C ${PREPOP_DIR}
tar -cf ${ARTIFACTS}/rootfs.tar --exclude lib/modules --exclude lib/firmware -C ${INITRD_DIR} .
tar -rf ${ARTIFACTS}/rootfs.tar --exclude lib/modules --exclude lib/firmware -C ${INITRD_DIR} .
rm -f ${ARTIFACTS}/rootfs.tar.gz
gzip ${ARTIFACTS}/rootfs.tar
tar czf ${ARTIFACTS}/rootfs.tar.gz --exclude usr/share/ros/images.tar --exclude lib/modules --exclude lib/firmware -C ${INITRD_DIR} .