develop/docker-image #3

Merged
tkl merged 4 commits from develop/docker-image into zeus 2020-01-30 21:09:38 +00:00
10 changed files with 60 additions and 54 deletions
Showing only changes of commit ca186c316a - Show all commits

View File

@ -0,0 +1,9 @@
do_install_append () {
install -d ${D}${sysconfdir}/
install -d ${D}${sysconfdir}/rcS.d/
cd ${D}${sysconfdir}/rcS.d/
ln -s ../init.d/sshd S47sshd.sh
}

View File

@ -1,18 +1,5 @@
LICENSE = "GPLv2" LICENSE = "GPLv2"
FILESEXTRAPATHS_prepend := "${THISDIR}/files:" FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
SRC_URI += " \ SRC_URI += " file://docker.init"
file://docker.init \
file://S49cgroups_mount.sh \
"
do_install_append () {
install -d ${D}${sysconfdir}/
install -d ${D}${sysconfdir}/rcS.d/
install -m 0755 ${WORKDIR}/S49cgroups_mount.sh ${D}${sysconfdir}/rcS.d/
cd ${D}${sysconfdir}/rcS.d/
ln -s ../init.d/docker.init S50docker.sh
}

View File

@ -0,0 +1,28 @@
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
#file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
SRC_URI += " \
file://S20load_modules.sh \
file://S49cgroups_mount.sh \
file://ntp.conf \
file://ntpd \
"
do_install_append () {
install -d ${D}${sysconfdir}/
install -d ${D}${sysconfdir}/rcS.d/
install -d ${D}${sysconfdir}/init.d/
install -m 0644 ${WORKDIR}/ntp.conf ${D}${sysconfdir}
install -m 0755 ${WORKDIR}/ntpd ${D}${sysconfdir}/init.d/
install -m 0755 ${WORKDIR}/S20load_modules.sh ${D}${sysconfdir}/rcS.d/
install -m 0755 ${WORKDIR}/S49cgroups_mount.sh ${D}${sysconfdir}/rcS.d/
cd ${D}${sysconfdir}/rcS.d/
ln -s ../init.d/networking S40networking.sh
ln -s ../init.d/ntpd S48ntpd.sh
ln -s ../init.d/docker.init S50docker.sh
}

View File

@ -1,19 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:" FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
SRC_URI += " \ SRC_URI += " file://fragments.cfg"
file://S20load_modules.sh \
file://fragments.cfg \
file://ntp.conf \
file://ntpd \
"
do_install_append () {
install -d ${D}${sysconfdir}/rcS.d/
install -m 0644 ${WORKDIR}/ntp.conf ${D}${sysconfdir}
install -m 0755 ${WORKDIR}/ntpd ${D}${sysconfdir}/init.d/
install -m 0755 ${WORKDIR}/S20load_modules.sh ${D}${sysconfdir}/rcS.d/
cd ${D}${sysconfdir}/rcS.d/
ln -s ../init.d/ntpd S48ntpd.sh
}

View File

@ -40,7 +40,6 @@ EXTRA_TOOLS_INSTALL = " \
e2fsprogs-mke2fs \ e2fsprogs-mke2fs \
ethtool \ ethtool \
findutils \ findutils \
htop \
i2c-tools \ i2c-tools \
less \ less \
mc \ mc \

View File

@ -6,5 +6,9 @@ require tiny-image-base.inc
IMAGE_INSTALL_append = " initscripts init-ifupdown docker-ce" IMAGE_INSTALL_append = " initscripts init-ifupdown docker-ce"
EXTRA_USERS_PARAMS += " \
usermod -a -G docker tkl \
"
export IMAGE_BASENAME = "docker-image" export IMAGE_BASENAME = "docker-image"

View File

@ -5,6 +5,7 @@ require users.inc
IMAGE_FEATURES += "package-management" IMAGE_FEATURES += "package-management"
CORE_OS = " \ CORE_OS = " \
busybox-initcfg \
openssh \ openssh \
openssh-keygen \ openssh-keygen \
openssh-sftp-server \ openssh-sftp-server \
@ -31,7 +32,6 @@ IMAGE_INSTALL += " \
" "
IMAGE_INSTALL_append_beaglebone-yocto = " linux-firmware-rtl8192cu" IMAGE_INSTALL_append_beaglebone-yocto = " linux-firmware-rtl8192cu"
#IMAGE_INSTALL_append_raspberrypi3_64 += " linux-firmware-bcm43430"
IMAGE_INSTALL_append_bananapi-m3 += " linux-firmware-bcm43430" IMAGE_INSTALL_append_bananapi-m3 += " linux-firmware-bcm43430"
set_local_timezone() { set_local_timezone() {
@ -45,5 +45,5 @@ disable_bootlogd() {
ROOTFS_POSTPROCESS_COMMAND += " \ ROOTFS_POSTPROCESS_COMMAND += " \
set_local_timezone ; \ set_local_timezone ; \
disable_bootlogd ; \ disable_bootlogd ; \
" "

View File

@ -1,8 +1,2 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:" FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
do_install_append () {
mkdir -p ${D}${sysconfdir}/rcS.d/
cd ${D}${sysconfdir}/rcS.d/
ln -s ../init.d/networking S40networking.sh
}