docker image: reorder recipes to prevent influence on console-images
This commit is contained in:
@@ -40,7 +40,6 @@ EXTRA_TOOLS_INSTALL = " \
|
||||
e2fsprogs-mke2fs \
|
||||
ethtool \
|
||||
findutils \
|
||||
htop \
|
||||
i2c-tools \
|
||||
less \
|
||||
mc \
|
||||
|
@@ -6,5 +6,9 @@ require tiny-image-base.inc
|
||||
|
||||
IMAGE_INSTALL_append = " initscripts init-ifupdown docker-ce"
|
||||
|
||||
EXTRA_USERS_PARAMS += " \
|
||||
usermod -a -G docker tkl \
|
||||
"
|
||||
|
||||
export IMAGE_BASENAME = "docker-image"
|
||||
|
||||
|
@@ -5,45 +5,45 @@ require users.inc
|
||||
IMAGE_FEATURES += "package-management"
|
||||
|
||||
CORE_OS = " \
|
||||
openssh \
|
||||
openssh-keygen \
|
||||
openssh-sftp-server \
|
||||
psplash \
|
||||
tzdata \
|
||||
busybox-initcfg \
|
||||
openssh \
|
||||
openssh-keygen \
|
||||
openssh-sftp-server \
|
||||
psplash \
|
||||
tzdata \
|
||||
"
|
||||
|
||||
KERNEL_EXTRA_INSTALL = " \
|
||||
kernel-modules \
|
||||
kernel-modules \
|
||||
"
|
||||
|
||||
WIFI_SUPPORT = " \
|
||||
wpa-supplicant \
|
||||
wpa-supplicant \
|
||||
"
|
||||
|
||||
EXTRA_TOOLS_INSTALL = " \
|
||||
"
|
||||
|
||||
IMAGE_INSTALL += " \
|
||||
${CORE_OS} \
|
||||
${EXTRA_TOOLS_INSTALL} \
|
||||
${KERNEL_EXTRA_INSTALL} \
|
||||
${WIFI_SUPPORT} \
|
||||
${CORE_OS} \
|
||||
${EXTRA_TOOLS_INSTALL} \
|
||||
${KERNEL_EXTRA_INSTALL} \
|
||||
${WIFI_SUPPORT} \
|
||||
"
|
||||
|
||||
IMAGE_INSTALL_append_beaglebone-yocto = " linux-firmware-rtl8192cu"
|
||||
#IMAGE_INSTALL_append_raspberrypi3_64 += " linux-firmware-bcm43430"
|
||||
IMAGE_INSTALL_append_bananapi-m3 += " linux-firmware-bcm43430"
|
||||
|
||||
set_local_timezone() {
|
||||
ln -sf /usr/share/zoneinfo/Europe/Berlin ${IMAGE_ROOTFS}/etc/localtime
|
||||
ln -sf /usr/share/zoneinfo/Europe/Berlin ${IMAGE_ROOTFS}/etc/localtime
|
||||
}
|
||||
|
||||
disable_bootlogd() {
|
||||
echo BOOTLOGD_ENABLE=no > ${IMAGE_ROOTFS}/etc/default/bootlogd
|
||||
echo BOOTLOGD_ENABLE=no > ${IMAGE_ROOTFS}/etc/default/bootlogd
|
||||
}
|
||||
|
||||
ROOTFS_POSTPROCESS_COMMAND += " \
|
||||
set_local_timezone ; \
|
||||
disable_bootlogd ; \
|
||||
"
|
||||
set_local_timezone ; \
|
||||
disable_bootlogd ; \
|
||||
"
|
||||
|
||||
|
Reference in New Issue
Block a user