From 14bf87bc4cf2c389c624ffdb1a6d09c24e3ab9d0 Mon Sep 17 00:00:00 2001 From: Jeff Hatch Date: Mon, 13 Feb 2017 14:34:48 -0600 Subject: Initial commit of Yocto 2.1 changes --- .../hostapd/hostap-daemon_1.0.bbappend | 8 -------- recipes-connectivity/openssh/openssh_%.bbappend | 21 +++++++++++++++++++++ recipes-connectivity/openssh/openssh_6.5p1.bbappend | 21 --------------------- recipes-connectivity/openssl/openssl.inc | 4 ++-- recipes-connectivity/ppp/ppp_2.4.7.bb | 2 +- 5 files changed, 24 insertions(+), 32 deletions(-) delete mode 100644 recipes-connectivity/hostapd/hostap-daemon_1.0.bbappend create mode 100644 recipes-connectivity/openssh/openssh_%.bbappend delete mode 100644 recipes-connectivity/openssh/openssh_6.5p1.bbappend (limited to 'recipes-connectivity') diff --git a/recipes-connectivity/hostapd/hostap-daemon_1.0.bbappend b/recipes-connectivity/hostapd/hostap-daemon_1.0.bbappend deleted file mode 100644 index 48af903..0000000 --- a/recipes-connectivity/hostapd/hostap-daemon_1.0.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" - -SRC_URI += "file://default" - -do_install_append() { - mkdir -p ${D}${sysconfdir}/default - install -m 644 ${WORKDIR}/default ${D}${sysconfdir}/default/hostapd -} diff --git a/recipes-connectivity/openssh/openssh_%.bbappend b/recipes-connectivity/openssh/openssh_%.bbappend new file mode 100644 index 0000000..87891c8 --- /dev/null +++ b/recipes-connectivity/openssh/openssh_%.bbappend @@ -0,0 +1,21 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://ssh.default" + +KEYFILES = "ssh_host_dsa_key \ +ssh_host_dsa_key.pub \ +ssh_host_ecdsa_key \ +ssh_host_ecdsa_key.pub \ +ssh_host_rsa_key \ +ssh_host_rsa_key.pub \ +ssh_host_ed25519_key \ +ssh_host_ed25519_key.pub \ +" + +do_install_append() { + install -d ${D}${sysconfdir}/default + install -m 644 ${WORKDIR}/ssh.default ${D}${sysconfdir}/default/ssh + for f in ${KEYFILES}; do + ln -sf /var/config/ssh/$f ${D}${sysconfdir}/ssh/$f + done +} diff --git a/recipes-connectivity/openssh/openssh_6.5p1.bbappend b/recipes-connectivity/openssh/openssh_6.5p1.bbappend deleted file mode 100644 index 87891c8..0000000 --- a/recipes-connectivity/openssh/openssh_6.5p1.bbappend +++ /dev/null @@ -1,21 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://ssh.default" - -KEYFILES = "ssh_host_dsa_key \ -ssh_host_dsa_key.pub \ -ssh_host_ecdsa_key \ -ssh_host_ecdsa_key.pub \ -ssh_host_rsa_key \ -ssh_host_rsa_key.pub \ -ssh_host_ed25519_key \ -ssh_host_ed25519_key.pub \ -" - -do_install_append() { - install -d ${D}${sysconfdir}/default - install -m 644 ${WORKDIR}/ssh.default ${D}${sysconfdir}/default/ssh - for f in ${KEYFILES}; do - ln -sf /var/config/ssh/$f ${D}${sysconfdir}/ssh/$f - done -} diff --git a/recipes-connectivity/openssl/openssl.inc b/recipes-connectivity/openssl/openssl.inc index 3b59e96..7533e8a 100644 --- a/recipes-connectivity/openssl/openssl.inc +++ b/recipes-connectivity/openssl/openssl.inc @@ -8,8 +8,8 @@ SECTION = "libs/network" LICENSE = "openssl" LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" -# DEPENDS = "makedepend-native hostperl-runtime-native" -DEPENDS = "makedepend-native perl-native-runtime" +DEPENDS = "makedepend-native hostperl-runtime-native" +#DEPENDS = "makedepend-native perl-native-runtime" DEPENDS_append_class-target = " openssl-native" SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ diff --git a/recipes-connectivity/ppp/ppp_2.4.7.bb b/recipes-connectivity/ppp/ppp_2.4.7.bb index 881c40e..4d9094c 100644 --- a/recipes-connectivity/ppp/ppp_2.4.7.bb +++ b/recipes-connectivity/ppp/ppp_2.4.7.bb @@ -34,7 +34,7 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ SRC_URI[md5sum] = "78818f40e6d33a1d1de68a1551f6595a" SRC_URI[sha256sum] = "02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30" -inherit autotools +inherit autotools-brokensep TARGET_CC_ARCH += " ${LDFLAGS}" EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}${includedir} LIBDIR=${D}${libdir}/pppd/${PV} BINDIR=${D}${sbindir}" -- cgit v1.2.3