1
0
mirror of https://github.com/rancher/os.git synced 2025-09-11 19:51:09 +00:00

v2.0.0-beta3

- Share kernel with k3OS (5.4.0-54.60-rancher1)
- Buildroot 2020.02.8
- Docker 20.10.2
This commit is contained in:
Olli Janatuinen
2020-12-13 19:30:37 +02:00
parent d9e9511add
commit b31b3fe738
7 changed files with 29 additions and 23 deletions

View File

@@ -10,8 +10,8 @@ RUN mkdir -p /source/assets
COPY rootfs_arm64.tar.gz /source/assets/rootfs_arm64.tar.gz
ENV KERNEL_URL=https://github.com/burmilla/os-rpi-kernel/releases/download/v4.14.114-burmilla/4.14.114-rancheros-v8.tar.gz
ENV BOOTLOADER_URL=https://github.com/burmilla/os-rpi-kernel/releases/download/v4.14.114-burmilla/rpi-bootloader.tar.gz
ENV KERNEL_URL=https://github.com/burmilla/os-rpi-kernel/releases/download/v5.10.1-burmilla/5.10.1-burmilla-v8.tar.gz
ENV BOOTLOADER_URL=https://github.com/burmilla/os-rpi-kernel/releases/download/v5.10.1-burmilla/rpi-bootloader.tar.gz
RUN curl -fL ${KERNEL_URL} > /source/assets/kernel.tar.gz
RUN curl -fL ${BOOTLOADER_URL} > /source/assets/rpi-bootfiles.tar.gz

View File

@@ -2,14 +2,14 @@
set -e
# Override using a local kernel build
if [ -e ${DAPPER_SOURCE}/assets/kernel.tar.gz ]; then
echo "copying ${DAPPER_SOURCE}/assets/kernel.tar.gz ${DOWNLOADS}/kernel.tar.gz"
cp ${DAPPER_SOURCE}/assets/kernel.tar.gz ${DOWNLOADS}/kernel.tar.gz
if [ -e ${DAPPER_SOURCE}/assets/kernel.tar.xz ]; then
echo "copying ${DAPPER_SOURCE}/assets/kernel.tar.xz ${DOWNLOADS}/kernel.tar.xz"
cp ${DAPPER_SOURCE}/assets/kernel.tar.xz ${DOWNLOADS}/kernel.tar.xz
fi
if [ -e ${DOWNLOADS}/kernel.tar.gz ]; then
if [ -e ${DOWNLOADS}/kernel.tar.xz ]; then
mkdir -p ${BUILD}/kernel
tar xf ${DOWNLOADS}/kernel.tar.gz -C ${BUILD}/kernel
tar Jxf ${DOWNLOADS}/kernel.tar.xz -C ${BUILD}/kernel
for i in vmlinuz vmlinux; do
if [ -e ${BUILD}/kernel/boot/${i}-* ]; then
@@ -24,7 +24,7 @@ if [ -e ${DOWNLOADS}/kernel.tar.gz ]; then
fi
done
# TODO: move these into a separate tar.gz and add to the syslinux initrd line
# TODO: move these into a separate tar.xz and add to the syslinux initrd line
if [ -d ${BUILD}/kernel/lib ]; then
rm -rf ${INITRD_DIR}/usr/lib
cp -rf ${BUILD}/kernel/lib ${INITRD_DIR}/usr/
@@ -51,7 +51,7 @@ if [ -e ${DOWNLOADS}/kernel.tar.gz ]; then
fi
else
if [ "$ARCH" == "amd64" ]; then
echo "no ${DOWNLOADS}/kernel.tar.gz found"
echo "no ${DOWNLOADS}/kernel.tar.xz found"
exit 1
fi
fi

View File

@@ -10,7 +10,7 @@ touch dist/publish.sh
chmod 755 dist/publish.sh
if [ "$OS_FIRMWARE" = "false" ]; then
echo "github-release upload --user burmilla --repo os --tag ${VERSION} --file ./dist/artifacts/burmillaos.iso --name burmillaos-${VERSION}-nofirmware.iso" >> dist/publish.sh
echo "github-release upload --user burmilla --repo os --tag ${VERSION} --file ./dist/artifacts/burmillaos.iso --name burmillaos-${VERSION}-vm.iso" >> dist/publish.sh
exit 0
else
echo "github-release release --user burmilla --repo os --tag ${VERSION} --pre-release --draft" > dist/publish.sh