summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-connectivity
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-connectivity')
-rw-r--r--meta-oe/recipes-connectivity/bridge-utils/bridge-utils.inc12
-rw-r--r--meta-oe/recipes-connectivity/cherokee/cherokee_1.2.98.bb16
-rw-r--r--meta-oe/recipes-connectivity/dnsmasq/dnsmasq-dbus_2.55.bb4
-rw-r--r--meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc18
-rw-r--r--meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb44
-rw-r--r--meta-oe/recipes-connectivity/gateone/gateone_git.bb18
-rw-r--r--meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb22
-rw-r--r--meta-oe/recipes-connectivity/hostapd/hostap-daemon_1.0.bb22
-rw-r--r--meta-oe/recipes-connectivity/ifuse/ifuse_1.1.2.bb2
-rw-r--r--meta-oe/recipes-connectivity/iw/iw_3.6.bb4
-rw-r--r--meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb4
-rw-r--r--meta-oe/recipes-connectivity/libmicrohttpd/libmicrohttpd_0.4.6.bb2
-rw-r--r--meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb2
-rw-r--r--meta-oe/recipes-connectivity/libtorrent/libtorrent_0.13.3.bb2
-rw-r--r--meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb52
-rw-r--r--meta-oe/recipes-connectivity/obex/openobex_1.5.bb6
-rw-r--r--meta-oe/recipes-connectivity/openvpn/openvpn.inc8
-rw-r--r--meta-oe/recipes-connectivity/openvpn/openvpn_2.1.3.bb6
-rw-r--r--meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb4
-rw-r--r--meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe_3.8.bb12
-rw-r--r--meta-oe/recipes-connectivity/rtorrent/rtorrent_0.9.3.bb2
-rw-r--r--meta-oe/recipes-connectivity/samba/samba-basic.inc2
-rw-r--r--meta-oe/recipes-connectivity/samba/samba.inc76
-rw-r--r--meta-oe/recipes-connectivity/samba/samba_3.6.8.bb30
-rw-r--r--meta-oe/recipes-connectivity/uhd/uhd-firmware_003.005.002.bb10
-rw-r--r--meta-oe/recipes-connectivity/uhd/uhd_git.bb2
-rw-r--r--meta-oe/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb24
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 75bf2a90d..3fc54ba99 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
10EXTRA_OECONF = "--with-linux-headers=${STAGING_INCDIR}" 10EXTRA_OECONF = "--with-linux-headers=${STAGING_INCDIR}"
11 11
12do_install_append () { 12do_install_append () {
13 mv ${D}${sbindir}/brctl ${D}${sbindir}/brctl.${PN} 13 mv ${D}${sbindir}/brctl ${D}${sbindir}/brctl.${PN}
14 install -d ${D}/${datadir}/bridge-utils 14 install -d ${D}/${datadir}/bridge-utils
15 install -d ${D}/${sysconfdir}/network/if-pre-up.d 15 install -d ${D}/${sysconfdir}/network/if-pre-up.d
16 install -d ${D}/${sysconfdir}/network/if-post-down.d 16 install -d ${D}/${sysconfdir}/network/if-post-down.d
17} 17}
18 18
19DEPENDS = "sysfsutils" 19DEPENDS = "sysfsutils"
20RRECOMMENDS_${PN} = "kernel-module-bridge" 20RRECOMMENDS_${PN} = "kernel-module-bridge"
21 21
22pkg_postinst_${PN} () { 22pkg_postinst_${PN} () {
23 update-alternatives --install ${sbindir}/brctl brctl brctl.${PN} 100 23 update-alternatives --install ${sbindir}/brctl brctl brctl.${PN} 100
24} 24}
25 25
26pkg_prerm_${PN} () { 26pkg_prerm_${PN} () {
27 update-alternatives --remove brctl brctl.${PN} 27 update-alternatives --remove brctl brctl.${PN}
28} 28}
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 422ebdab4..6c030a635 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
21EXTRA_OECONF = "--disable-static \ 21EXTRA_OECONF = "--disable-static \
22 --disable-nls \ 22 --disable-nls \
23 ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ 23 ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \
24 " 24"
25 25
26do_install_append () { 26do_install_append () {
27 install -m 0755 -d ${D}${sysconfdir}/init.d 27 install -m 0755 -d ${D}${sysconfdir}/init.d
28 install -m 755 ${WORKDIR}/cherokee.init ${D}${sysconfdir}/init.d/cherokee 28 install -m 755 ${WORKDIR}/cherokee.init ${D}${sysconfdir}/init.d/cherokee
29 29
30 # clean up .la files for plugins 30 # clean up .la files for plugins
31 rm -f ${D}${libdir}/cherokee/*.la 31 rm -f ${D}${libdir}/cherokee/*.la
32 32
33 install -d ${D}${systemd_unitdir}/system 33 install -d ${D}${systemd_unitdir}/system
34 install -m 0644 ${WORKDIR}/cherokee.service ${D}${systemd_unitdir}/system 34 install -m 0644 ${WORKDIR}/cherokee.service ${D}${systemd_unitdir}/system
35} 35}
36 36
37# Put -dev near the front so we can move the .la files into it with a wildcard 37# 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}"
45CONFFILES_${PN} = " \ 45CONFFILES_${PN} = " \
46 ${sysconfdir}/cherokee/cherokee.conf \ 46 ${sysconfdir}/cherokee/cherokee.conf \
47 ${sysconfdir}/init.d/cherokee \ 47 ${sysconfdir}/init.d/cherokee \
48 " 48"
49 49
50INITSCRIPT_NAME = "cherokee" 50INITSCRIPT_NAME = "cherokee"
51INITSCRIPT_PARAMS = "defaults 91 91" 51INITSCRIPT_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 896952d53..7d698c6c1 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"
8EXTRA_OEMAKE = "COPTS=-DHAVE_DBUS" 8EXTRA_OEMAKE = "COPTS=-DHAVE_DBUS"
9 9
10do_install_append () { 10do_install_append () {
11 install -d ${D}${sysconfdir}/dbus-1/system.d 11 install -d ${D}${sysconfdir}/dbus-1/system.d
12 install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/ 12 install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/
13} 13}
diff --git a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc
index ef99f489c..46188a445 100644
--- a/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc
+++ b/meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc
@@ -19,16 +19,16 @@ INITSCRIPT_NAME = "dnsmasq"
19INITSCRIPT_PARAMS = "defaults" 19INITSCRIPT_PARAMS = "defaults"
20 20
21do_install () { 21do_install () {
22 oe_runmake "PREFIX=${D}${prefix}" \ 22 oe_runmake "PREFIX=${D}${prefix}" \
23 "BINDIR=${D}${bindir}" \ 23 "BINDIR=${D}${bindir}" \
24 "MANDIR=${D}${mandir}" \ 24 "MANDIR=${D}${mandir}" \
25 install 25 install
26 install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d 26 install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d
27 install -m 644 ${WORKDIR}/dnsmasq.conf ${D}${sysconfdir}/ 27 install -m 644 ${WORKDIR}/dnsmasq.conf ${D}${sysconfdir}/
28 install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq 28 install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq
29 29
30 install -d ${D}${systemd_unitdir}/system 30 install -d ${D}${systemd_unitdir}/system
31 install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system 31 install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system
32} 32}
33 33
34CONFFILES_${PN} = "${sysconfdir}/dnsmasq.conf" 34CONFFILES_${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 3a2da3edc..095a77c1c 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"
6HOMEPAGE = "http://www.gammu.org/" 6HOMEPAGE = "http://www.gammu.org/"
7 7
8SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}/${PV}/${PN}-${PV}.tar.bz2 \ 8SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}/${PV}/${PN}-${PV}.tar.bz2 \
9 file://gammurc \ 9 file://gammurc \
10 file://gammu-smsdrc \ 10 file://gammu-smsdrc \
11 " 11"
12 12
13SRC_URI[md5sum] = "8ea16c6b3cc48097a8e62311fe0e25b9" 13SRC_URI[md5sum] = "8ea16c6b3cc48097a8e62311fe0e25b9"
14SRC_URI[sha256sum] = "de67caa102aa4c8fbed5300e5a0262e40411c4cc79f4379a8d34eed797968fc3" 14SRC_URI[sha256sum] = "de67caa102aa4c8fbed5300e5a0262e40411c4cc79f4379a8d34eed797968fc3"
@@ -16,34 +16,34 @@ SRC_URI[sha256sum] = "de67caa102aa4c8fbed5300e5a0262e40411c4cc79f4379a8d34eed797
16inherit distutils cmake gettext 16inherit distutils cmake gettext
17 17
18do_install_append() { 18do_install_append() {
19 # these files seem to only be used by symbian and trigger QA warnings 19 # these files seem to only be used by symbian and trigger QA warnings
20 rm -rf ${D}/usr/share/gammu 20 rm -rf ${D}/usr/share/gammu
21 #install default configuration files 21 #install default configuration files
22 install -d ${D}${sysconfdir} 22 install -d ${D}${sysconfdir}
23 install -m 0644 ${WORKDIR}/gammurc ${D}${sysconfdir}/gammurc 23 install -m 0644 ${WORKDIR}/gammurc ${D}${sysconfdir}/gammurc
24 install -m 0644 ${WORKDIR}/gammu-smsdrc ${D}${sysconfdir}/gammu-smsdrc 24 install -m 0644 ${WORKDIR}/gammu-smsdrc ${D}${sysconfdir}/gammu-smsdrc
25} 25}
26 26
27EXTRA_OECONF = " \ 27EXTRA_OECONF = " \
28 --enable-shared \ 28 --enable-shared \
29 --enable-backup \ 29 --enable-backup \
30 --enable-protection \ 30 --enable-protection \
31 " 31"
32 32
33EXTRA_OECMAKE = " \ 33EXTRA_OECMAKE = " \
34 -DWITH_CURL=OFF \ 34 -DWITH_CURL=OFF \
35 -DWITH_BLUETOOTH=OFF \ 35 -DWITH_BLUETOOTH=OFF \
36 -DWITH_NOKIA_SUPPORT=OFF \ 36 -DWITH_NOKIA_SUPPORT=OFF \
37 -DWITH_IRDA=OFF \ 37 -DWITH_IRDA=OFF \
38 -DWITH_PYTHON=OFF \ 38 -DWITH_PYTHON=OFF \
39 -DWITH_MySQL=ON \ 39 -DWITH_MySQL=ON \
40 -DWITH_Postgres=OFF \ 40 -DWITH_Postgres=OFF \
41 " 41"
42 42
43PACKAGES =+ "${PN}-smsd libgammu libgsmsd python-${PN}" 43PACKAGES =+ "${PN}-smsd libgammu libgsmsd python-${PN}"
44 44
45FILES_${PN} = "${bindir}/gammu ${bindir}/jadmaker ${sysconfdir}/bash_completion.d/gammu \ 45FILES_${PN} = "${bindir}/gammu ${bindir}/jadmaker ${sysconfdir}/bash_completion.d/gammu \
46 ${bindir}/gammu-detect ${sysconfdir}/gammurc" 46 ${bindir}/gammu-detect ${sysconfdir}/gammurc"
47CONFFILES_${PN} = "${sysconfdir}/gammurc" 47CONFFILES_${PN} = "${sysconfdir}/gammurc"
48FILES_${PN}-smsd = "${bindir}/gammu-smsd* ${sysconfdir}/gammu-smsdrc" 48FILES_${PN}-smsd = "${bindir}/gammu-smsd* ${sysconfdir}/gammu-smsdrc"
49CONFFILES_${PN}-smsd = "${sysconfdir}/gammu-smsdrc" 49CONFFILES_${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 355200978..39b4aff77 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 \
10 file://gateone-avahi.service \ 10 file://gateone-avahi.service \
11 file://server.conf \ 11 file://server.conf \
12 file://gateone.service \ 12 file://gateone.service \
13 " 13"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
@@ -19,15 +19,15 @@ inherit distutils allarch python-dir systemd
19export prefix = "${localstatedir}/lib" 19export prefix = "${localstatedir}/lib"
20 20
21do_install_append() { 21do_install_append() {
22 install -d ${D}${localstatedir}/log/${BPN} 22 install -d ${D}${localstatedir}/log/${BPN}
23 23
24 install -m 0755 -d ${D}${sysconfdir}/avahi/services/ 24 install -m 0755 -d ${D}${sysconfdir}/avahi/services/
25 install -m 0644 ${WORKDIR}/gateone-avahi.service ${D}${sysconfdir}/avahi/services/ 25 install -m 0644 ${WORKDIR}/gateone-avahi.service ${D}${sysconfdir}/avahi/services/
26 26
27 install -m 0644 ${WORKDIR}/server.conf ${D}/var/lib/gateone/server.conf 27 install -m 0644 ${WORKDIR}/server.conf ${D}/var/lib/gateone/server.conf
28 28
29 install -d ${D}${systemd_unitdir}/system 29 install -d ${D}${systemd_unitdir}/system
30 install -m 0644 ${WORKDIR}/gateone.service ${D}${systemd_unitdir}/system 30 install -m 0644 ${WORKDIR}/gateone.service ${D}${systemd_unitdir}/system
31} 31}
32 32
33FILES_${PN} = "${localstatedir}/lib ${localstatedir}/log ${localstatedir}/volatile/log ${base_libdir} ${sysconfdir} ${PYTHON_SITEPACKAGES_DIR}" 33FILES_${PN} = "${localstatedir}/lib ${localstatedir}/log ${localstatedir}/volatile/log ${base_libdir} ${sysconfdir} ${PYTHON_SITEPACKAGES_DIR}"
@@ -60,6 +60,6 @@ RDEPENDS_${PN} = "file \
60 python-tornado \ 60 python-tornado \
61 python-unixadmin \ 61 python-unixadmin \
62 python-xml \ 62 python-xml \
63 " 63"
64 64
65SYSTEMD_SERVICE_${PN} = "gateone.service" 65SYSTEMD_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 efecc64a0..edd4615aa 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 \
26 python-compiler python-pkgutil python-pydoc python-mmap \ 26 python-compiler python-pkgutil python-pydoc python-mmap \
27 python-netclient python-difflib \ 27 python-netclient python-difflib \
28 python-pprint python-numpy \ 28 python-pprint python-numpy \
29 " 29"
30RDEPENDS_${PN}-grc = "python-pygtk python-lxml python-cheetah" 30RDEPENDS_${PN}-grc = "python-pygtk python-lxml python-cheetah"
31 31
32C_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 32C_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
33 33
34do_configure_prepend() { 34do_configure_prepend() {
35 ${BUILD_CC} ${S}/gr-vocoder/lib/codec2/generate_codebook.c -o ${S}/gr-vocoder/lib/generate_codebook -lm 35 ${BUILD_CC} ${S}/gr-vocoder/lib/codec2/generate_codebook.c -o ${S}/gr-vocoder/lib/generate_codebook -lm
36 echo "ADD_EXECUTABLE(generate_codebook IMPORTED)" >${S}/gr-vocoder/lib/generate_codebook.txt 36 echo "ADD_EXECUTABLE(generate_codebook IMPORTED)" >${S}/gr-vocoder/lib/generate_codebook.txt
37 echo "SET_PROPERTY(TARGET generate_codebook APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)" >>${S}/gr-vocoder/lib/generate_codebook.txt 37 echo "SET_PROPERTY(TARGET generate_codebook APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)" >>${S}/gr-vocoder/lib/generate_codebook.txt
38 echo 'SET_TARGET_PROPERTIES(generate_codebook PROPERTIES IMPORTED_LOCATION_RELEASE "${S}/gr-vocoder/lib/generate_codebook")' >>${S}/gr-vocoder/lib/generate_codebook.txt 38 echo 'SET_TARGET_PROPERTIES(generate_codebook PROPERTIES IMPORTED_LOCATION_RELEASE "${S}/gr-vocoder/lib/generate_codebook")' >>${S}/gr-vocoder/lib/generate_codebook.txt
39} 39}
40 40
41do_compile_prepend() { 41do_compile_prepend() {
42 cp ${S}/gr-vocoder/lib/codec2/defines.h ${OECMAKE_BUILDPATH}/gr-vocoder/lib/codec2 42 cp ${S}/gr-vocoder/lib/codec2/defines.h ${OECMAKE_BUILDPATH}/gr-vocoder/lib/codec2
43} 43}
44 44
45PACKAGES += " \ 45PACKAGES += " \
46 ${PN}-examples \ 46 ${PN}-examples \
47 ${PN}-grc \ 47 ${PN}-grc \
48" 48"
49 49
50FILES_${PN}-grc = "${datadir}/gnuradio/grc" 50FILES_${PN}-grc = "${datadir}/gnuradio/grc"
@@ -57,7 +57,7 @@ FILES_${PN} += "${prefix}/etc/gnuradio/*"
57FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/gnuradio/.debug \ 57FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/gnuradio/.debug \
58 ${PYTHON_SITEPACKAGES_DIR}/gnuradio/*/.debug \ 58 ${PYTHON_SITEPACKAGES_DIR}/gnuradio/*/.debug \
59 ${datadir}/gnuradio/examples/*/.debug \ 59 ${datadir}/gnuradio/examples/*/.debug \
60 " 60"
61FILES_${PN}-examples = "${datadir}/gnuradio/examples" 61FILES_${PN}-examples = "${datadir}/gnuradio/examples"
62 62
63PV = "3.6.4.1" 63PV = "3.6.4.1"
@@ -96,7 +96,7 @@ EXTRA_OEMAKE = "-C ${OECMAKE_BUILDPATH}"
96 96
97# Only builds for machines with neon instructions. Problem is in upstream cmake. 97# Only builds for machines with neon instructions. Problem is in upstream cmake.
98python () { 98python () {
99 if not oe.utils.contains ('TUNE_FEATURES', 'neon', True, False, d): 99 if not oe.utils.contains ('TUNE_FEATURES', 'neon', True, False, d):
100 raise bb.parse.SkipPackage("'neon' not in TUNE_FEATURES") 100 raise bb.parse.SkipPackage("'neon' not in TUNE_FEATURES")
101} 101}
102 102
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 e62531f0b..c1cac1e3d 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"
13DEFAULT_PREFERENCE = "-1" 13DEFAULT_PREFERENCE = "-1"
14 14
15SRC_URI = " \ 15SRC_URI = " \
16 http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \ 16 http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \
17 file://defconfig \ 17 file://defconfig \
18 file://init \ 18 file://init \
19" 19"
20 20
21S = "${WORKDIR}/hostapd-${PV}/hostapd" 21S = "${WORKDIR}/hostapd-${PV}/hostapd"
22 22
23 23
24do_configure() { 24do_configure() {
25 install -m 0644 ${WORKDIR}/defconfig ${S}/.config 25 install -m 0644 ${WORKDIR}/defconfig ${S}/.config
26} 26}
27 27
28do_compile() { 28do_compile() {
29 export CFLAGS="-MMD -O2 -Wall -g -I${STAGING_INCDIR}/libnl3" 29 export CFLAGS="-MMD -O2 -Wall -g -I${STAGING_INCDIR}/libnl3"
30 make 30 make
31} 31}
32 32
33do_install() { 33do_install() {
34 install -d ${D}${sbindir} ${D}${sysconfdir}/init.d 34 install -d ${D}${sbindir} ${D}${sysconfdir}/init.d
35 install -m 0644 ${S}/hostapd.conf ${D}${sysconfdir} 35 install -m 0644 ${S}/hostapd.conf ${D}${sysconfdir}
36 install -m 0755 ${S}/hostapd ${D}${sbindir} 36 install -m 0755 ${S}/hostapd ${D}${sbindir}
37 install -m 0755 ${S}/hostapd_cli ${D}${sbindir} 37 install -m 0755 ${S}/hostapd_cli ${D}${sbindir}
38 install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd 38 install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd
39} 39}
40 40
41CONFFILES_${PN} += "${sysconfdir}/hostapd.conf" 41CONFFILES_${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 3240cf57d..4d98bfc2e 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"
7 7
8SRC_URI = " \ 8SRC_URI = " \
9 http://www.libimobiledevice.org/downloads/ifuse-${PV}.tar.bz2 \ 9 http://www.libimobiledevice.org/downloads/ifuse-${PV}.tar.bz2 \
10 " 10"
11 11
12SRC_URI[md5sum] = "4152526b2ac3c505cb41797d997be14d" 12SRC_URI[md5sum] = "4152526b2ac3c505cb41797d997be14d"
13SRC_URI[sha256sum] = "47835c8afb72588b3202fe0b206d7ea37a68663d9aa4eaf73f0a4bcb6215fc05" 13SRC_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 42a43c3d2..a09339c5a 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"
11 11
12SRC_URI = "http://wireless.kernel.org/download/iw/${P}.tar.bz2 \ 12SRC_URI = "http://wireless.kernel.org/download/iw/${P}.tar.bz2 \
13 file://0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch \ 13 file://0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch \
14 " 14"
15 15
16SRC_URI[md5sum] = "1c18bfbbc8773629e5e8ac733a39540c" 16SRC_URI[md5sum] = "1c18bfbbc8773629e5e8ac733a39540c"
17SRC_URI[sha256sum] = "df11036ac11df31f44083da962a6e9c74bdea7c01c596c4b5840f948cdb6c857" 17SRC_URI[sha256sum] = "df11036ac11df31f44083da962a6e9c74bdea7c01c596c4b5840f948cdb6c857"
@@ -19,5 +19,5 @@ SRC_URI[sha256sum] = "df11036ac11df31f44083da962a6e9c74bdea7c01c596c4b5840f948cd
19EXTRA_OEMAKE = "" 19EXTRA_OEMAKE = ""
20 20
21do_install() { 21do_install() {
22 oe_runmake DESTDIR=${D} install 22 oe_runmake DESTDIR=${D} install
23} 23}
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 debb54328..045b06728 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"
3LIC_FILES_CHKSUM = "\ 3LIC_FILES_CHKSUM = "\
4 file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \ 4 file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \
5 file://COPYING.LESSER;md5=6ab17b41640564434dda85c06b7124f7 \ 5 file://COPYING.LESSER;md5=6ab17b41640564434dda85c06b7124f7 \
6 " 6"
7 7
8HOMEPAGE ="http://www.libimobiledevice.org/" 8HOMEPAGE ="http://www.libimobiledevice.org/"
9 9
@@ -11,7 +11,7 @@ DEPENDS = "libplist usbmuxd libtasn1 gnutls libgcrypt"
11 11
12SRC_URI = " \ 12SRC_URI = " \
13 http://www.libimobiledevice.org/downloads/libimobiledevice-${PV}.tar.bz2 \ 13 http://www.libimobiledevice.org/downloads/libimobiledevice-${PV}.tar.bz2 \
14 " 14"
15 15
16SRC_URI[md5sum] = "3f28cbc6a2e30d34685049c0abde5183" 16SRC_URI[md5sum] = "3f28cbc6a2e30d34685049c0abde5183"
17SRC_URI[sha256sum] = "67499cfaa6172f566ee6b0783605acffe484fb7ddc3b09881ab7ac58667ee5b8" 17SRC_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 134e2e5fe..ebaa48536 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
12inherit autotools lib_package 12inherit autotools lib_package
13 13
14do_compile_append() { 14do_compile_append() {
15 sed -i s:-L${STAGING_LIBDIR}::g libmicrohttpd.pc 15 sed -i s:-L${STAGING_LIBDIR}::g libmicrohttpd.pc
16} 16}
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 ec426a552..1020fd2c4 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}"
20inherit autotools binconfig 20inherit autotools binconfig
21 21
22do_configure_prepend() { 22do_configure_prepend() {
23 rm -f aclocal.m4 Makefile.am ltmain.sh 23 rm -f aclocal.m4 Makefile.am ltmain.sh
24} 24}
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 ecc254fc1..a7f81e66f 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"
8 8
9SRC_URI = "http://libtorrent.rakshasa.no/downloads/${PN}-${PV}.tar.gz \ 9SRC_URI = "http://libtorrent.rakshasa.no/downloads/${PN}-${PV}.tar.gz \
10 file://don-t-run-code-while-configuring-package.patch \ 10 file://don-t-run-code-while-configuring-package.patch \
11 " 11"
12 12
13SRC_URI[md5sum] = "e94f6c590bb02aaf4d58618f738a85f2" 13SRC_URI[md5sum] = "e94f6c590bb02aaf4d58618f738a85f2"
14SRC_URI[sha256sum] = "34317d6783b7f8d0805274c9467475b5432a246c0de8e28fc16e3b0b43f35677" 14SRC_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 cc6abd722..e63955d5d 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
23S = "${WORKDIR}/NetworkManager-${PV}" 23S = "${WORKDIR}/NetworkManager-${PV}"
24 24
25EXTRA_OECONF = " \ 25EXTRA_OECONF = " \
26 --with-distro=debian \ 26 --with-distro=debian \
27 --with-crypto=gnutls \ 27 --with-crypto=gnutls \
28 --disable-more-warnings \ 28 --disable-more-warnings \
29 --with-dhclient=${base_sbindir}/dhclient \ 29 --with-dhclient=${base_sbindir}/dhclient \
30 --with-iptables=${sbindir}/iptables \ 30 --with-iptables=${sbindir}/iptables \
31 --with-tests \ 31 --with-tests \
32" 32"
33 33
34EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" 34EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
@@ -42,21 +42,21 @@ do_configure_prepend() {
42 42
43# Work around dbus permission problems since we lack a proper at_console 43# Work around dbus permission problems since we lack a proper at_console
44do_install_prepend() { 44do_install_prepend() {
45 sed -i -e s:deny:allow:g ${S}/src/NetworkManager.conf 45 sed -i -e s:deny:allow:g ${S}/src/NetworkManager.conf
46 sed -i -e s:deny:allow:g ${S}/callouts/nm-dispatcher.conf 46 sed -i -e s:deny:allow:g ${S}/callouts/nm-dispatcher.conf
47} 47}
48 48
49do_install_append () { 49do_install_append () {
50 install -d ${D}/etc/dbus-1/event.d 50 install -d ${D}/etc/dbus-1/event.d
51 # Additional test binaries 51 # Additional test binaries
52 install -d ${D}/usr/bin 52 install -d ${D}/usr/bin
53 install -m 0755 ${S}/test/.libs/libnm* ${D}/usr/bin 53 install -m 0755 ${S}/test/.libs/libnm* ${D}/usr/bin
54 54
55 install -d ${D}/etc/NetworkManager/ 55 install -d ${D}/etc/NetworkManager/
56 56
57 # Install an empty VPN folder as nm-connection-editor will happily segfault without it :o. 57 # Install an empty VPN folder as nm-connection-editor will happily segfault without it :o.
58 # With or without VPN support built in ;). 58 # With or without VPN support built in ;).
59 install -d ${D}/etc/NetworkManager/VPN 59 install -d ${D}/etc/NetworkManager/VPN
60} 60}
61 61
62PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests" 62PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests"
@@ -66,23 +66,23 @@ FILES_libnmglib += "${libdir}/libnm_glib.so.*"
66FILES_libnmglib-vpn += "${libdir}/libnm_glib_vpn.so.*" 66FILES_libnmglib-vpn += "${libdir}/libnm_glib_vpn.so.*"
67 67
68FILES_${PN} += " \ 68FILES_${PN} += " \
69 ${libexecdir} \ 69 ${libexecdir} \
70 ${libdir}/pppd/*/nm-pppd-plugin.so \ 70 ${libdir}/pppd/*/nm-pppd-plugin.so \
71 ${libdir}/NetworkManager/*.so \ 71 ${libdir}/NetworkManager/*.so \
72 ${datadir}/polkit-1 \ 72 ${datadir}/polkit-1 \
73 ${datadir}/dbus-1 \ 73 ${datadir}/dbus-1 \
74 ${base_libdir}/udev/* \ 74 ${base_libdir}/udev/* \
75 ${systemd_unitdir}/system/NetworkManager-wait-online.service \ 75 ${systemd_unitdir}/system/NetworkManager-wait-online.service \
76" 76"
77 77
78RRECOMMENDS_${PN} += "iptables" 78RRECOMMENDS_${PN} += "iptables"
79RCONFLICTS_${PN} = "connman" 79RCONFLICTS_${PN} = "connman"
80RDEPENDS_${PN} = "wpa-supplicant dhcp-client \ 80RDEPENDS_${PN} = "wpa-supplicant dhcp-client \
81 ${@base_contains('COMBINED_FEATURES', '3gmodem', 'ppp', '', d)} \ 81 ${@base_contains('COMBINED_FEATURES', '3gmodem', 'ppp', '', d)} \
82 " 82"
83 83
84FILES_${PN}-dbg += "${libdir}/NetworkManager/.debug/ \ 84FILES_${PN}-dbg += "${libdir}/NetworkManager/.debug/ \
85 ${libdir}/pppd/*/.debug/ " 85 ${libdir}/pppd/*/.debug/ "
86 86
87FILES_${PN}-dev += "${datadir}/NetworkManager/gdb-cmd \ 87FILES_${PN}-dev += "${datadir}/NetworkManager/gdb-cmd \
88 ${libdir}/pppd/*/*.la \ 88 ${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 d08420c3a..c62c5aab3 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"
6LICENSE = "GPLv2 & LGPLv2.1" 6LICENSE = "GPLv2 & LGPLv2.1"
7LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ 7LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
8 file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ 8 file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
9 " 9"
10 10
11SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/openobex-${PV}.tar.gz \ 11SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/openobex-${PV}.tar.gz \
12 file://disable-cable-test.patch \ 12 file://disable-cable-test.patch \
@@ -21,8 +21,8 @@ EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump \
21 --with-usb=${STAGING_LIBDIR}/.. --with-bluez=${STAGING_LIBDIR}/.." 21 --with-usb=${STAGING_LIBDIR}/.. --with-bluez=${STAGING_LIBDIR}/.."
22 22
23do_install_append() { 23do_install_append() {
24 install -d ${D}${datadir}/aclocal 24 install -d ${D}${datadir}/aclocal
25 install -m 0644 ${S}/openobex.m4 ${D}${datadir}/aclocal 25 install -m 0644 ${S}/openobex.m4 ${D}${datadir}/aclocal
26} 26}
27 27
28PACKAGES += "openobex-apps" 28PACKAGES += "openobex-apps"
diff --git a/meta-oe/recipes-connectivity/openvpn/openvpn.inc b/meta-oe/recipes-connectivity/openvpn/openvpn.inc
index 50483ea4b..61f91a3ea 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"
8INC_PR = "r2" 8INC_PR = "r2"
9 9
10SRC_URI = "http://openvpn.net/release/openvpn-${PV}.tar.gz \ 10SRC_URI = "http://openvpn.net/release/openvpn-${PV}.tar.gz \
11 file://openvpn" 11 file://openvpn"
12S = "${WORKDIR}/openvpn-${PV}" 12S = "${WORKDIR}/openvpn-${PV}"
13 13
14CFLAGS += "-fno-inline" 14CFLAGS += "-fno-inline"
@@ -16,7 +16,7 @@ CFLAGS += "-fno-inline"
16inherit autotools 16inherit autotools
17 17
18do_install_append() { 18do_install_append() {
19 install -d ${D}/${sysconfdir}/init.d 19 install -d ${D}/${sysconfdir}/init.d
20 install -d ${D}/${sysconfdir}/openvpn 20 install -d ${D}/${sysconfdir}/openvpn
21 install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d 21 install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d
22} 22}
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 34567bc59..594b2666c 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"
17EXTRA_OECONF += "--enable-password-save" 17EXTRA_OECONF += "--enable-password-save"
18 18
19do_install_append() { 19do_install_append() {
20 install -d ${D}/${sysconfdir}/init.d 20 install -d ${D}/${sysconfdir}/init.d
21 install -d ${D}/${sysconfdir}/openvpn 21 install -d ${D}/${sysconfdir}/openvpn
22 install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d 22 install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d
23} 23}
24 24
25SRC_URI[md5sum] = "7486d3e270ba4b033e311d3e022a0ad7" 25SRC_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 430cf65bf..f90736dff 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"
12SRC_URI[sha256sum] = "ca10e4827a5f0a36e093aee6ad81b5febf81f8097d7d858889ac51ff364168c1" 12SRC_URI[sha256sum] = "ca10e4827a5f0a36e093aee6ad81b5febf81f8097d7d858889ac51ff364168c1"
13 13
14do_compile() { 14do_compile() {
15 oe_runmake 15 oe_runmake
16} 16}
17do_install() { 17do_install() {
18 oe_runmake DESTDIR=${D} install 18 oe_runmake DESTDIR=${D} install
19} 19}
20 20
21inherit update-alternatives 21inherit 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 7deac84e3..cbb472168 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 \
22inherit autotools update-rc.d 22inherit autotools update-rc.d
23 23
24do_install() { 24do_install() {
25 # Install init script and default settings 25 # Install init script and default settings
26 install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d 26 install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d
27 install -m 0644 ${WORKDIR}/pppoe-server.default ${D}${sysconfdir}/default/pppoe-server 27 install -m 0644 ${WORKDIR}/pppoe-server.default ${D}${sysconfdir}/default/pppoe-server
28 install -m 0755 ${WORKDIR}/pppoe-server.init ${D}${sysconfdir}/init.d/pppoe-server 28 install -m 0755 ${WORKDIR}/pppoe-server.init ${D}${sysconfdir}/init.d/pppoe-server
29 # Install 29 # Install
30 oe_runmake -C ${S} RPM_INSTALL_ROOT=${D} docdir=${docdir} install 30 oe_runmake -C ${S} RPM_INSTALL_ROOT=${D} docdir=${docdir} install
31} 31}
32 32
33# Insert server package before main package 33# 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 b460444f7..e391e7c65 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"
7 7
8SRC_URI = "http://libtorrent.rakshasa.no/downloads/${PN}-${PV}.tar.gz \ 8SRC_URI = "http://libtorrent.rakshasa.no/downloads/${PN}-${PV}.tar.gz \
9 file://don-t-run-code-while-configuring-package.patch \ 9 file://don-t-run-code-while-configuring-package.patch \
10 " 10"
11 11
12SRC_URI[md5sum] = "0bf2f262faa8c8c8d3b11ce286ea2bf2" 12SRC_URI[md5sum] = "0bf2f262faa8c8c8d3b11ce286ea2bf2"
13SRC_URI[sha256sum] = "9e93ca41beb1afe74ad7ad8013e0d53ae3586c9b0e97263d722f721535cc7310" 13SRC_URI[sha256sum] = "9e93ca41beb1afe74ad7ad8013e0d53ae3586c9b0e97263d722f721535cc7310"
diff --git a/meta-oe/recipes-connectivity/samba/samba-basic.inc b/meta-oe/recipes-connectivity/samba/samba-basic.inc
index 05a5b3a45..d0fa8e603 100644
--- a/meta-oe/recipes-connectivity/samba/samba-basic.inc
+++ b/meta-oe/recipes-connectivity/samba/samba-basic.inc
@@ -1,6 +1,6 @@
1SRC_URI += "file://config-lfs.patch \ 1SRC_URI += "file://config-lfs.patch \
2 file://quota.patch;striplevel=0 \ 2 file://quota.patch;striplevel=0 \
3 " 3"
4 4
5EXTRA_OECONF += "\ 5EXTRA_OECONF += "\
6 --enable-nss-wrapper \ 6 --enable-nss-wrapper \
diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc
index 42ddce5a1..0e4877c0c 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 \
8 file://init.samba \ 8 file://init.samba \
9 file://init.winbind \ 9 file://init.winbind \
10 file://tdb.pc \ 10 file://tdb.pc \
11 " 11"
12 12
13S = "${WORKDIR}/samba-${PV}/source" 13S = "${WORKDIR}/samba-${PV}/source"
14 14
@@ -49,51 +49,51 @@ INITSCRIPT_PARAMS = "defaults"
49CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf" 49CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf"
50 50
51do_configure_prepend () { 51do_configure_prepend () {
52 ./script/mkversion.sh 52 ./script/mkversion.sh
53 if [ ! -e acinclude.m4 ]; then 53 if [ ! -e acinclude.m4 ]; then
54 touch aclocal.m4 54 touch aclocal.m4
55 cat aclocal.m4 > acinclude.m4 55 cat aclocal.m4 > acinclude.m4
56 fi 56 fi
57} 57}
58 58
59do_compile () { 59do_compile () {
60 oe_runmake proto_exists 60 oe_runmake proto_exists
61 base_do_compile 61 base_do_compile
62} 62}
63 63
64do_install_append() { 64do_install_append() {
65 install -d ${D}${libdir}/pkgconfig/ 65 install -d ${D}${libdir}/pkgconfig/
66 cp ${WORKDIR}/tdb.pc ${D}${libdir}/pkgconfig/ 66 cp ${WORKDIR}/tdb.pc ${D}${libdir}/pkgconfig/
67 mv ${D}${libdir}/libsmbclient.so ${D}${libdir}/libsmbclient.so.0 || true 67 mv ${D}${libdir}/libsmbclient.so ${D}${libdir}/libsmbclient.so.0 || true
68 ln -sf libsmbclient.so.0 ${D}${libdir}/libsmbclient.so 68 ln -sf libsmbclient.so.0 ${D}${libdir}/libsmbclient.so
69 mkdir -p ${D}${base_sbindir} 69 mkdir -p ${D}${base_sbindir}
70 rm -f ${D}${bindir}/*.old 70 rm -f ${D}${bindir}/*.old
71 rm -f ${D}${sbindir}/*.old 71 rm -f ${D}${sbindir}/*.old
72 [ -f ${D}${sbindir}/mount.cifs ] && mv ${D}${sbindir}/mount.cifs ${D}${base_sbindir}/ 72 [ -f ${D}${sbindir}/mount.cifs ] && mv ${D}${sbindir}/mount.cifs ${D}${base_sbindir}/
73 [ -f ${D}${sbindir}/umount.cifs ] && mv ${D}${sbindir}/umount.cifs ${D}${base_sbindir}/ 73 [ -f ${D}${sbindir}/umount.cifs ] && mv ${D}${sbindir}/umount.cifs ${D}${base_sbindir}/
74 74
75 # This is needed for < 3.2.4 75 # This is needed for < 3.2.4
76 rm -f ${D}${sbindir}/mount.smbfs ${D}${base_sbindir}/mount.smbfs 76 rm -f ${D}${sbindir}/mount.smbfs ${D}${base_sbindir}/mount.smbfs
77 if [ -f ${D}${bindir}/smbmount ]; then 77 if [ -f ${D}${bindir}/smbmount ]; then
78 ln -sf ${bindir}/smbmount ${D}${base_sbindir}/mount.smb 78 ln -sf ${bindir}/smbmount ${D}${base_sbindir}/mount.smb
79 ln -sf ${bindir}/smbmount ${D}${base_sbindir}/mount.smbfs 79 ln -sf ${bindir}/smbmount ${D}${base_sbindir}/mount.smbfs
80 fi 80 fi
81 81
82 install -D -m 755 ${WORKDIR}/init.samba ${D}${sysconfdir}/init.d/samba 82 install -D -m 755 ${WORKDIR}/init.samba ${D}${sysconfdir}/init.d/samba
83 install -D -m 755 ${WORKDIR}/init.winbind ${D}${sysconfdir}/init.d/winbind 83 install -D -m 755 ${WORKDIR}/init.winbind ${D}${sysconfdir}/init.d/winbind
84 install -D -m 644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf 84 install -D -m 644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf
85 install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/volatiles.03_samba 85 install -D -m 644 ${WORKDIR}/volatiles.03_samba ${D}${sysconfdir}/default/volatiles/volatiles.03_samba
86 install -d ${D}/var/log/samba 86 install -d ${D}/var/log/samba
87 install -d ${D}/var/spool/samba 87 install -d ${D}/var/spool/samba
88 88
89 # Install other stuff not installed by "make install" 89 # Install other stuff not installed by "make install"
90 if [ -d ${WORKDIR}/${PN}-${PV}/nsswitch ]; then 90 if [ -d ${WORKDIR}/${PN}-${PV}/nsswitch ]; then
91 install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_winbind.so ${D}${libdir}/libnss_winbind.so.2 91 install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_winbind.so ${D}${libdir}/libnss_winbind.so.2
92 install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_wins.so ${D}${libdir}/libnss_wins.so.2 92 install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_wins.so ${D}${libdir}/libnss_wins.so.2
93 fi 93 fi
94 94
95 rmdir --ignore-fail-on-non-empty ${D}${base_sbindir} 95 rmdir --ignore-fail-on-non-empty ${D}${base_sbindir}
96 sed -i -e '1s,#!.*perl,#!${USRBINPATH}/env perl,' ${D}${bindir}/findsmb 96 sed -i -e '1s,#!.*perl,#!${USRBINPATH}/env perl,' ${D}${bindir}/findsmb
97} 97}
98 98
99 99
@@ -102,8 +102,8 @@ pkg_postinst_libnss-winbind () {
102 # add wins to the list of resolvers 102 # add wins to the list of resolvers
103 ns=$D${sysconfdir}/nsswitch.conf 103 ns=$D${sysconfdir}/nsswitch.conf
104 if ! grep "hosts:.*wins" $ns > /dev/null; then 104 if ! grep "hosts:.*wins" $ns > /dev/null; then
105 hosts="`grep '^hosts:' $ns`" 105 hosts="`grep '^hosts:' $ns`"
106 hosts=`echo "$hosts" | sed 's/\[/\\\\[/g; s/\]/\\\\]/g'` 106 hosts=`echo "$hosts" | sed 's/\[/\\\\[/g; s/\]/\\\\]/g'`
107 sed -i "s/$hosts/$hosts wins/" "$ns" 107 sed -i "s/$hosts/$hosts wins/" "$ns"
108 fi 108 fi
109} 109}
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 35d20c5f0..6608240d2 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
36S = "${WORKDIR}/samba-${PV}/source3" 36S = "${WORKDIR}/samba-${PV}/source3"
37 37
38EXTRA_OECONF += "\ 38EXTRA_OECONF += "\
39 ac_cv_path_PYTHON=/not/exist \ 39 ac_cv_path_PYTHON=/not/exist \
40 ac_cv_path_PYTHON_CONFIG=/not/exist \ 40 ac_cv_path_PYTHON_CONFIG=/not/exist \
41 SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \ 41 SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
42 samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \ 42 samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \
43 linux_getgrouplist_ok=no \ 43 linux_getgrouplist_ok=no \
44 samba_cv_HAVE_BROKEN_GETGROUPS=no \ 44 samba_cv_HAVE_BROKEN_GETGROUPS=no \
45 samba_cv_HAVE_FTRUNCATE_EXTEND=yes \ 45 samba_cv_HAVE_FTRUNCATE_EXTEND=yes \
46 samba_cv_have_setresuid=yes \ 46 samba_cv_have_setresuid=yes \
47 samba_cv_have_setresgid=yes \ 47 samba_cv_have_setresgid=yes \
48 samba_cv_HAVE_WRFILE_KEYTAB=yes \ 48 samba_cv_HAVE_WRFILE_KEYTAB=yes \
49 samba_cv_linux_getgrouplist_ok=yes \ 49 samba_cv_linux_getgrouplist_ok=yes \
50 " 50"
51 51
52do_configure() { 52do_configure() {
53 gnu-configize --force 53 gnu-configize --force
54 oe_runconf 54 oe_runconf
55} 55}
56 56
57do_compile () { 57do_compile () {
58 base_do_compile 58 base_do_compile
59} 59}
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 e3180d288..3afae27c9 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
15S = "${WORKDIR}/uhd-images_${PV}-release" 15S = "${WORKDIR}/uhd-images_${PV}-release"
16 16
17do_install() { 17do_install() {
18 install -d ${D}${datadir}/uhd/images 18 install -d ${D}${datadir}/uhd/images
19 install -d ${D}${datadir}/uhd/images/bit 19 install -d ${D}${datadir}/uhd/images/bit
20 install -m 0644 ${S}/share/uhd/images/bit/* ${D}${datadir}/uhd/images/bit 20 install -m 0644 ${S}/share/uhd/images/bit/* ${D}${datadir}/uhd/images/bit
21 rm -rf ${S}/share/uhd/images/bit 21 rm -rf ${S}/share/uhd/images/bit
22 install -m 0644 ${S}/share/uhd/images/* ${D}${datadir}/uhd/images 22 install -m 0644 ${S}/share/uhd/images/* ${D}${datadir}/uhd/images
23} 23}
24 24
25PACKAGES = "${PN}" 25PACKAGES = "${PN}"
diff --git a/meta-oe/recipes-connectivity/uhd/uhd_git.bb b/meta-oe/recipes-connectivity/uhd/uhd_git.bb
index b360e00f2..5a549ca6d 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"
4PR = "${INC_PR}.0" 4PR = "${INC_PR}.0"
5 5
6SRC_URI = "git://ettus.sourcerepo.com/ettus/uhd.git;branch=maint;protocol=git \ 6SRC_URI = "git://ettus.sourcerepo.com/ettus/uhd.git;branch=maint;protocol=git \
7 " 7"
8S = "${WORKDIR}/git/host" 8S = "${WORKDIR}/git/host"
9 9
10SRCREV = "0cce80c1ef2bcdb5094d579a6853261cebd2ec03" 10SRCREV = "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 e5fd7ee2a..1669d96f8 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"
18LDFLAGS_append =" -lcrypt -lcap" 18LDFLAGS_append =" -lcrypt -lcap"
19 19
20do_configure() { 20do_configure() {
21 # Fix hardcoded /usr, /etc, /var mess. 21 # Fix hardcoded /usr, /etc, /var mess.
22 cat tunables.c|sed s:\"/usr:\"${prefix}:g|sed s:\"/var:\"${localstatedir}:g \ 22 cat tunables.c|sed s:\"/usr:\"${prefix}:g|sed s:\"/var:\"${localstatedir}:g \
23 |sed s:\"${prefix}/share/empty:\"${localstatedir}/share/empty:g |sed s:\"/etc:\"${sysconfdir}:g > tunables.c.new 23 |sed s:\"${prefix}/share/empty:\"${localstatedir}/share/empty:g |sed s:\"/etc:\"${sysconfdir}:g > tunables.c.new
24 mv tunables.c.new tunables.c 24 mv tunables.c.new tunables.c
25} 25}
26 26
27do_install() { 27do_install() {
28 install -d ${D}${sbindir} 28 install -d ${D}${sbindir}
29 install -d ${D}${mandir}/man8 29 install -d ${D}${mandir}/man8
30 install -d ${D}${mandir}/man5 30 install -d ${D}${mandir}/man5
31 oe_runmake 'DESTDIR=${D}' install 31 oe_runmake 'DESTDIR=${D}' install
32 install -d ${D}${sysconfdir} 32 install -d ${D}${sysconfdir}
33 install -m 0755 ${WORKDIR}/vsftpd.conf ${D}${sysconfdir}/vsftpd.conf 33 install -m 0755 ${WORKDIR}/vsftpd.conf ${D}${sysconfdir}/vsftpd.conf
34 install -d ${D}${sysconfdir}/init.d/ 34 install -d ${D}${sysconfdir}/init.d/
35 install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/vsftpd 35 install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/vsftpd
36} 36}
37 37
38INITSCRIPT_PACKAGES = "${PN}" 38INITSCRIPT_PACKAGES = "${PN}"