diff options
| author | Jason Reiss <jreiss@multitech.com> | 2017-12-07 13:00:13 -0600 |
|---|---|---|
| committer | Jason Reiss <jreiss@multitech.com> | 2017-12-07 13:00:13 -0600 |
| commit | 1901776e11f1a5facdc5c615e4d24d5ca3eb3251 (patch) | |
| tree | 311a2ac9d26e3af5bf1c72f02212862c1851a9bc | |
| parent | 49a90a1ecb9bbd90947d3bef330ffa410ce84618 (diff) | |
| parent | 120104ca113b9942852e363a7d32e0702a6d62cc (diff) | |
| download | meta-mlinux-1901776e11f1a5facdc5c615e4d24d5ca3eb3251.tar.gz meta-mlinux-1901776e11f1a5facdc5c615e4d24d5ca3eb3251.tar.bz2 meta-mlinux-1901776e11f1a5facdc5c615e4d24d5ca3eb3251.zip | |
Merge branch '3' of gitlab.multitech.net:mirrors/meta-mlinux into 3
| -rw-r--r-- | conf/distro/mlinux.conf | 2 | ||||
| -rw-r--r-- | recipes-core/images/mlinux-minimal-image.bb | 1 | ||||
| -rw-r--r-- | recipes-core/multitech/config/config.init | 5 | ||||
| -rw-r--r-- | recipes-core/multitech/config_2.0.bb | 40 |
4 files changed, 47 insertions, 1 deletions
diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf index 91ddc55..a8ee8fc 100644 --- a/conf/distro/mlinux.conf +++ b/conf/distro/mlinux.conf @@ -1,7 +1,7 @@ DISTRO = "mlinux" DISTRO_NAME = "mLinux" DISTRO_BASE_VERSION = "3.3" -DISTRO_VERSION = "${DISTRO_BASE_VERSION}.17" +DISTRO_VERSION = "${DISTRO_BASE_VERSION}.18" DISTRO_CODENAME = "" SDK_VENDOR = "-mlinux" SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" diff --git a/recipes-core/images/mlinux-minimal-image.bb b/recipes-core/images/mlinux-minimal-image.bb index 2f2d61b..29af92c 100644 --- a/recipes-core/images/mlinux-minimal-image.bb +++ b/recipes-core/images/mlinux-minimal-image.bb @@ -18,6 +18,7 @@ CORE_FEATURES = "packagegroup-core-boot packagegroup-distro-base \ start-stop-daemon \ ${CORE_IMAGE_EXTRA_INSTALL} \ mlinux-feed-configs \ + get-eeprom-device-info \ " NETWORKING_FEATURES = "ppp curl iproute2 \ diff --git a/recipes-core/multitech/config/config.init b/recipes-core/multitech/config/config.init index 5046050..ad36c2e 100644 --- a/recipes-core/multitech/config/config.init +++ b/recipes-core/multitech/config/config.init @@ -3,6 +3,7 @@ CONFIG_MTDC=/dev/mtd6 CONFIG_MTDB=/dev/mtdblock6 CONFIG_DIR=/var/config +RUN_CONF_DIR=/run/config OEM_MTDC=/dev/mtd7 OEM_MTDB=/dev/mtdblock7 @@ -60,6 +61,10 @@ mount_oem() { case $1 in start) + if ! [[ -f /run/config/device_info.json ]] ; then + [[ -d /run/config ]] || mkdir -m 755 -p /run/config + /sbin/get-eeprom-device-info + fi # mount config if not already mounted if ! grep -q "^${CONFIG_MTDB} " /proc/mounts; then mount_config diff --git a/recipes-core/multitech/config_2.0.bb b/recipes-core/multitech/config_2.0.bb new file mode 100644 index 0000000..5137206 --- /dev/null +++ b/recipes-core/multitech/config_2.0.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "Provides default system config files and /var/config fs" +SECTION = "base" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +PR = "r0" + +inherit update-rc.d + +INITSCRIPT_NAME = "config" +INITSCRIPT_PARAMS = "start 31 S ." + +SRC_URI = "\ + file://network \ + file://ppp \ + file://config.init \ +" + +CONFIGFILES = "network ppp" + +fakeroot do_install () { + cd ${WORKDIR} + + # default config files + rm -f defaults.tar.gz + chown root:root -R ${CONFIGFILES} + tar czf defaults.tar.gz ${CONFIGFILES} + install -d ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/defaults.tar.gz ${D}${sysconfdir}/defaults.tar.gz + + # save root password for resetting to defaults + echo -n '${ROOT_PASSWORD_HASH}' > ${D}${sysconfdir}/default_pass + chmod 400 ${D}${sysconfdir}/default_pass + + # init script + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/config.init ${D}${sysconfdir}/init.d/config +} + +FILES_${PN} = "${sysconfdir}/defaults.tar.gz ${sysconfdir}/default_pass" +FILES_${PN} += "${sysconfdir}/init.d/config" |