mirror of
https://github.com/DrHo1y/orangepi-build.git
synced 2026-11-22 01:52:46 +07:00
Bump to next branch
Host: Ubuntu 21.04
This commit is contained in:
57
external/config/templates/Dockerfile
vendored
57
external/config/templates/Dockerfile
vendored
@@ -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" ]
|
||||
|
||||
2
external/config/templates/Vagrantfile
vendored
2
external/config/templates/Vagrantfile
vendored
@@ -15,7 +15,7 @@ SCRIPT
|
||||
Vagrant.configure(2) do |config|
|
||||
|
||||
# What box should we base this build on?
|
||||
config.vm.box = "ubuntu/bionic64"
|
||||
config.vm.box = "ubuntu/focal64"
|
||||
config.vm.box_version = ">= 20180719.0.0"
|
||||
|
||||
# Default images are not big enough to build Armbian.
|
||||
|
||||
6
external/config/templates/config-docker.conf
vendored
6
external/config/templates/config-docker.conf
vendored
@@ -43,7 +43,7 @@ DOCKER_FLAGS+=(--security-opt=apparmor:unconfined)
|
||||
|
||||
# remove resulting container after exit to minimize clutter
|
||||
# bad side effect - named volumes are considered not attached to anything and are removed on "docker volume prune"
|
||||
#DOCKER_FLAGS+=(--rm)
|
||||
DOCKER_FLAGS+=(--rm)
|
||||
|
||||
# pass through loop devices
|
||||
for d in /dev/loop*; do
|
||||
@@ -106,10 +106,10 @@ If you prefer to use profile, for example, `userpatches/config-my.conf`, try:
|
||||
./compile.sh my compile_uboot
|
||||
|
||||
EOF
|
||||
docker run "${DOCKER_FLAGS[@]}" -it --rm --entrypoint /usr/bin/env armbian:$VERSION "$@" /bin/bash
|
||||
docker run "${DOCKER_FLAGS[@]}" -it --entrypoint /usr/bin/env armbian:$VERSION "$@" /bin/bash
|
||||
else
|
||||
display_alert "Running the container" "" "info"
|
||||
docker run "${DOCKER_FLAGS[@]}" -it --rm armbian:$VERSION "$@"
|
||||
docker run "${DOCKER_FLAGS[@]}" -it armbian:$VERSION "$@"
|
||||
fi
|
||||
|
||||
# Docker error treatment
|
||||
|
||||
23
external/config/templates/config-example.conf
vendored
23
external/config/templates/config-example.conf
vendored
@@ -1,17 +1,18 @@
|
||||
KERNEL_CONFIGURE="yes" # leave empty to select each time, set to "yes" or "no" to skip dialog prompt
|
||||
CLEAN_LEVEL="debs,oldcache" # comma-separated list of clean targets: "make" = make clean for selected kernel and u-boot,
|
||||
# "debs" = delete packages in "./output/debs" for current branch and family,
|
||||
# "alldebs" = delete all packages in "./output/debs", "images" = delete "./output/images",
|
||||
# "cache" = delete "./output/cache", "sources" = delete "./sources"
|
||||
# "oldcache" = remove old cached rootfs except for the newest 8 files
|
||||
KERNEL_CONFIGURE="" # leave empty to select each time, set to "yes" or "no" to skip dialog prompt
|
||||
CLEAN_LEVEL="debs,oldcache" # comma-separated list of clean targets: "make" = make clean for selected kernel and u-boot,
|
||||
# "debs" = delete packages in "./output/debs" for current branch and family,
|
||||
# "alldebs" = delete all packages in "./output/debs", "images" = delete "./output/images",
|
||||
# "cache" = delete "./output/cache", "sources" = delete "./sources"
|
||||
# "oldcache" = remove old cached rootfs except for the newest 8 files
|
||||
|
||||
DEST_LANG="en_US.UTF-8" # sl_SI.UTF-8, en_US.UTF-8
|
||||
DEST_LANG="en_US.UTF-8" # sl_SI.UTF-8, en_US.UTF-8
|
||||
|
||||
# advanced
|
||||
EXTERNAL_NEW="prebuilt" # compile and install or install prebuilt additional packages
|
||||
INSTALL_HEADERS="" # install kernel headers package
|
||||
LIB_TAG="master" # change to "branchname" to use any branch currently available.
|
||||
DOWNLOAD_MIRROR="china" # set to "china" to use mirrors.tuna.tsinghua.edu.cn
|
||||
EXTERNAL_NEW="prebuilt" # compile and install or install prebuilt additional packages
|
||||
INSTALL_HEADERS="" # install kernel headers package
|
||||
LIB_TAG="master" # change to "branchname" to use any branch currently available.
|
||||
USE_TORRENT="yes" # use torrent network for faster toolchain and cache download
|
||||
DOWNLOAD_MIRROR="china" # set to "china" to use mirrors.tuna.tsinghua.edu.cn
|
||||
|
||||
BOARD=""
|
||||
BRANCH=""
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
|
||||
# NOTE: If you want to transfer files between chroot and host
|
||||
# userpatches/overlay directory on host is bind-mounted to /tmp/overlay in chroot
|
||||
# The sd card's root path is accessible via $SDCARD variable.
|
||||
|
||||
RELEASE=$1
|
||||
LINUXFAMILY=$2
|
||||
@@ -28,9 +29,15 @@ Main() {
|
||||
buster)
|
||||
# your code here
|
||||
;;
|
||||
bullseye)
|
||||
# your code here
|
||||
;;
|
||||
bionic)
|
||||
# your code here
|
||||
;;
|
||||
focal)
|
||||
# your code here
|
||||
;;
|
||||
esac
|
||||
} # Main
|
||||
|
||||
@@ -43,6 +50,10 @@ InstallOpenMediaVault() {
|
||||
# policies since you end up with root password 'openmediavault' which
|
||||
# you have to change yourself later. SSH login as root has to be enabled
|
||||
# through OMV web UI first
|
||||
#
|
||||
# This routine is based on idea/code courtesy Benny Stark. For fixes,
|
||||
# discussion and feature requests please refer to
|
||||
# https://forum.armbian.com/index.php?/topic/2644-openmediavault-3x-customize-imagesh/
|
||||
|
||||
echo root:openmediavault | chpasswd
|
||||
rm /root/.not_logged_in_yet
|
||||
@@ -222,7 +233,7 @@ UnattendedStorageBenchmark() {
|
||||
|
||||
InstallAdvancedDesktop()
|
||||
{
|
||||
apt install -yy transmission libreoffice libreoffice-style-tango meld remmina thunderbird kazam avahi-daemon
|
||||
apt-get install -yy transmission libreoffice libreoffice-style-tango meld remmina thunderbird kazam avahi-daemon
|
||||
[[ -f /usr/share/doc/avahi-daemon/examples/sftp-ssh.service ]] && cp /usr/share/doc/avahi-daemon/examples/sftp-ssh.service /etc/avahi/services/
|
||||
[[ -f /usr/share/doc/avahi-daemon/examples/ssh.service ]] && cp /usr/share/doc/avahi-daemon/examples/ssh.service /etc/avahi/services/
|
||||
apt clean
|
||||
|
||||
BIN
external/config/templates/example.deb
vendored
Executable file
BIN
external/config/templates/example.deb
vendored
Executable file
Binary file not shown.
@@ -1,7 +1,7 @@
|
||||
setenv nfs_ip FEL_LOCAL_IP
|
||||
setenv nfs_root FEL_ROOTFS
|
||||
setenv branch BRANCH
|
||||
setenv bootargs "console=tty1 console=ttyS0,115200 root=/dev/nfs nfsroot=${nfs_ip}:${nfs_root} ip=dhcp rw panic=10 consoleblank=0 enforcing=0 loglevel=6 rootflags=noatime,nodiratime"
|
||||
setenv bootargs "console=tty1 console=ttyS0,115200 root=/dev/nfs nfsroot=${nfs_ip}:${nfs_root} ip=dhcp rw panic=10 consoleblank=0 enforcing=0 loglevel=6 rootflags=noatime"
|
||||
# uncomment to disable initrd
|
||||
# setenv ramdisk_addr_r "-"
|
||||
if test ${branch} != legacy; then
|
||||
|
||||
@@ -9,7 +9,7 @@ setenv branch BRANCH
|
||||
setenv net_setup "ip=dhcp"
|
||||
|
||||
# for static configuration see documentation
|
||||
# https://github.com/torvalds/linux/blob/master/Documentation/filesystems/nfs/nfsroot.txt
|
||||
# https://github.com/torvalds/linux/blob/master/Documentation/admin-guide/nfs/nfsroot.rst
|
||||
# setenv net_setup "ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf>:<dns0-ip>:<dns1-ip>"
|
||||
|
||||
# you may need to add extra kernel arguments specific to your device
|
||||
|
||||
Reference in New Issue
Block a user