diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-04-06 17:23:47 +0200 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-04-06 17:23:47 +0200 |
commit | 708ca9c597269eff78941558228fa596378548b7 (patch) | |
tree | 4de1051373e0c656ce48432a3500cc50a87b3591 /recipes-connectivity/openssh/openssh | |
parent | 2c7ba109910c171acea3561746f8ee37dc6de361 (diff) |
openssh: clean-up double folder nesting
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'recipes-connectivity/openssh/openssh')
-rw-r--r-- | recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch (renamed from recipes-connectivity/openssh/openssh/openssh/add-test-support-for-busybox.patch) | 0 | ||||
-rw-r--r-- | recipes-connectivity/openssh/openssh/init (renamed from recipes-connectivity/openssh/openssh/openssh/init) | 0 | ||||
-rw-r--r-- | recipes-connectivity/openssh/openssh/openssh_6.8p1.bb | 148 | ||||
-rwxr-xr-x | recipes-connectivity/openssh/openssh/run-ptest (renamed from recipes-connectivity/openssh/openssh/openssh/run-ptest) | 0 | ||||
-rw-r--r-- | recipes-connectivity/openssh/openssh/ssh_config (renamed from recipes-connectivity/openssh/openssh/openssh/ssh_config) | 0 | ||||
-rw-r--r-- | recipes-connectivity/openssh/openssh/sshd (renamed from recipes-connectivity/openssh/openssh/openssh/sshd) | 0 | ||||
-rw-r--r-- | recipes-connectivity/openssh/openssh/sshd.socket (renamed from recipes-connectivity/openssh/openssh/openssh/sshd.socket) | 0 | ||||
-rw-r--r-- | recipes-connectivity/openssh/openssh/sshd@.service (renamed from recipes-connectivity/openssh/openssh/openssh/sshd@.service) | 0 | ||||
-rw-r--r-- | recipes-connectivity/openssh/openssh/sshd_config (renamed from recipes-connectivity/openssh/openssh/openssh/sshd_config) | 0 | ||||
-rw-r--r-- | recipes-connectivity/openssh/openssh/sshdgenkeys.service (renamed from recipes-connectivity/openssh/openssh/openssh/sshdgenkeys.service) | 0 | ||||
-rw-r--r-- | recipes-connectivity/openssh/openssh/volatiles.99_sshd (renamed from recipes-connectivity/openssh/openssh/openssh/volatiles.99_sshd) | 0 |
11 files changed, 0 insertions, 148 deletions
diff --git a/recipes-connectivity/openssh/openssh/openssh/add-test-support-for-busybox.patch b/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch index adc25c6..adc25c6 100644 --- a/recipes-connectivity/openssh/openssh/openssh/add-test-support-for-busybox.patch +++ b/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch diff --git a/recipes-connectivity/openssh/openssh/openssh/init b/recipes-connectivity/openssh/openssh/init index 70d4a34..70d4a34 100644 --- a/recipes-connectivity/openssh/openssh/openssh/init +++ b/recipes-connectivity/openssh/openssh/init diff --git a/recipes-connectivity/openssh/openssh/openssh_6.8p1.bb b/recipes-connectivity/openssh/openssh/openssh_6.8p1.bb deleted file mode 100644 index b00ef6f..0000000 --- a/recipes-connectivity/openssh/openssh/openssh_6.8p1.bb +++ /dev/null @@ -1,148 +0,0 @@ -SUMMARY = "Secure rlogin/rsh/rcp/telnet replacement" -DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH) \ -Ssh (Secure Shell) is a program for logging into a remote machine \ -and for executing commands on a remote machine." -HOMEPAGE = "http://openssh.org" -SECTION = "console/network" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507" - -DEPENDS = "zlib openssl" -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" - -SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ - file://sshd_config \ - file://ssh_config \ - file://init \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ - file://sshd.socket \ - file://sshd@.service \ - file://sshdgenkeys.service \ - file://volatiles.99_sshd \ - file://add-test-support-for-busybox.patch \ - file://run-ptest" - -PAM_SRC_URI = "file://sshd" - -SRC_URI[md5sum] = "08f72de6751acfbd0892b5f003922701" -SRC_URI[sha256sum] = "3ff64ce73ee124480b5bf767b9830d7d3c03bbcb6abe716b78f0192c37ce160e" - -inherit useradd update-rc.d update-alternatives systemd - -USERADD_PACKAGES = "${PN}-sshd" -USERADD_PARAM_${PN}-sshd = "--system --no-create-home --home-dir /var/run/sshd --shell /bin/false --user-group sshd" -INITSCRIPT_PACKAGES = "${PN}-sshd" -INITSCRIPT_NAME_${PN}-sshd = "sshd" -INITSCRIPT_PARAMS_${PN}-sshd = "defaults 9" - -SYSTEMD_PACKAGES = "${PN}-sshd" -SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket" - -inherit autotools-brokensep ptest - -# LFS support: -CFLAGS += "-D__FILE_OFFSET_BITS=64" - -# login path is hardcoded in sshd -EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ - --without-zlib-version-check \ - --with-privsep-path=/var/run/sshd \ - --sysconfdir=${sysconfdir}/ssh \ - --with-xauth=/usr/bin/xauth \ - --disable-strip \ - " - -# Since we do not depend on libbsd, we do not want configure to use it -# just because it finds libutil.h. But, specifying --disable-libutil -# causes compile errors, so... -CACHED_CONFIGUREVARS += "ac_cv_header_bsd_libutil_h=no ac_cv_header_libutil_h=no" - -# passwd path is hardcoded in sshd -CACHED_CONFIGUREVARS += "ac_cv_path_PATH_PASSWD_PROG=${bindir}/passwd" - -# We don't want to depend on libblockfile -CACHED_CONFIGUREVARS += "ac_cv_header_maillock_h=no" - -# This is a workaround for uclibc because including stdio.h -# pulls in pthreads.h and causes conflicts in function prototypes. -# This results in compilation failure, so unless this is fixed, -# disable pam for uclibc. -EXTRA_OECONF_append_libc-uclibc=" --without-pam" - -do_configure_prepend () { - export LD="${CC}" - install -m 0644 ${WORKDIR}/sshd_config ${B}/ - install -m 0644 ${WORKDIR}/ssh_config ${B}/ - if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then - cp aclocal.m4 acinclude.m4 - fi -} - -do_install_append () { - if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then - install -D -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd - sed -i -e 's:#UsePAM no:UsePAM yes:' ${WORKDIR}/sshd_config ${D}${sysconfdir}/ssh/sshd_config - fi - - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd - rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin - rmdir ${D}${localstatedir}/run/sshd ${D}${localstatedir}/run ${D}${localstatedir} - install -d ${D}/${sysconfdir}/default/volatiles - install -m 644 ${WORKDIR}/volatiles.99_sshd ${D}/${sysconfdir}/default/volatiles/99_sshd - install -m 0755 ${S}/contrib/ssh-copy-id ${D}${bindir} - - # Create config files for read-only rootfs - install -d ${D}${sysconfdir}/ssh - install -m 644 ${D}${sysconfdir}/ssh/sshd_config ${D}${sysconfdir}/ssh/sshd_config_readonly - sed -i '/HostKey/d' ${D}${sysconfdir}/ssh/sshd_config_readonly - echo "HostKey /var/run/ssh/ssh_host_rsa_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly - echo "HostKey /var/run/ssh/ssh_host_dsa_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly - echo "HostKey /var/run/ssh/ssh_host_ecdsa_key" >> ${D}${sysconfdir}/ssh/sshd_config_readonly - - install -d ${D}${systemd_unitdir}/system - install -c -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system - install -c -m 0644 ${WORKDIR}/sshd@.service ${D}${systemd_unitdir}/system - install -c -m 0644 ${WORKDIR}/sshdgenkeys.service ${D}${systemd_unitdir}/system - sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ - -e 's,@SBINDIR@,${sbindir},g' \ - -e 's,@BINDIR@,${bindir},g' \ - ${D}${systemd_unitdir}/system/sshd.socket ${D}${systemd_unitdir}/system/*.service -} - -do_install_ptest () { - sed -i -e "s|^SFTPSERVER=.*|SFTPSERVER=${libdir}/${PN}/sftp-server|" regress/test-exec.sh - cp -r regress ${D}${PTEST_PATH} -} - -ALLOW_EMPTY_${PN} = "1" - -PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server" -FILES_${PN}-scp = "${bindir}/scp.${BPN}" -FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config" -FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd ${systemd_unitdir}/system" -FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly ${sysconfdir}/default/volatiles/99_sshd ${sysconfdir}/pam.d/sshd" -FILES_${PN}-sftp = "${bindir}/sftp" -FILES_${PN}-sftp-server = "${libexecdir}/sftp-server" -FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*" -FILES_${PN}-keygen = "${bindir}/ssh-keygen" - -RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" -RDEPENDS_${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}" -RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make" - -RPROVIDES_${PN}-ssh = "ssh" -RPROVIDES_${PN}-sshd = "sshd" - -RCONFLICTS_${PN} = "dropbear" -RCONFLICTS_${PN}-sshd = "dropbear" -RCONFLICTS_${PN}-keygen = "ssh-keygen" - -CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config" -CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config" - -ALTERNATIVE_PRIORITY = "90" -ALTERNATIVE_${PN}-scp = "scp" -ALTERNATIVE_${PN}-ssh = "ssh" - diff --git a/recipes-connectivity/openssh/openssh/openssh/run-ptest b/recipes-connectivity/openssh/openssh/run-ptest index 3e725cf..3e725cf 100755 --- a/recipes-connectivity/openssh/openssh/openssh/run-ptest +++ b/recipes-connectivity/openssh/openssh/run-ptest diff --git a/recipes-connectivity/openssh/openssh/openssh/ssh_config b/recipes-connectivity/openssh/openssh/ssh_config index 9e91915..9e91915 100644 --- a/recipes-connectivity/openssh/openssh/openssh/ssh_config +++ b/recipes-connectivity/openssh/openssh/ssh_config diff --git a/recipes-connectivity/openssh/openssh/openssh/sshd b/recipes-connectivity/openssh/openssh/sshd index 4882e58..4882e58 100644 --- a/recipes-connectivity/openssh/openssh/openssh/sshd +++ b/recipes-connectivity/openssh/openssh/sshd diff --git a/recipes-connectivity/openssh/openssh/openssh/sshd.socket b/recipes-connectivity/openssh/openssh/sshd.socket index 12c39b2..12c39b2 100644 --- a/recipes-connectivity/openssh/openssh/openssh/sshd.socket +++ b/recipes-connectivity/openssh/openssh/sshd.socket diff --git a/recipes-connectivity/openssh/openssh/openssh/sshd@.service b/recipes-connectivity/openssh/openssh/sshd@.service index bb2d68e..bb2d68e 100644 --- a/recipes-connectivity/openssh/openssh/openssh/sshd@.service +++ b/recipes-connectivity/openssh/openssh/sshd@.service diff --git a/recipes-connectivity/openssh/openssh/openssh/sshd_config b/recipes-connectivity/openssh/openssh/sshd_config index d48bd2b..d48bd2b 100644 --- a/recipes-connectivity/openssh/openssh/openssh/sshd_config +++ b/recipes-connectivity/openssh/openssh/sshd_config diff --git a/recipes-connectivity/openssh/openssh/openssh/sshdgenkeys.service b/recipes-connectivity/openssh/openssh/sshdgenkeys.service index d65086f..d65086f 100644 --- a/recipes-connectivity/openssh/openssh/openssh/sshdgenkeys.service +++ b/recipes-connectivity/openssh/openssh/sshdgenkeys.service diff --git a/recipes-connectivity/openssh/openssh/openssh/volatiles.99_sshd b/recipes-connectivity/openssh/openssh/volatiles.99_sshd index a0d2af3..a0d2af3 100644 --- a/recipes-connectivity/openssh/openssh/openssh/volatiles.99_sshd +++ b/recipes-connectivity/openssh/openssh/volatiles.99_sshd |