Bump to next branch

Host: Ubuntu 21.04
This commit is contained in:
orangepi-xunlong
2022-03-07 16:26:01 +08:00
parent 812e231da2
commit 206214916c
615 changed files with 61837 additions and 2426 deletions

View File

@@ -1,18 +1,30 @@
FROM ubuntu:20.04
FROM ubuntu:21.04
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
RUN apt-get update && apt-get -y install \
joe \
software-properties-common \
gnupg \
gnupg1 \
gpgv1 \
curl \
&& rm -rf /var/lib/apt/lists/*
RUN sh -c "if [ x"" != x$http_proxy ]; then \
apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --keyserver-options http-proxy=$http_proxy --recv-keys ED75B5A4483DA07C >/dev/null 2>&1; \
else \
apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys ED75B5A4483DA07C >/dev/null 2>&1; \
fi"
RUN echo "deb http://repo.aptly.info/ nightly main" > /etc/apt/sources.list.d/aptly.list
RUN dpkg --add-architecture i386
RUN sh -c " \
if [ $(dpkg --print-architecture) = amd64 ]; then \
if [ x'' != x$http_proxy ]; then \
curl -fsSL -x $http_proxy https://www.aptly.info/pubkey.txt | apt-key add - >/dev/null 2>&1; \
else \
curl -fsSL https://www.aptly.info/pubkey.txt | apt-key add - >/dev/null 2>&1; \
fi; \
echo \"deb http://repo.aptly.info/ nightly main\" > /etc/apt/sources.list.d/aptly.list; \
dpkg --add-architecture i386 \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
lib32ncurses6 \
lib32stdc++6 \
lib32tinfo6 \
libc6-i386 \
zlib1g:i386; \
fi"
RUN apt-get update \
&& apt-get -y upgrade \
&& apt-get install -y --no-install-recommends \
@@ -30,28 +42,31 @@ RUN apt-get update \
cpio \
cryptsetup \
cryptsetup-bin \
curl \
debian-archive-keyring \
debian-keyring \
debootstrap \
device-tree-compiler \
dialog \
distcc \
dosfstools \
dwarves \
f2fs-tools \
fakeroot \
flex \
g++-8-arm-linux-gnueabihf \
gawk \
gcc-arm-linux-gnueabihf \
gcc-arm-linux-gnueabi \
gcc-arm-none-eabi \
gdisk \
git \
imagemagick \
jq \
kmod \
lib32ncurses6 \
lib32stdc++6 \
lib32tinfo6 \
libbison-dev \
libc6-amd64-cross \
libc6-dev-armhf-cross \
libc6-i386 \
libfdt-dev libelf-dev \
libfile-fcntllock-perl \
libfl-dev \
liblz4-tool \
@@ -68,6 +83,7 @@ RUN apt-get update \
ncurses-term \
nfs-kernel-server \
ntpdate \
openssh-client \
p7zip-full \
parted \
patchutils \
@@ -80,21 +96,28 @@ RUN apt-get update \
python3 \
python3-dev \
python3-distutils \
python3-pkg-resources \
python3-setuptools \
qemu \
qemu-utils \
qemu-user-static \
rsync \
swig \
sudo \
systemd-container \
tzdata \
u-boot-tools \
udev \
unzip \
uuid \
uuid-dev \
uuid-runtime \
wget \
whiptail \
xfsprogs \
xxd \
zip \
zlib1g-dev \
zlib1g:i386 \
&& rm -rf /var/lib/apt/lists/*
RUN locale-gen en_US.UTF-8
@@ -104,4 +127,4 @@ RUN sed -i 's/\(^STATDOPTS=\).*/\1"--port 32765 --outgoing-port 32766"/' /etc/de
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' TERM=screen
WORKDIR /root/orangepi
ENTRYPOINT [ "/bin/bash", "/root/orangepi/compile.sh" ]
ENTRYPOINT [ "/bin/bash", "/root/orangepi/build.sh" ]