X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=blobdiff_plain;f=meta-openvuplus%2Frecipes-core%2Fbusybox%2Fbusybox_1.19.4.bbappend;h=cf4cd400b979d70f2f0188b3bfda36badf21422a;hp=94155cbe2137d17c50619726f5299354e0e491d2;hb=8875b4e95bc1f15c458d33664fe929e297de85a1;hpb=9ee8333445ef0abb65e95279e899dc0f98f27bd7

diff --git a/meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend b/meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend
index 94155cb..cf4cd40 100644
--- a/meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend
+++ b/meta-openvuplus/recipes-core/busybox/busybox_1.19.4.bbappend
@@ -1,8 +1,6 @@
-PR .= "-vuplus1"
+PR .= "-vuplus11"
 
-SRC_URI += "file://busybox-telnetd.xinetd.in \
-            file://busybox-telnetd@.service \
-            file://busybox-telnetd.socket \
+SRC_URI += " \
             file://0001-ifupdown-support-post-up-pre-down-hooks.patch \
             file://0002-ifupdown-code-shrink.patch \
             file://0003-ifupdown-remove-interface-from-state_list-if-iface_u.patch \
@@ -10,23 +8,35 @@ SRC_URI += "file://busybox-telnetd.xinetd.in \
             file://0005-ifupdown-improve-compatibility-with-Debian.patch \
             file://0006-get_linux_version_code-don-t-fail-on-3.0-foo.patch \
             file://0007-ifplugd-move-read_pid-to-libbb-pidfile.c-and-rename-.patch \
-            file://0008-ifupdown-dhcp_down-wait-until-udhcpc-has-been-killed.patch \
-            file://0009-udhcpc-calculate-broadcast-address-if-not-given-by-s.patch"
+            file://0009-udhcpc-calculate-broadcast-address-if-not-given-by-s.patch \
+            file://0010-udhcpc-obtain-hostname-from-OS-by-default.patch \
+            file://0011-mount-don-t-pass-option-auto-to-kernel.patch \
+            file://0001-work-around-linux-ext2_fs.h-breakage.patch \
+            file://0002-Create-and-use-our-own-copy-of-linux-ext2_fs.h.patch \
+            file://0003-Drop-include-bb_linux_ext2_fs.h-use-existing-e2fspro.patch \
+            file://mount_single_uuid.patch \
+            file://change-passwd-default-algorithm.patch \
+	    file://inetd \
+	    file://inetd.conf \
+"
+# 0008-ifupdown-dhcp_down-wait-until-udhcpc-has-been-killed.patch is removed. if patched, postdown is not working.(/etc/network/interfaces)
 
-inherit systemd xinetd
+DEPENDS += "mtd-utils"
+
+PACKAGES =+ "${PN}-inetd"
+INITSCRIPT_PACKAGES += "${PN}-inetd"
+INITSCRIPT_NAME_${PN}-inetd = "inetd.${BPN}"
+CONFFILES_${PN}-inetd = "${sysconfdir}/inetd.conf"
+FILES_${PN}-inetd = "${sysconfdir}/init.d/inetd.${BPN} ${sysconfdir}/inetd.conf"
+RDEPENDS_${PN}-inetd += "${PN}"
+
+RRECOMMENDS_${PN} += "${PN}-inetd"
 
 do_install_append() {
         if grep -q "CONFIG_CRONTAB=y" ${WORKDIR}/defconfig; then
                 install -d ${D}${sysconfdir}/cron/crontabs
         fi
-        install -d ${D}${systemd_unitdir}/system
-        ln -sf /dev/null ${D}${systemd_unitdir}/system/busybox-telnetd.service
 }
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
-SYSTEMD_PACKAGES += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "busybox-telnetd.socket"
-
-XINETD_PACKAGES = "${PN}-xinetd"
-XINETD_SERVICE_${PN}-xinetd = "busybox-telnetd"