diff options
Diffstat (limited to 'meta-oe/recipes-connectivity')
27 files changed, 203 insertions, 203 deletions
diff --git a/meta-oe/recipes-connectivity/bridge-utils/bridge-utils.inc b/meta-oe/recipes-connectivity/bridge-utils/bridge-utils.inc index 75bf2a90d7..3fc54ba995 100644 --- a/meta-oe/recipes-connectivity/bridge-utils/bridge-utils.inc +++ b/meta-oe/recipes-connectivity/bridge-utils/bridge-utils.inc @@ -10,19 +10,19 @@ inherit autotools EXTRA_OECONF = "--with-linux-headers=${STAGING_INCDIR}" do_install_append () { - mv ${D}${sbindir}/brctl ${D}${sbindir}/brctl.${PN} - install -d ${D}/${datadir}/bridge-utils - install -d ${D}/${sysconfdir}/network/if-pre-up.d - install -d ${D}/${sysconfdir}/network/if-post-down.d + mv ${D}${sbindir}/brctl ${D}${sbindir}/brctl.${PN} + install -d ${D}/${datadir}/bridge-utils + install -d ${D}/${sysconfdir}/network/if-pre-up.d + install -d ${D}/${sysconfdir}/network/if-post-down.d } DEPENDS = "sysfsutils" RRECOMMENDS_${PN} = "kernel-module-bridge" pkg_postinst_${PN} () { - update-alternatives --install ${sbindir}/brctl brctl brctl.${PN} 100 + update-alternatives --install ${sbindir}/brctl brctl brctl.${PN} 100 } pkg_prerm_${PN} () { - update-alternatives --remove brctl brctl.${PN} + update-alternatives --remove brctl brctl.${PN} } diff --git a/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb b/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb index 422ebdab40..6c030a635d 100644 --- a/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb +++ b/meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb @@ -21,17 +21,17 @@ inherit autotools pkgconfig binconfig update-rc.d systemd EXTRA_OECONF = "--disable-static \ --disable-nls \ ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ - " +" do_install_append () { - install -m 0755 -d ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/cherokee.init ${D}${sysconfdir}/init.d/cherokee + install -m 0755 -d ${D}${sysconfdir}/init.d + install -m 755 ${WORKDIR}/cherokee.init ${D}${sysconfdir}/init.d/cherokee - # clean up .la files for plugins - rm -f ${D}${libdir}/cherokee/*.la + # clean up .la files for plugins + rm -f ${D}${libdir}/cherokee/*.la - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/cherokee.service ${D}${systemd_unitdir}/system + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/cherokee.service ${D}${systemd_unitdir}/system } # Put -dev near the front so we can move the .la files into it with a wildcard @@ -45,7 +45,7 @@ FILES_libcherokee-base = "${libdir}/libcherokee-base${SOLIBS}" CONFFILES_${PN} = " \ ${sysconfdir}/cherokee/cherokee.conf \ ${sysconfdir}/init.d/cherokee \ - " +" INITSCRIPT_NAME = "cherokee" INITSCRIPT_PARAMS = "defaults 91 91" diff --git a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq-dbus_2.55.bb b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq-dbus_2.55.bb index 896952d53b..7d698c6c1d 100644 --- a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq-dbus_2.55.bb +++ b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq-dbus_2.55.bb @@ -8,6 +8,6 @@ DEPENDS = "dbus" EXTRA_OEMAKE = "COPTS=-DHAVE_DBUS" do_install_append () { - install -d ${D}${sysconfdir}/dbus-1/system.d - install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/ + install -d ${D}${sysconfdir}/dbus-1/system.d + install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/ } diff --git a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc index ef99f489c0..46188a4450 100644 --- a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc +++ b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc @@ -19,16 +19,16 @@ INITSCRIPT_NAME = "dnsmasq" INITSCRIPT_PARAMS = "defaults" do_install () { - oe_runmake "PREFIX=${D}${prefix}" \ - "BINDIR=${D}${bindir}" \ - "MANDIR=${D}${mandir}" \ - install - install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d - install -m 644 ${WORKDIR}/dnsmasq.conf ${D}${sysconfdir}/ - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq + oe_runmake "PREFIX=${D}${prefix}" \ + "BINDIR=${D}${bindir}" \ + "MANDIR=${D}${mandir}" \ + install + install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d + install -m 644 ${WORKDIR}/dnsmasq.conf ${D}${sysconfdir}/ + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system } CONFFILES_${PN} = "${sysconfdir}/dnsmasq.conf" diff --git a/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb b/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb index 3a2da3edc7..095a77c1c0 100644 --- a/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb +++ b/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb @@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a17cb0a873d252440acfdf9b3d0e7fbf" HOMEPAGE = "http://www.gammu.org/" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}/${PV}/${PN}-${PV}.tar.bz2 \ - file://gammurc \ - file://gammu-smsdrc \ - " + file://gammurc \ + file://gammu-smsdrc \ +" SRC_URI[md5sum] = "8ea16c6b3cc48097a8e62311fe0e25b9" SRC_URI[sha256sum] = "de67caa102aa4c8fbed5300e5a0262e40411c4cc79f4379a8d34eed797968fc3" @@ -16,34 +16,34 @@ SRC_URI[sha256sum] = "de67caa102aa4c8fbed5300e5a0262e40411c4cc79f4379a8d34eed797 inherit distutils cmake gettext do_install_append() { - # these files seem to only be used by symbian and trigger QA warnings - rm -rf ${D}/usr/share/gammu - #install default configuration files - install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/gammurc ${D}${sysconfdir}/gammurc - install -m 0644 ${WORKDIR}/gammu-smsdrc ${D}${sysconfdir}/gammu-smsdrc + # these files seem to only be used by symbian and trigger QA warnings + rm -rf ${D}/usr/share/gammu + #install default configuration files + install -d ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/gammurc ${D}${sysconfdir}/gammurc + install -m 0644 ${WORKDIR}/gammu-smsdrc ${D}${sysconfdir}/gammu-smsdrc } EXTRA_OECONF = " \ - --enable-shared \ - --enable-backup \ - --enable-protection \ - " + --enable-shared \ + --enable-backup \ + --enable-protection \ +" EXTRA_OECMAKE = " \ - -DWITH_CURL=OFF \ - -DWITH_BLUETOOTH=OFF \ - -DWITH_NOKIA_SUPPORT=OFF \ - -DWITH_IRDA=OFF \ - -DWITH_PYTHON=OFF \ - -DWITH_MySQL=ON \ - -DWITH_Postgres=OFF \ - " + -DWITH_CURL=OFF \ + -DWITH_BLUETOOTH=OFF \ + -DWITH_NOKIA_SUPPORT=OFF \ + -DWITH_IRDA=OFF \ + -DWITH_PYTHON=OFF \ + -DWITH_MySQL=ON \ + -DWITH_Postgres=OFF \ +" PACKAGES =+ "${PN}-smsd libgammu libgsmsd python-${PN}" FILES_${PN} = "${bindir}/gammu ${bindir}/jadmaker ${sysconfdir}/bash_completion.d/gammu \ - ${bindir}/gammu-detect ${sysconfdir}/gammurc" + ${bindir}/gammu-detect ${sysconfdir}/gammurc" CONFFILES_${PN} = "${sysconfdir}/gammurc" FILES_${PN}-smsd = "${bindir}/gammu-smsd* ${sysconfdir}/gammu-smsdrc" CONFFILES_${PN}-smsd = "${sysconfdir}/gammu-smsdrc" diff --git a/meta-oe/recipes-connectivity/gateone/gateone_git.bb b/meta-oe/recipes-connectivity/gateone/gateone_git.bb index 3552009781..39b4aff77e 100644 --- a/meta-oe/recipes-connectivity/gateone/gateone_git.bb +++ b/meta-oe/recipes-connectivity/gateone/gateone_git.bb @@ -10,7 +10,7 @@ SRC_URI = "git://github.com/liftoff/GateOne.git \ file://gateone-avahi.service \ file://server.conf \ file://gateone.service \ - " +" S = "${WORKDIR}/git" @@ -19,15 +19,15 @@ inherit distutils allarch python-dir systemd export prefix = "${localstatedir}/lib" do_install_append() { - install -d ${D}${localstatedir}/log/${BPN} + install -d ${D}${localstatedir}/log/${BPN} - install -m 0755 -d ${D}${sysconfdir}/avahi/services/ - install -m 0644 ${WORKDIR}/gateone-avahi.service ${D}${sysconfdir}/avahi/services/ + install -m 0755 -d ${D}${sysconfdir}/avahi/services/ + install -m 0644 ${WORKDIR}/gateone-avahi.service ${D}${sysconfdir}/avahi/services/ - install -m 0644 ${WORKDIR}/server.conf ${D}/var/lib/gateone/server.conf - - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/gateone.service ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/server.conf ${D}/var/lib/gateone/server.conf + + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/gateone.service ${D}${systemd_unitdir}/system } FILES_${PN} = "${localstatedir}/lib ${localstatedir}/log ${localstatedir}/volatile/log ${base_libdir} ${sysconfdir} ${PYTHON_SITEPACKAGES_DIR}" @@ -60,6 +60,6 @@ RDEPENDS_${PN} = "file \ python-tornado \ python-unixadmin \ python-xml \ - " +" SYSTEMD_SERVICE_${PN} = "gateone.service" diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb index efecc64a0e..edd4615aa4 100644 --- a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb +++ b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb @@ -26,25 +26,25 @@ RDEPENDS_${PN} = "python-core python-audio python-threading python-codecs \ python-compiler python-pkgutil python-pydoc python-mmap \ python-netclient python-difflib \ python-pprint python-numpy \ - " +" RDEPENDS_${PN}-grc = "python-pygtk python-lxml python-cheetah" C_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" do_configure_prepend() { - ${BUILD_CC} ${S}/gr-vocoder/lib/codec2/generate_codebook.c -o ${S}/gr-vocoder/lib/generate_codebook -lm - echo "ADD_EXECUTABLE(generate_codebook IMPORTED)" >${S}/gr-vocoder/lib/generate_codebook.txt - echo "SET_PROPERTY(TARGET generate_codebook APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)" >>${S}/gr-vocoder/lib/generate_codebook.txt - echo 'SET_TARGET_PROPERTIES(generate_codebook PROPERTIES IMPORTED_LOCATION_RELEASE "${S}/gr-vocoder/lib/generate_codebook")' >>${S}/gr-vocoder/lib/generate_codebook.txt + ${BUILD_CC} ${S}/gr-vocoder/lib/codec2/generate_codebook.c -o ${S}/gr-vocoder/lib/generate_codebook -lm + echo "ADD_EXECUTABLE(generate_codebook IMPORTED)" >${S}/gr-vocoder/lib/generate_codebook.txt + echo "SET_PROPERTY(TARGET generate_codebook APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)" >>${S}/gr-vocoder/lib/generate_codebook.txt + echo 'SET_TARGET_PROPERTIES(generate_codebook PROPERTIES IMPORTED_LOCATION_RELEASE "${S}/gr-vocoder/lib/generate_codebook")' >>${S}/gr-vocoder/lib/generate_codebook.txt } do_compile_prepend() { - cp ${S}/gr-vocoder/lib/codec2/defines.h ${OECMAKE_BUILDPATH}/gr-vocoder/lib/codec2 + cp ${S}/gr-vocoder/lib/codec2/defines.h ${OECMAKE_BUILDPATH}/gr-vocoder/lib/codec2 } PACKAGES += " \ - ${PN}-examples \ - ${PN}-grc \ + ${PN}-examples \ + ${PN}-grc \ " FILES_${PN}-grc = "${datadir}/gnuradio/grc" @@ -57,7 +57,7 @@ FILES_${PN} += "${prefix}/etc/gnuradio/*" FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/gnuradio/.debug \ ${PYTHON_SITEPACKAGES_DIR}/gnuradio/*/.debug \ ${datadir}/gnuradio/examples/*/.debug \ - " +" FILES_${PN}-examples = "${datadir}/gnuradio/examples" PV = "3.6.4.1" @@ -96,7 +96,7 @@ EXTRA_OEMAKE = "-C ${OECMAKE_BUILDPATH}" # Only builds for machines with neon instructions. Problem is in upstream cmake. python () { - if not oe.utils.contains ('TUNE_FEATURES', 'neon', True, False, d): - raise bb.parse.SkipPackage("'neon' not in TUNE_FEATURES") + if not oe.utils.contains ('TUNE_FEATURES', 'neon', True, False, d): + raise bb.parse.SkipPackage("'neon' not in TUNE_FEATURES") } diff --git a/meta-oe/recipes-connectivity/hostapd/hostap-daemon_1.0.bb b/meta-oe/recipes-connectivity/hostapd/hostap-daemon_1.0.bb index e62531f0bb..c1cac1e3d5 100644 --- a/meta-oe/recipes-connectivity/hostapd/hostap-daemon_1.0.bb +++ b/meta-oe/recipes-connectivity/hostapd/hostap-daemon_1.0.bb @@ -13,29 +13,29 @@ PR = "r0" DEFAULT_PREFERENCE = "-1" SRC_URI = " \ - http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \ - file://defconfig \ - file://init \ + http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \ + file://defconfig \ + file://init \ " S = "${WORKDIR}/hostapd-${PV}/hostapd" do_configure() { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config + install -m 0644 ${WORKDIR}/defconfig ${S}/.config } do_compile() { - export CFLAGS="-MMD -O2 -Wall -g -I${STAGING_INCDIR}/libnl3" - make + export CFLAGS="-MMD -O2 -Wall -g -I${STAGING_INCDIR}/libnl3" + make } do_install() { - install -d ${D}${sbindir} ${D}${sysconfdir}/init.d - install -m 0644 ${S}/hostapd.conf ${D}${sysconfdir} - install -m 0755 ${S}/hostapd ${D}${sbindir} - install -m 0755 ${S}/hostapd_cli ${D}${sbindir} - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd + install -d ${D}${sbindir} ${D}${sysconfdir}/init.d + install -m 0644 ${S}/hostapd.conf ${D}${sysconfdir} + install -m 0755 ${S}/hostapd ${D}${sbindir} + install -m 0755 ${S}/hostapd_cli ${D}${sbindir} + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd } CONFFILES_${PN} += "${sysconfdir}/hostapd.conf" diff --git a/meta-oe/recipes-connectivity/ifuse/ifuse_1.1.2.bb b/meta-oe/recipes-connectivity/ifuse/ifuse_1.1.2.bb index 3240cf57d9..4d98bfc2e2 100644 --- a/meta-oe/recipes-connectivity/ifuse/ifuse_1.1.2.bb +++ b/meta-oe/recipes-connectivity/ifuse/ifuse_1.1.2.bb @@ -7,7 +7,7 @@ DEPENDS = "fuse libimobiledevice" SRC_URI = " \ http://www.libimobiledevice.org/downloads/ifuse-${PV}.tar.bz2 \ - " +" SRC_URI[md5sum] = "4152526b2ac3c505cb41797d997be14d" SRC_URI[sha256sum] = "47835c8afb72588b3202fe0b206d7ea37a68663d9aa4eaf73f0a4bcb6215fc05" diff --git a/meta-oe/recipes-connectivity/iw/iw_3.6.bb b/meta-oe/recipes-connectivity/iw/iw_3.6.bb index 42a43c3d2b..a09339c5ad 100644 --- a/meta-oe/recipes-connectivity/iw/iw_3.6.bb +++ b/meta-oe/recipes-connectivity/iw/iw_3.6.bb @@ -11,7 +11,7 @@ DEPENDS = "libnl pkgconfig" SRC_URI = "http://wireless.kernel.org/download/iw/${P}.tar.bz2 \ file://0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch \ - " +" SRC_URI[md5sum] = "1c18bfbbc8773629e5e8ac733a39540c" SRC_URI[sha256sum] = "df11036ac11df31f44083da962a6e9c74bdea7c01c596c4b5840f948cdb6c857" @@ -19,5 +19,5 @@ SRC_URI[sha256sum] = "df11036ac11df31f44083da962a6e9c74bdea7c01c596c4b5840f948cd EXTRA_OEMAKE = "" do_install() { - oe_runmake DESTDIR=${D} install + oe_runmake DESTDIR=${D} install } diff --git a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb index debb54328e..045b067282 100644 --- a/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb +++ b/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb @@ -3,7 +3,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "\ file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \ file://COPYING.LESSER;md5=6ab17b41640564434dda85c06b7124f7 \ - " +" HOMEPAGE ="http://www.libimobiledevice.org/" @@ -11,7 +11,7 @@ DEPENDS = "libplist usbmuxd libtasn1 gnutls libgcrypt" SRC_URI = " \ http://www.libimobiledevice.org/downloads/libimobiledevice-${PV}.tar.bz2 \ - " +" SRC_URI[md5sum] = "3f28cbc6a2e30d34685049c0abde5183" SRC_URI[sha256sum] = "67499cfaa6172f566ee6b0783605acffe484fb7ddc3b09881ab7ac58667ee5b8" diff --git a/meta-oe/recipes-connectivity/libmicrohttpd/libmicrohttpd_0.4.6.bb b/meta-oe/recipes-connectivity/libmicrohttpd/libmicrohttpd_0.4.6.bb index 134e2e5fe0..ebaa485366 100644 --- a/meta-oe/recipes-connectivity/libmicrohttpd/libmicrohttpd_0.4.6.bb +++ b/meta-oe/recipes-connectivity/libmicrohttpd/libmicrohttpd_0.4.6.bb @@ -12,5 +12,5 @@ SRC_URI[sha256sum] = "0cb09e26678d1531a4fd40a748abff5142bfdad3ae11cfe3bb7ad7317a inherit autotools lib_package do_compile_append() { - sed -i s:-L${STAGING_LIBDIR}::g libmicrohttpd.pc + sed -i s:-L${STAGING_LIBDIR}::g libmicrohttpd.pc } diff --git a/meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb b/meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb index ec426a552f..1020fd2c40 100644 --- a/meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb +++ b/meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb @@ -20,5 +20,5 @@ S = "${WORKDIR}/${PN}-${PV}" inherit autotools binconfig do_configure_prepend() { - rm -f aclocal.m4 Makefile.am ltmain.sh + rm -f aclocal.m4 Makefile.am ltmain.sh } diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.3.bb b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.3.bb index ecc254fc10..a7f81e66fe 100644 --- a/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.3.bb +++ b/meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.3.bb @@ -8,7 +8,7 @@ DEPENDS = "libsigc++-2.0 openssl cppunit" SRC_URI = "http://libtorrent.rakshasa.no/downloads/${PN}-${PV}.tar.gz \ file://don-t-run-code-while-configuring-package.patch \ - " +" SRC_URI[md5sum] = "e94f6c590bb02aaf4d58618f738a85f2" SRC_URI[sha256sum] = "34317d6783b7f8d0805274c9467475b5432a246c0de8e28fc16e3b0b43f35677" diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb index cc6abd7220..e63955d5d8 100644 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb @@ -23,12 +23,12 @@ SRC_URI[sha256sum] = "a178ed2f0b5a1045ec47b217ea531d0feba9208f6bcfe64b701174a5c1 S = "${WORKDIR}/NetworkManager-${PV}" EXTRA_OECONF = " \ - --with-distro=debian \ - --with-crypto=gnutls \ - --disable-more-warnings \ - --with-dhclient=${base_sbindir}/dhclient \ - --with-iptables=${sbindir}/iptables \ - --with-tests \ + --with-distro=debian \ + --with-crypto=gnutls \ + --disable-more-warnings \ + --with-dhclient=${base_sbindir}/dhclient \ + --with-iptables=${sbindir}/iptables \ + --with-tests \ " EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" @@ -42,21 +42,21 @@ do_configure_prepend() { # Work around dbus permission problems since we lack a proper at_console do_install_prepend() { - sed -i -e s:deny:allow:g ${S}/src/NetworkManager.conf - sed -i -e s:deny:allow:g ${S}/callouts/nm-dispatcher.conf + sed -i -e s:deny:allow:g ${S}/src/NetworkManager.conf + sed -i -e s:deny:allow:g ${S}/callouts/nm-dispatcher.conf } do_install_append () { - install -d ${D}/etc/dbus-1/event.d - # Additional test binaries - install -d ${D}/usr/bin - install -m 0755 ${S}/test/.libs/libnm* ${D}/usr/bin + install -d ${D}/etc/dbus-1/event.d + # Additional test binaries + install -d ${D}/usr/bin + install -m 0755 ${S}/test/.libs/libnm* ${D}/usr/bin - install -d ${D}/etc/NetworkManager/ + install -d ${D}/etc/NetworkManager/ - # Install an empty VPN folder as nm-connection-editor will happily segfault without it :o. - # With or without VPN support built in ;). - install -d ${D}/etc/NetworkManager/VPN + # Install an empty VPN folder as nm-connection-editor will happily segfault without it :o. + # With or without VPN support built in ;). + install -d ${D}/etc/NetworkManager/VPN } PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests" @@ -66,23 +66,23 @@ FILES_libnmglib += "${libdir}/libnm_glib.so.*" FILES_libnmglib-vpn += "${libdir}/libnm_glib_vpn.so.*" FILES_${PN} += " \ - ${libexecdir} \ - ${libdir}/pppd/*/nm-pppd-plugin.so \ - ${libdir}/NetworkManager/*.so \ - ${datadir}/polkit-1 \ - ${datadir}/dbus-1 \ - ${base_libdir}/udev/* \ - ${systemd_unitdir}/system/NetworkManager-wait-online.service \ + ${libexecdir} \ + ${libdir}/pppd/*/nm-pppd-plugin.so \ + ${libdir}/NetworkManager/*.so \ + ${datadir}/polkit-1 \ + ${datadir}/dbus-1 \ + ${base_libdir}/udev/* \ + ${systemd_unitdir}/system/NetworkManager-wait-online.service \ " RRECOMMENDS_${PN} += "iptables" RCONFLICTS_${PN} = "connman" RDEPENDS_${PN} = "wpa-supplicant dhcp-client \ - ${@base_contains('COMBINED_FEATURES', '3gmodem', 'ppp', '', d)} \ - " + ${@base_contains('COMBINED_FEATURES', '3gmodem', 'ppp', '', d)} \ +" FILES_${PN}-dbg += "${libdir}/NetworkManager/.debug/ \ - ${libdir}/pppd/*/.debug/ " + ${libdir}/pppd/*/.debug/ " FILES_${PN}-dev += "${datadir}/NetworkManager/gdb-cmd \ ${libdir}/pppd/*/*.la \ diff --git a/meta-oe/recipes-connectivity/obex/openobex_1.5.bb b/meta-oe/recipes-connectivity/obex/openobex_1.5.bb index d08420c3a3..c62c5aab38 100644 --- a/meta-oe/recipes-connectivity/obex/openobex_1.5.bb +++ b/meta-oe/recipes-connectivity/obex/openobex_1.5.bb @@ -6,7 +6,7 @@ DEPENDS = "virtual/libusb0 bluez4" LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ - " +" SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/openobex-${PV}.tar.gz \ file://disable-cable-test.patch \ @@ -21,8 +21,8 @@ EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump \ --with-usb=${STAGING_LIBDIR}/.. --with-bluez=${STAGING_LIBDIR}/.." do_install_append() { - install -d ${D}${datadir}/aclocal - install -m 0644 ${S}/openobex.m4 ${D}${datadir}/aclocal + install -d ${D}${datadir}/aclocal + install -m 0644 ${S}/openobex.m4 ${D}${datadir}/aclocal } PACKAGES += "openobex-apps" diff --git a/meta-oe/recipes-connectivity/openvpn/openvpn.inc b/meta-oe/recipes-connectivity/openvpn/openvpn.inc index 50483ea4bd..61f91a3ea6 100644 --- a/meta-oe/recipes-connectivity/openvpn/openvpn.inc +++ b/meta-oe/recipes-connectivity/openvpn/openvpn.inc @@ -8,7 +8,7 @@ RRECOMMENDS_${PN} = "kernel-module-tun" INC_PR = "r2" SRC_URI = "http://openvpn.net/release/openvpn-${PV}.tar.gz \ - file://openvpn" + file://openvpn" S = "${WORKDIR}/openvpn-${PV}" CFLAGS += "-fno-inline" @@ -16,7 +16,7 @@ CFLAGS += "-fno-inline" inherit autotools do_install_append() { - install -d ${D}/${sysconfdir}/init.d - install -d ${D}/${sysconfdir}/openvpn - install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d + install -d ${D}/${sysconfdir}/init.d + install -d ${D}/${sysconfdir}/openvpn + install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d } diff --git a/meta-oe/recipes-connectivity/openvpn/openvpn_2.1.3.bb b/meta-oe/recipes-connectivity/openvpn/openvpn_2.1.3.bb index 34567bc595..594b2666c8 100644 --- a/meta-oe/recipes-connectivity/openvpn/openvpn_2.1.3.bb +++ b/meta-oe/recipes-connectivity/openvpn/openvpn_2.1.3.bb @@ -17,9 +17,9 @@ CFLAGS += "-fno-inline" EXTRA_OECONF += "--enable-password-save" do_install_append() { - install -d ${D}/${sysconfdir}/init.d - install -d ${D}/${sysconfdir}/openvpn - install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d + install -d ${D}/${sysconfdir}/init.d + install -d ${D}/${sysconfdir}/openvpn + install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d } SRC_URI[md5sum] = "7486d3e270ba4b033e311d3e022a0ad7" diff --git a/meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb b/meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb index 430cf65bfc..f90736dff0 100644 --- a/meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb +++ b/meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb @@ -12,10 +12,10 @@ SRC_URI[md5sum] = "727892c0fb35c80ee3849fbe89b45350" SRC_URI[sha256sum] = "ca10e4827a5f0a36e093aee6ad81b5febf81f8097d7d858889ac51ff364168c1" do_compile() { - oe_runmake + oe_runmake } do_install() { - oe_runmake DESTDIR=${D} install + oe_runmake DESTDIR=${D} install } inherit update-alternatives diff --git a/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe_3.8.bb b/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe_3.8.bb index 7deac84e3a..cbb4721683 100644 --- a/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe_3.8.bb +++ b/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe_3.8.bb @@ -22,12 +22,12 @@ SRC_URI = "http://www.roaringpenguin.com/files/download/${P}.tar.gz \ inherit autotools update-rc.d do_install() { - # Install init script and default settings - install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/pppoe-server.default ${D}${sysconfdir}/default/pppoe-server - install -m 0755 ${WORKDIR}/pppoe-server.init ${D}${sysconfdir}/init.d/pppoe-server - # Install - oe_runmake -C ${S} RPM_INSTALL_ROOT=${D} docdir=${docdir} install + # Install init script and default settings + install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d + install -m 0644 ${WORKDIR}/pppoe-server.default ${D}${sysconfdir}/default/pppoe-server + install -m 0755 ${WORKDIR}/pppoe-server.init ${D}${sysconfdir}/init.d/pppoe-server + # Install + oe_runmake -C ${S} RPM_INSTALL_ROOT=${D} docdir=${docdir} install } # Insert server package before main package diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.3.bb b/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.3.bb index b460444f70..e391e7c659 100644 --- a/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.3.bb +++ b/meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.3.bb @@ -7,7 +7,7 @@ DEPENDS = "libsigc++-2.0 curl cppunit libtorrent" SRC_URI = "http://libtorrent.rakshasa.no/downloads/${PN}-${PV}.tar.gz \ file://don-t-run-code-while-configuring-package.patch \ - " +" SRC_URI[md5sum] = "0bf2f262faa8c8c8d3b11ce286ea2bf2" SRC_URI[sha256sum] = "9e93ca41beb1afe74ad7ad8013e0d53ae3586c9b0e97263d722f721535cc7310" diff --git a/meta-oe/recipes-connectivity/samba/samba-basic.inc b/meta-oe/recipes-connectivity/samba/samba-basic.inc index 05a5b3a45e..d0fa8e603e 100644 --- a/meta-oe/recipes-connectivity/samba/samba-basic.inc +++ b/meta-oe/recipes-connectivity/samba/samba-basic.inc @@ -1,6 +1,6 @@ SRC_URI += "file://config-lfs.patch \ file://quota.patch;striplevel=0 \ - " +" EXTRA_OECONF += "\ --enable-nss-wrapper \ diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc index 42ddce5a10..0e4877c0c4 100644 --- a/meta-oe/recipes-connectivity/samba/samba.inc +++ b/meta-oe/recipes-connectivity/samba/samba.inc @@ -8,7 +8,7 @@ SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ file://init.samba \ file://init.winbind \ file://tdb.pc \ - " +" S = "${WORKDIR}/samba-${PV}/source" @@ -49,51 +49,51 @@ INITSCRIPT_PARAMS = "defaults" CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf" do_configure_prepend () { - ./script/mkversion.sh - if [ ! -e acinclude.m4 ]; then - touch aclocal.m4 - cat aclocal.m4 > acinclude.m4 - fi + ./script/mkversion.sh + if [ ! -e acinclude.m4 ]; then + touch aclocal.m4 + cat aclocal.m4 > acinclude.m4 + fi } do_compile () { - oe_runmake proto_exists - base_do_compile + oe_runmake proto_exists + base_do_compile } do_install_append() { - install -d ${D}${libdir}/pkgconfig/ - cp ${WORKDIR}/tdb.pc ${D}${libdir}/pkgconfig/ - mv ${D}${libdir}/libsmbclient.so ${D}${libdir}/libsmbclient.so.0 || true - ln -sf libsmbclient.so.0 ${D}${libdir}/libsmbclient.so - mkdir -p ${D}${base_sbindir} - rm -f ${D}${bindir}/*.old - rm -f ${D}${sbindir}/*.old - [ -f ${D}${sbindir}/mount.cifs ] && mv ${D}${sbindir}/mount.cifs ${D}${base_sbindir}/ - [ -f ${D}${sbindir}/umount.cifs ] && mv ${D}${sbindir}/umount.cifs ${D}${base_sbindir}/ + install -d ${D}${libdir}/pkgconfig/ + cp ${WORKDIR}/tdb.pc ${D}${libdir}/pkgconfig/ + mv ${D}${libdir}/libsmbclient.so ${D}${libdir}/libsmbclient.so.0 || true + ln -sf libsmbclient.so.0 ${D}${libdir}/libsmbclient.so + mkdir -p ${D}${base_sbindir} + rm -f ${D}${bindir}/*.old + rm -f ${D}${sbindir}/*.old + [ -f ${D}${sbindir}/mount.cifs ] && mv ${D}${sbindir}/mount.cifs ${D}${base_sbindir}/ + [ -f ${D}${sbindir}/umount.cifs ] && mv ${D}${sbindir}/umount.cifs ${D}${base_sbindir}/ - # This is needed for < 3.2.4 - rm -f ${D}${sbindir}/mount.smbfs ${D}${base_sbindir}/mount.smbfs - if [ -f ${D}${bindir}/smbmount ]; then - ln -sf ${bindir}/smbmount ${D}${base_sbindir}/mount.smb - ln -sf ${bindir}/smbmount ${D}${base_sbindir}/mount.smbfs - fi - + # This is needed for < 3.2.4 + rm -f ${D}${sbindir}/mount.smbfs ${D}${base_sbindir}/mount.smbfs + if [ -f ${D}${bindir}/smbmount ]; then + ln -sf ${bindir}/smbmount ${D}${base_sbindir}/mount.smb + ln -sf ${bindir}/smbmount ${D}${base_sbindir}/mount.smbfs + fi + install -D -m 755 ${WORKDIR}/init.samba ${D}${sysconfdir}/init.d/samba install -D -m 755 ${WORKDIR}/init.winbind ${D}${sysconfdir}/init.d/winbind - install -D -m 644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf - install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/volatiles.03_samba - install -d ${D}/var/log/samba - install -d ${D}/var/spool/samba + install -D -m 644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf + install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/volatiles.03_samba + install -d ${D}/var/log/samba + install -d ${D}/var/spool/samba - # Install other stuff not installed by "make install" - if [ -d ${WORKDIR}/${PN}-${PV}/nsswitch ]; then - install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_winbind.so ${D}${libdir}/libnss_winbind.so.2 - install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_wins.so ${D}${libdir}/libnss_wins.so.2 - fi + # Install other stuff not installed by "make install" + if [ -d ${WORKDIR}/${PN}-${PV}/nsswitch ]; then + install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_winbind.so ${D}${libdir}/libnss_winbind.so.2 + install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_wins.so ${D}${libdir}/libnss_wins.so.2 + fi - rmdir --ignore-fail-on-non-empty ${D}${base_sbindir} - sed -i -e '1s,#!.*perl,#!${USRBINPATH}/env perl,' ${D}${bindir}/findsmb + rmdir --ignore-fail-on-non-empty ${D}${base_sbindir} + sed -i -e '1s,#!.*perl,#!${USRBINPATH}/env perl,' ${D}${bindir}/findsmb } @@ -102,8 +102,8 @@ pkg_postinst_libnss-winbind () { # add wins to the list of resolvers ns=$D${sysconfdir}/nsswitch.conf if ! grep "hosts:.*wins" $ns > /dev/null; then - hosts="`grep '^hosts:' $ns`" - hosts=`echo "$hosts" | sed 's/\[/\\\\[/g; s/\]/\\\\]/g'` - sed -i "s/$hosts/$hosts wins/" "$ns" + hosts="`grep '^hosts:' $ns`" + hosts=`echo "$hosts" | sed 's/\[/\\\\[/g; s/\]/\\\\]/g'` + sed -i "s/$hosts/$hosts wins/" "$ns" fi } diff --git a/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb b/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb index 35d20c5f07..6608240d2e 100644 --- a/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb +++ b/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb @@ -36,24 +36,24 @@ SRC_URI[sha256sum] = "4f5a171a8d902c6b4f822ed875c51eb8339196d9ccf0ecd7f6521c966b S = "${WORKDIR}/samba-${PV}/source3" EXTRA_OECONF += "\ - ac_cv_path_PYTHON=/not/exist \ - ac_cv_path_PYTHON_CONFIG=/not/exist \ - SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \ - samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \ - linux_getgrouplist_ok=no \ - samba_cv_HAVE_BROKEN_GETGROUPS=no \ - samba_cv_HAVE_FTRUNCATE_EXTEND=yes \ - samba_cv_have_setresuid=yes \ - samba_cv_have_setresgid=yes \ - samba_cv_HAVE_WRFILE_KEYTAB=yes \ - samba_cv_linux_getgrouplist_ok=yes \ - " + ac_cv_path_PYTHON=/not/exist \ + ac_cv_path_PYTHON_CONFIG=/not/exist \ + SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \ + samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \ + linux_getgrouplist_ok=no \ + samba_cv_HAVE_BROKEN_GETGROUPS=no \ + samba_cv_HAVE_FTRUNCATE_EXTEND=yes \ + samba_cv_have_setresuid=yes \ + samba_cv_have_setresgid=yes \ + samba_cv_HAVE_WRFILE_KEYTAB=yes \ + samba_cv_linux_getgrouplist_ok=yes \ +" do_configure() { - gnu-configize --force - oe_runconf + gnu-configize --force + oe_runconf } do_compile () { - base_do_compile + base_do_compile } diff --git a/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.005.002.bb b/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.005.002.bb index e3180d288a..3afae27c96 100644 --- a/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.005.002.bb +++ b/meta-oe/recipes-connectivity/uhd/uhd-firmware_003.005.002.bb @@ -15,11 +15,11 @@ SRC_URI[sha256sum] = "217efa814fb031ad136bd3dcf89ca219dd6d7ee01aa7e65c56c56b7737 S = "${WORKDIR}/uhd-images_${PV}-release" do_install() { - install -d ${D}${datadir}/uhd/images - install -d ${D}${datadir}/uhd/images/bit - install -m 0644 ${S}/share/uhd/images/bit/* ${D}${datadir}/uhd/images/bit - rm -rf ${S}/share/uhd/images/bit - install -m 0644 ${S}/share/uhd/images/* ${D}${datadir}/uhd/images + install -d ${D}${datadir}/uhd/images + install -d ${D}${datadir}/uhd/images/bit + install -m 0644 ${S}/share/uhd/images/bit/* ${D}${datadir}/uhd/images/bit + rm -rf ${S}/share/uhd/images/bit + install -m 0644 ${S}/share/uhd/images/* ${D}${datadir}/uhd/images } PACKAGES = "${PN}" diff --git a/meta-oe/recipes-connectivity/uhd/uhd_git.bb b/meta-oe/recipes-connectivity/uhd/uhd_git.bb index b360e00f2c..5a549ca6d2 100644 --- a/meta-oe/recipes-connectivity/uhd/uhd_git.bb +++ b/meta-oe/recipes-connectivity/uhd/uhd_git.bb @@ -4,7 +4,7 @@ PV = "3.5.2" PR = "${INC_PR}.0" SRC_URI = "git://ettus.sourcerepo.com/ettus/uhd.git;branch=maint;protocol=git \ - " +" S = "${WORKDIR}/git/host" SRCREV = "0cce80c1ef2bcdb5094d579a6853261cebd2ec03" diff --git a/meta-oe/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb b/meta-oe/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb index e5fd7ee2aa..1669d96f8c 100644 --- a/meta-oe/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb +++ b/meta-oe/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb @@ -18,21 +18,21 @@ CONFFILES_${PN} = "${sysconfdir}/vsftpd.conf" LDFLAGS_append =" -lcrypt -lcap" do_configure() { - # Fix hardcoded /usr, /etc, /var mess. - cat tunables.c|sed s:\"/usr:\"${prefix}:g|sed s:\"/var:\"${localstatedir}:g \ - |sed s:\"${prefix}/share/empty:\"${localstatedir}/share/empty:g |sed s:\"/etc:\"${sysconfdir}:g > tunables.c.new - mv tunables.c.new tunables.c + # Fix hardcoded /usr, /etc, /var mess. + cat tunables.c|sed s:\"/usr:\"${prefix}:g|sed s:\"/var:\"${localstatedir}:g \ + |sed s:\"${prefix}/share/empty:\"${localstatedir}/share/empty:g |sed s:\"/etc:\"${sysconfdir}:g > tunables.c.new + mv tunables.c.new tunables.c } do_install() { - install -d ${D}${sbindir} - install -d ${D}${mandir}/man8 - install -d ${D}${mandir}/man5 - oe_runmake 'DESTDIR=${D}' install - install -d ${D}${sysconfdir} - install -m 0755 ${WORKDIR}/vsftpd.conf ${D}${sysconfdir}/vsftpd.conf - install -d ${D}${sysconfdir}/init.d/ - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/vsftpd + install -d ${D}${sbindir} + install -d ${D}${mandir}/man8 + install -d ${D}${mandir}/man5 + oe_runmake 'DESTDIR=${D}' install + install -d ${D}${sysconfdir} + install -m 0755 ${WORKDIR}/vsftpd.conf ${D}${sysconfdir}/vsftpd.conf + install -d ${D}${sysconfdir}/init.d/ + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/vsftpd } INITSCRIPT_PACKAGES = "${PN}" |