diff --git a/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-network.bb b/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-network.bb index 4eb53f084..4b64304f1 100644 --- a/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-network.bb +++ b/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-network.bb @@ -17,8 +17,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" # Distro can override the following VIRTUAL-RUNTIME providers: -VIRTUAL-RUNTIME_ftp-server ?= "" -#VIRTUAL-RUNTIME_ftp-server ?= "vsftpd" +VIRTUAL-RUNTIME_ftp-server ?= "vsftpd" VIRTUAL-RUNTIME_http-server ?= "" #VIRTUAL-RUNTIME_http-server ?= "cherokee" diff --git a/meta-digi-del/recipes-connectivity/vsftpd/files/init b/meta-digi-del/recipes-connectivity/vsftpd/files/init new file mode 100755 index 000000000..0b035dbe8 --- /dev/null +++ b/meta-digi-del/recipes-connectivity/vsftpd/files/init @@ -0,0 +1,53 @@ +#!/bin/sh +#=============================================================================== +# +# vsftpd +# +# 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: vsftpd bootscript +# +#=============================================================================== + +set -e + +daemon="/usr/sbin/vsftpd" +pidfile="/var/run/vsftpd.pid" + +[ -x "${daemon}" ] || exit 0 + +# Required directories +[ -d /var/run ] || install -m 755 -o root -g root -d /var/run +[ -d /var/lib/ftp ] || install -m 755 -o root -g ftp -d /var/lib/ftp +[ -d /var/share/empty ] || install -m 755 -o root -g root -d /var/share/empty + +case "${1}" in +start) + [ -z "${quietboot}" ] && echo -n "Starting vsftpd server: " + if [ -s "${pidfile}" ]; then + pid="$(cat ${pidfile})" + if kill -0 "${pid}" 2>/dev/null; then + [ -z "${quietboot}" ] && echo " already running." + exit 0 + fi + fi + start-stop-daemon -S -b -m -p "${pidfile}" -x "${daemon}" + [ -z "${quietboot}" ] && echo "OK" + ;; +stop) + echo -n "Stopping vsftpd server: " + start-stop-daemon -K -q -p "${pidfile}" + rm "${pidfile}" + echo "OK" + ;; +*) + echo "Usage: $0 {start|stop}" + exit 1 + ;; +esac diff --git a/meta-digi-del/recipes-connectivity/vsftpd/files/vsftpd.conf b/meta-digi-del/recipes-connectivity/vsftpd/files/vsftpd.conf new file mode 100644 index 000000000..ac1ed380b --- /dev/null +++ b/meta-digi-del/recipes-connectivity/vsftpd/files/vsftpd.conf @@ -0,0 +1,20 @@ +####################################### +## vsftpd.conf +####################################### +listen=YES +write_enable=YES +local_enable=YES + +anonymous_enable=YES +anon_mkdir_write_enable=YES +anon_other_write_enable=YES +anon_root=/ +anon_upload_enable=YES +no_anon_password=YES + +dirmessage_enable=YES +xferlog_enable=YES +connect_from_port_20=YES +file_open_mode=0777 +local_umask=022 +anon_umask=022 diff --git a/meta-digi-del/recipes-connectivity/vsftpd/vsftpd_2.3.5.bbappend b/meta-digi-del/recipes-connectivity/vsftpd/vsftpd_2.3.5.bbappend index defc4b134..58e77de28 100644 --- a/meta-digi-del/recipes-connectivity/vsftpd/vsftpd_2.3.5.bbappend +++ b/meta-digi-del/recipes-connectivity/vsftpd/vsftpd_2.3.5.bbappend @@ -1,4 +1,7 @@ -PR_del = "r0+${DISTRO}.0" -DEPENDS_append_del += "openssl" -LDFLAGS_del = "-lcap" +FILESEXTRAPATHS_prepend := "${THISDIR}/files" +PR_append = "+${DISTRO}.r0" +DEPENDS += "openssl" + +# Inhibit warning about files already stripped +INHIBIT_PACKAGE_DEBUG_SPLIT = "1"