From c681701c27b6c477668094938bcf7f95a7c97949 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Wed, 30 Jan 2019 13:51:51 +0100 Subject: [PATCH] busybox: remove busybox-static-nodes initscript This script was added a long time ago and it never gets used anymore, so remove it from our images. Signed-off-by: Gabriel Valcazar --- .../busybox-1.27.2/busybox-static-nodes | 25 ------------------- .../busybox/busybox_1.27.2.bbappend | 11 -------- .../recipes-core/images/dey-image-tiny.bb | 1 - .../initscripts-1.0/device_table.txt | 9 ------- .../initscripts/initscripts_1.0.bbappend | 4 +-- .../packagegroups/packagegroup-dey-core.bb | 1 - 6 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 meta-digi-dey/recipes-core/busybox/busybox-1.27.2/busybox-static-nodes delete mode 100644 meta-digi-dey/recipes-core/initscripts/initscripts-1.0/device_table.txt diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.27.2/busybox-static-nodes b/meta-digi-dey/recipes-core/busybox/busybox-1.27.2/busybox-static-nodes deleted file mode 100644 index 3f04d8061..000000000 --- a/meta-digi-dey/recipes-core/busybox/busybox-1.27.2/busybox-static-nodes +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -#=============================================================================== -# -# busybox-static-nodes -# -# Copyright (C) 2013 by Digi International Inc. -# All rights reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 as published by -# the Free Software Foundation. -# -# !Description: make static device nodes from device table -# -#=============================================================================== - -set -e - -MAKEDEVS="/sbin/makedevs" -DEVICE_TABLE_CFG="/etc/device_table" - -# Create static device nodes via configuration file. -if [ -f "${DEVICE_TABLE_CFG}" ]; then - ${MAKEDEVS} -d "${DEVICE_TABLE_CFG}" / >/dev/null 2>&1 -fi diff --git a/meta-digi-dey/recipes-core/busybox/busybox_1.27.2.bbappend b/meta-digi-dey/recipes-core/busybox/busybox_1.27.2.bbappend index 8b8c01966..343e5a8bb 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox_1.27.2.bbappend +++ b/meta-digi-dey/recipes-core/busybox/busybox_1.27.2.bbappend @@ -10,7 +10,6 @@ SRC_URI += "file://standby \ file://acpid.map \ file://pswitch-standby \ file://pswitch-poweroff \ - file://busybox-static-nodes \ file://bridgeifupdown \ " @@ -36,13 +35,6 @@ INITSCRIPT_NAME_${PN}-acpid = "busybox-acpid" # Start busybox-syslog at a very early state INITSCRIPT_PARAMS_${PN}-syslog = "defaults 02" -# static-nodes package (create static nodes from /etc/device_table) -PACKAGES =+ "${PN}-static-nodes" -FILES_${PN}-static-nodes = "${sysconfdir}/init.d/busybox-static-nodes" -INITSCRIPT_PACKAGES =+ "${PN}-static-nodes" -INITSCRIPT_NAME_${PN}-static-nodes = "busybox-static-nodes" -INITSCRIPT_PARAMS_${PN}-static-nodes = "start 07 S ." - do_install_append() { if grep "CONFIG_NTPD=y" ${WORKDIR}/defconfig; then install -m 0755 ${WORKDIR}/busybox-ntpd ${D}${sysconfdir}/init.d/ @@ -62,9 +54,6 @@ do_install_append() { install -m 0755 ${WORKDIR}/pswitch-standby ${D}${sysconfdir}/acpi/ install -m 0755 ${WORKDIR}/pswitch-poweroff ${D}${sysconfdir}/acpi/ fi - if grep "CONFIG_MAKEDEVS=y" ${WORKDIR}/defconfig; then - install -m 0755 ${WORKDIR}/busybox-static-nodes ${D}${sysconfdir}/init.d/ - fi # Install bridgeifupdown script if grep "CONFIG_BRCTL" ${WORKDIR}/defconfig; then diff --git a/meta-digi-dey/recipes-core/images/dey-image-tiny.bb b/meta-digi-dey/recipes-core/images/dey-image-tiny.bb index 37eec7a8d..c69cc2667 100644 --- a/meta-digi-dey/recipes-core/images/dey-image-tiny.bb +++ b/meta-digi-dey/recipes-core/images/dey-image-tiny.bb @@ -7,7 +7,6 @@ IMAGE_INSTALL= "\ base-files \ base-passwd \ busybox \ - busybox-static-nodes \ sysvinit \ initscripts \ ${CORE_IMAGE_EXTRA_INSTALL} \ diff --git a/meta-digi-dey/recipes-core/initscripts/initscripts-1.0/device_table.txt b/meta-digi-dey/recipes-core/initscripts/initscripts-1.0/device_table.txt deleted file mode 100644 index 2552aa924..000000000 --- a/meta-digi-dey/recipes-core/initscripts/initscripts-1.0/device_table.txt +++ /dev/null @@ -1,9 +0,0 @@ -# -# GPIO device nodes (LED2 and BUTTON2) -# -/dev/gpio d 755 0 0 -/dev/gpio/1 c 644 0 0 240 1 -/dev/gpio/73 c 644 0 0 240 73 -/dev/gpio/97 c 644 0 0 240 97 -/dev/gpio/100 c 644 0 0 240 100 -/dev/gpio/204 c 644 0 0 240 204 diff --git a/meta-digi-dey/recipes-core/initscripts/initscripts_1.0.bbappend b/meta-digi-dey/recipes-core/initscripts/initscripts_1.0.bbappend index d803b5e8e..fcf006540 100644 --- a/meta-digi-dey/recipes-core/initscripts/initscripts_1.0.bbappend +++ b/meta-digi-dey/recipes-core/initscripts/initscripts_1.0.bbappend @@ -2,15 +2,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:" -SRC_URI += "file://device_table.txt \ - file://devtmpfs.sh" +SRC_URI += "file://devtmpfs.sh" SRC_URI_append_ccimx6ul = " file://caam_jr0_wakeup.sh" do_install_append() { install -m 755 ${WORKDIR}/devtmpfs.sh ${D}${sysconfdir}/init.d/devtmpfs.sh update-rc.d -r ${D} devtmpfs.sh start 03 S . - install -m 0755 ${WORKDIR}/device_table.txt ${D}${sysconfdir}/device_table } do_install_append_ccimx6ul() { diff --git a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb index ff26058ea..4df207044 100644 --- a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb +++ b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb @@ -31,7 +31,6 @@ RDEPENDS_${PN} = "\ base-passwd \ busybox \ busybox-acpid \ - busybox-static-nodes \ cloudconnector \ ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "rtc", "busybox-hwclock", "", d)} \