diff options
| author | Jason Reiss <jreiss@multitech.com> | 2017-11-10 09:26:57 -0600 |
|---|---|---|
| committer | Jason Reiss <jreiss@multitech.com> | 2017-11-10 09:26:57 -0600 |
| commit | 5d19c6273332d01159b56566f5d2373ee6793a1f (patch) | |
| tree | 57ac11352a58987997a4038815dd66803feddc79 | |
| parent | 9b3aedd8a16023768dbffc77aac80622ca6d263e (diff) | |
| parent | bff6f679c1a1cd5423d31671bef84c7a743c97fe (diff) | |
| download | meta-mlinux-5d19c6273332d01159b56566f5d2373ee6793a1f.tar.gz meta-mlinux-5d19c6273332d01159b56566f5d2373ee6793a1f.tar.bz2 meta-mlinux-5d19c6273332d01159b56566f5d2373ee6793a1f.zip | |
:xMerge branch '3' of gitlab.multitech.net:mirrors/meta-mlinux into 3
| -rw-r--r-- | recipes-connectivity/hostapd/hostap-daemon_2.6.bb | 2 | ||||
| -rw-r--r-- | recipes-connectivity/openssh/openssh_6.5p1.bbappend | 1 | ||||
| -rw-r--r-- | recipes-connectivity/ppp/ppp_%.bbappend | 3 | ||||
| -rw-r--r-- | recipes-extended/lighttpd/lighttpd_1.4.33.bbappend | 2 | ||||
| -rw-r--r-- | recipes-support/dnsmasq/dnsmasq.inc | 3 |
5 files changed, 7 insertions, 4 deletions
diff --git a/recipes-connectivity/hostapd/hostap-daemon_2.6.bb b/recipes-connectivity/hostapd/hostap-daemon_2.6.bb index e9e0f33..e9e0141 100644 --- a/recipes-connectivity/hostapd/hostap-daemon_2.6.bb +++ b/recipes-connectivity/hostapd/hostap-daemon_2.6.bb @@ -32,7 +32,7 @@ do_compile() { make } -CONFFILES_${PN} += "${sysconfdir}/hostapd.conf" +CONFFILES_${PN} += "${sysconfdir}/hostapd.conf ${sysconfdir}/modprobe.d/cfg80211.conf" SRC_URI[md5sum] = "eaa56dce9bd8f1d195eb62596eab34c7" SRC_URI[sha256sum] = "01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d" diff --git a/recipes-connectivity/openssh/openssh_6.5p1.bbappend b/recipes-connectivity/openssh/openssh_6.5p1.bbappend index 87891c8..53d3da1 100644 --- a/recipes-connectivity/openssh/openssh_6.5p1.bbappend +++ b/recipes-connectivity/openssh/openssh_6.5p1.bbappend @@ -19,3 +19,4 @@ do_install_append() { ln -sf /var/config/ssh/$f ${D}${sysconfdir}/ssh/$f done } +CONFFILES_${PN}-sshd += "${sysconfdir}/init.d/sshd" diff --git a/recipes-connectivity/ppp/ppp_%.bbappend b/recipes-connectivity/ppp/ppp_%.bbappend index 1c3a023..294933e 100644 --- a/recipes-connectivity/ppp/ppp_%.bbappend +++ b/recipes-connectivity/ppp/ppp_%.bbappend @@ -7,7 +7,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" FILES_${PN} += "/etc/default/ppp" -CONFFILES_${PN} += "${sysconfdir}/default/ppp" +# AEP compatibility +CONFFILES_${PN} += "${sysconfdir}/default/ppp ${sysconfdir}/init.d/ppp" do_install_append() { install -d -m 0755 ${D}/${sysconfdir}/default/ diff --git a/recipes-extended/lighttpd/lighttpd_1.4.33.bbappend b/recipes-extended/lighttpd/lighttpd_1.4.33.bbappend index 473a113..4187446 100644 --- a/recipes-extended/lighttpd/lighttpd_1.4.33.bbappend +++ b/recipes-extended/lighttpd/lighttpd_1.4.33.bbappend @@ -18,4 +18,4 @@ do_install_append() { install -m 0644 ${WORKDIR}/lighttpd.default ${D}${sysconfdir}/default/lighttpd } -CONFFILES_${PN} += "${sysconfdir}/default/lighttpd ${sysconfdir}/logrotate.d/lighttpd.conf" +CONFFILES_${PN} += "${sysconfdir}/default/lighttpd ${sysconfdir}/logrotate.d/lighttpd.conf ${sysconfdir}/init.d/lighttpd" diff --git a/recipes-support/dnsmasq/dnsmasq.inc b/recipes-support/dnsmasq/dnsmasq.inc index 9ef54fe..ad64477 100644 --- a/recipes-support/dnsmasq/dnsmasq.inc +++ b/recipes-support/dnsmasq/dnsmasq.inc @@ -75,7 +75,8 @@ do_install () { fi } -CONFFILES_${PN} = "${sysconfdir}/dnsmasq.conf" +# init.d/dnsmasq conflicts with AEP. +CONFFILES_${PN} = "${sysconfdir}/dnsmasq.conf ${sysconfdir}/init.d/dnsmasq" RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd" |