diff options
Diffstat (limited to 'meta/recipes-connectivity')
28 files changed, 308 insertions, 144 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi_0.8.bb b/meta/recipes-connectivity/avahi/avahi_0.8.bb index 1f18d4491d..a78e776a18 100644 --- a/meta/recipes-connectivity/avahi/avahi_0.8.bb +++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb | |||
@@ -184,8 +184,8 @@ SYSTEMD_SERVICE:${PN}-dnsconfd = "avahi-dnsconfd.service" | |||
184 | 184 | ||
185 | do_install:append() { | 185 | do_install:append() { |
186 | install -d ${D}${sysconfdir}/udhcpc.d | 186 | install -d ${D}${sysconfdir}/udhcpc.d |
187 | install ${WORKDIR}/00avahi-autoipd ${D}${sysconfdir}/udhcpc.d | 187 | install ${UNPACKDIR}/00avahi-autoipd ${D}${sysconfdir}/udhcpc.d |
188 | install ${WORKDIR}/99avahi-autoipd ${D}${sysconfdir}/udhcpc.d | 188 | install ${UNPACKDIR}/99avahi-autoipd ${D}${sysconfdir}/udhcpc.d |
189 | } | 189 | } |
190 | 190 | ||
191 | # At the time the postinst runs, dbus might not be setup so only restart if running | 191 | # At the time the postinst runs, dbus might not be setup so only restart if running |
diff --git a/meta/recipes-connectivity/bind/bind_9.18.26.bb b/meta/recipes-connectivity/bind/bind_9.18.27.bb index 2784f3bdd9..98b8bb5513 100644 --- a/meta/recipes-connectivity/bind/bind_9.18.26.bb +++ b/meta/recipes-connectivity/bind/bind_9.18.27.bb | |||
@@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ | |||
20 | file://0001-avoid-start-failure-with-bind-user.patch \ | 20 | file://0001-avoid-start-failure-with-bind-user.patch \ |
21 | " | 21 | " |
22 | 22 | ||
23 | SRC_URI[sha256sum] = "75ffee52731e9604c849b658df29e927f1c4f01d5a71ea3ebcbeb63702cb6651" | 23 | SRC_URI[sha256sum] = "ea3f3d8cfa2f6ae78c8722751d008f54bc17a3aed2be3f7399eb7bf5f4cda8f1" |
24 | 24 | ||
25 | UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" | 25 | UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" |
26 | # follow the ESV versions divisible by 2 | 26 | # follow the ESV versions divisible by 2 |
@@ -68,15 +68,15 @@ do_install:append() { | |||
68 | 68 | ||
69 | # Install systemd related files | 69 | # Install systemd related files |
70 | install -d ${D}${sbindir} | 70 | install -d ${D}${sbindir} |
71 | install -m 755 ${WORKDIR}/generate-rndc-key.sh ${D}${sbindir} | 71 | install -m 755 ${UNPACKDIR}/generate-rndc-key.sh ${D}${sbindir} |
72 | install -d ${D}${systemd_system_unitdir} | 72 | install -d ${D}${systemd_system_unitdir} |
73 | install -m 0644 ${WORKDIR}/named.service ${D}${systemd_system_unitdir} | 73 | install -m 0644 ${UNPACKDIR}/named.service ${D}${systemd_system_unitdir} |
74 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ | 74 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
75 | -e 's,@SBINDIR@,${sbindir},g' \ | 75 | -e 's,@SBINDIR@,${sbindir},g' \ |
76 | ${D}${systemd_system_unitdir}/named.service | 76 | ${D}${systemd_system_unitdir}/named.service |
77 | 77 | ||
78 | install -d ${D}${sysconfdir}/default | 78 | install -d ${D}${sysconfdir}/default |
79 | install -m 0644 ${WORKDIR}/bind9 ${D}${sysconfdir}/default | 79 | install -m 0644 ${UNPACKDIR}/bind9 ${D}${sysconfdir}/default |
80 | 80 | ||
81 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 81 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
82 | install -d ${D}${sysconfdir}/tmpfiles.d | 82 | install -d ${D}${sysconfdir}/tmpfiles.d |
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index a31d7076ba..a1ffdeef8c 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc | |||
@@ -85,7 +85,7 @@ NOINST_TOOLS = " \ | |||
85 | 85 | ||
86 | do_install:append() { | 86 | do_install:append() { |
87 | install -d ${D}${INIT_D_DIR} | 87 | install -d ${D}${INIT_D_DIR} |
88 | install -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/bluetooth | 88 | install -m 0755 ${UNPACKDIR}/init ${D}${INIT_D_DIR}/bluetooth |
89 | 89 | ||
90 | if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then | 90 | if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then |
91 | sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth | 91 | sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth |
diff --git a/meta/recipes-connectivity/connman/connman-conf.bb b/meta/recipes-connectivity/connman/connman-conf.bb index a1a0e08faa..73c54cddae 100644 --- a/meta/recipes-connectivity/connman/connman-conf.bb +++ b/meta/recipes-connectivity/connman/connman-conf.bb | |||
@@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;m | |||
8 | SRC_URI = "file://main.conf \ | 8 | SRC_URI = "file://main.conf \ |
9 | " | 9 | " |
10 | 10 | ||
11 | S = "${WORKDIR}" | 11 | S = "${WORKDIR}/sources" |
12 | UNPACKDIR = "${S}" | ||
12 | 13 | ||
13 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 14 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
14 | 15 | ||
diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb index fcd154b4b0..46b3f854c5 100644 --- a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb +++ b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb | |||
@@ -26,5 +26,9 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | |||
26 | RDEPENDS:${PN} = "connman" | 26 | RDEPENDS:${PN} = "connman" |
27 | 27 | ||
28 | do_install:append() { | 28 | do_install:append() { |
29 | install -m 0644 ${WORKDIR}/images/* ${D}/usr/share/icons/hicolor/22x22/apps/ | 29 | install -m 0644 ${UNPACKDIR}/images/* ${D}/usr/share/icons/hicolor/22x22/apps/ |
30 | } | 30 | } |
31 | |||
32 | # http://errors.yoctoproject.org/Errors/Details/766926/ | ||
33 | # connman-client.c:200:15: error: assignment to 'GtkTreeModel *' {aka 'struct _GtkTreeModel *'} from incompatible pointer type 'GtkTreeStore *' {aka 'struct _GtkTreeStore *'} [-Wincompatible-pointer-types] | ||
34 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 7487ca0d0c..073061eeda 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc | |||
@@ -86,7 +86,7 @@ ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','sy | |||
86 | do_install:append() { | 86 | do_install:append() { |
87 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then | 87 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then |
88 | install -d ${D}${sysconfdir}/init.d | 88 | install -d ${D}${sysconfdir}/init.d |
89 | install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman | 89 | install -m 0755 ${UNPACKDIR}/connman ${D}${sysconfdir}/init.d/connman |
90 | sed -i s%@DATADIR@%${datadir}% ${D}${sysconfdir}/init.d/connman | 90 | sed -i s%@DATADIR@%${datadir}% ${D}${sysconfdir}/init.d/connman |
91 | fi | 91 | fi |
92 | 92 | ||
diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb index 6bde9b1f51..fd193b2cff 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb | |||
@@ -52,7 +52,7 @@ USERADD_PARAM:${PN} = "--system -d ${DBDIR} -M -s /bin/false -U dhcpcd" | |||
52 | do_install:append () { | 52 | do_install:append () { |
53 | # install systemd unit files | 53 | # install systemd unit files |
54 | install -d ${D}${systemd_system_unitdir} | 54 | install -d ${D}${systemd_system_unitdir} |
55 | install -m 0644 ${WORKDIR}/dhcpcd*.service ${D}${systemd_system_unitdir} | 55 | install -m 0644 ${UNPACKDIR}/dhcpcd*.service ${D}${systemd_system_unitdir} |
56 | 56 | ||
57 | chmod 700 ${D}${DBDIR} | 57 | chmod 700 ${D}${DBDIR} |
58 | chown dhcpcd:dhcpcd ${D}${DBDIR} | 58 | chown dhcpcd:dhcpcd ${D}${DBDIR} |
diff --git a/meta/recipes-connectivity/inetutils/inetutils_2.5.bb b/meta/recipes-connectivity/inetutils/inetutils_2.5.bb index 0f1a0736bd..afb0462c61 100644 --- a/meta/recipes-connectivity/inetutils/inetutils_2.5.bb +++ b/meta/recipes-connectivity/inetutils/inetutils_2.5.bb | |||
@@ -80,23 +80,23 @@ do_install:append () { | |||
80 | mv ${D}${libexecdir}/telnetd ${D}${sbindir}/in.telnetd | 80 | mv ${D}${libexecdir}/telnetd ${D}${sbindir}/in.telnetd |
81 | if [ -e ${D}${libexecdir}/rexecd ]; then | 81 | if [ -e ${D}${libexecdir}/rexecd ]; then |
82 | mv ${D}${libexecdir}/rexecd ${D}${sbindir}/in.rexecd | 82 | mv ${D}${libexecdir}/rexecd ${D}${sbindir}/in.rexecd |
83 | cp ${WORKDIR}/rexec.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rexec | 83 | cp ${UNPACKDIR}/rexec.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rexec |
84 | fi | 84 | fi |
85 | if [ -e ${D}${libexecdir}/rlogind ]; then | 85 | if [ -e ${D}${libexecdir}/rlogind ]; then |
86 | mv ${D}${libexecdir}/rlogind ${D}${sbindir}/in.rlogind | 86 | mv ${D}${libexecdir}/rlogind ${D}${sbindir}/in.rlogind |
87 | cp ${WORKDIR}/rlogin.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rlogin | 87 | cp ${UNPACKDIR}/rlogin.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rlogin |
88 | fi | 88 | fi |
89 | if [ -e ${D}${libexecdir}/rshd ]; then | 89 | if [ -e ${D}${libexecdir}/rshd ]; then |
90 | mv ${D}${libexecdir}/rshd ${D}${sbindir}/in.rshd | 90 | mv ${D}${libexecdir}/rshd ${D}${sbindir}/in.rshd |
91 | cp ${WORKDIR}/rsh.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rsh | 91 | cp ${UNPACKDIR}/rsh.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rsh |
92 | fi | 92 | fi |
93 | if [ -e ${D}${libexecdir}/talkd ]; then | 93 | if [ -e ${D}${libexecdir}/talkd ]; then |
94 | mv ${D}${libexecdir}/talkd ${D}${sbindir}/in.talkd | 94 | mv ${D}${libexecdir}/talkd ${D}${sbindir}/in.talkd |
95 | fi | 95 | fi |
96 | mv ${D}${libexecdir}/uucpd ${D}${sbindir}/in.uucpd | 96 | mv ${D}${libexecdir}/uucpd ${D}${sbindir}/in.uucpd |
97 | mv ${D}${libexecdir}/* ${D}${bindir}/ | 97 | mv ${D}${libexecdir}/* ${D}${bindir}/ |
98 | cp ${WORKDIR}/telnet.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/telnet | 98 | cp ${UNPACKDIR}/telnet.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/telnet |
99 | cp ${WORKDIR}/tftpd.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/tftpd | 99 | cp ${UNPACKDIR}/tftpd.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/tftpd |
100 | 100 | ||
101 | sed -e 's,@SBINDIR@,${sbindir},g' -i ${D}/${sysconfdir}/xinetd.d/* | 101 | sed -e 's,@SBINDIR@,${sbindir},g' -i ${D}/${sysconfdir}/xinetd.d/* |
102 | if [ -e ${D}${libdir}/charset.alias ]; then | 102 | if [ -e ${D}${libdir}/charset.alias ]; then |
diff --git a/meta/recipes-connectivity/iproute2/iproute2_6.8.0.bb b/meta/recipes-connectivity/iproute2/iproute2_6.9.0.bb index 68f7611943..d21885cd73 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_6.8.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_6.9.0.bb | |||
@@ -13,7 +13,7 @@ DEPENDS = "flex-native bison-native iptables libcap" | |||
13 | 13 | ||
14 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz" | 14 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz" |
15 | 15 | ||
16 | SRC_URI[sha256sum] = "03a6cca3d71a908d1f15f7b495be2b8fe851f941458dc4664900d7f45fcf68ce" | 16 | SRC_URI[sha256sum] = "2f643d09ea11a4a2a043c92e2b469b5f73228cbf241ae806760296ed0ec413d0" |
17 | 17 | ||
18 | inherit update-alternatives bash-completion pkgconfig | 18 | inherit update-alternatives bash-completion pkgconfig |
19 | 19 | ||
@@ -26,6 +26,8 @@ PACKAGECONFIG[selinux] = ",,libselinux" | |||
26 | 26 | ||
27 | IPROUTE2_MAKE_SUBDIRS = "lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc rdma', d)}" | 27 | IPROUTE2_MAKE_SUBDIRS = "lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc rdma', d)}" |
28 | 28 | ||
29 | # This is needed with GCC-14 and musl | ||
30 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
29 | # CFLAGS are computed in Makefile and reference CCOPTS | 31 | # CFLAGS are computed in Makefile and reference CCOPTS |
30 | # | 32 | # |
31 | EXTRA_OEMAKE = "\ | 33 | EXTRA_OEMAKE = "\ |
diff --git a/meta/recipes-connectivity/iw/iw_6.7.bb b/meta/recipes-connectivity/iw/iw_6.9.bb index b46b54bc93..dc570d1124 100644 --- a/meta/recipes-connectivity/iw/iw_6.7.bb +++ b/meta/recipes-connectivity/iw/iw_6.9.bb | |||
@@ -14,7 +14,7 @@ SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.gz \ | |||
14 | file://separate-objdir.patch \ | 14 | file://separate-objdir.patch \ |
15 | " | 15 | " |
16 | 16 | ||
17 | SRC_URI[sha256sum] = "b3ef3fa85fa1177b11d3e97d6d38cdfe10ee250ca31482b581f3bd0fc79cb015" | 17 | SRC_URI[sha256sum] = "4c3194778b175d58442907d51d1977e7270fce5cbebff0eab11c45c1da287a4b" |
18 | 18 | ||
19 | inherit pkgconfig | 19 | inherit pkgconfig |
20 | 20 | ||
diff --git a/meta/recipes-connectivity/kea/kea_2.4.1.bb b/meta/recipes-connectivity/kea/kea_2.4.1.bb index 9f8758f379..19309ce314 100644 --- a/meta/recipes-connectivity/kea/kea_2.4.1.bb +++ b/meta/recipes-connectivity/kea/kea_2.4.1.bb | |||
@@ -38,6 +38,7 @@ DEBUG_OPTIMIZATION:append:mipsel = " -O" | |||
38 | BUILD_OPTIMIZATION:remove:mipsel = " -Og" | 38 | BUILD_OPTIMIZATION:remove:mipsel = " -Og" |
39 | BUILD_OPTIMIZATION:append:mipsel = " -O" | 39 | BUILD_OPTIMIZATION:append:mipsel = " -O" |
40 | 40 | ||
41 | CXXFLAGS:remove = "-fvisibility-inlines-hidden" | ||
41 | EXTRA_OECONF = "--with-boost-libs=-lboost_system \ | 42 | EXTRA_OECONF = "--with-boost-libs=-lboost_system \ |
42 | --with-log4cplus=${STAGING_DIR_TARGET}${prefix} \ | 43 | --with-log4cplus=${STAGING_DIR_TARGET}${prefix} \ |
43 | --with-openssl=${STAGING_DIR_TARGET}${prefix}" | 44 | --with-openssl=${STAGING_DIR_TARGET}${prefix}" |
@@ -58,8 +59,8 @@ do_install:append() { | |||
58 | install -d ${D}${sysconfdir}/init.d | 59 | install -d ${D}${sysconfdir}/init.d |
59 | install -d ${D}${systemd_system_unitdir} | 60 | install -d ${D}${systemd_system_unitdir} |
60 | 61 | ||
61 | install -m 0644 ${WORKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir} | 62 | install -m 0644 ${UNPACKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir} |
62 | install -m 0755 ${WORKDIR}/kea-*-server ${D}${sysconfdir}/init.d | 63 | install -m 0755 ${UNPACKDIR}/kea-*-server ${D}${sysconfdir}/init.d |
63 | sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \ | 64 | sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
64 | -e 's,@LOCALSTATEDIR@,${localstatedir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' \ | 65 | -e 's,@LOCALSTATEDIR@,${localstatedir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' \ |
65 | ${D}${systemd_system_unitdir}/kea-dhcp*service ${D}${sbindir}/keactrl | 66 | ${D}${systemd_system_unitdir}/kea-dhcp*service ${D}${sbindir}/keactrl |
diff --git a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb index a4030b7b32..06ded45934 100644 --- a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb +++ b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb | |||
@@ -5,13 +5,13 @@ SECTION = "network" | |||
5 | LICENSE = "PD" | 5 | LICENSE = "PD" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=87964579b2a8ece4bc6744d2dc9a8b04" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=87964579b2a8ece4bc6744d2dc9a8b04" |
7 | 7 | ||
8 | SRCREV = "aae7c68671d225e6d35224613d5b98192b9b2ffe" | 8 | SRCREV = "55ba955d53305df96123534488fd160ea882b4dd" |
9 | PV = "20230416" | 9 | PV = "20240407" |
10 | PE = "1" | 10 | PE = "1" |
11 | 11 | ||
12 | SRC_URI = "git://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git;protocol=https;branch=main" | 12 | SRC_URI = "git://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git;protocol=https;branch=main" |
13 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
14 | 14 | ||
15 | inherit autotools | 15 | inherit meson |
16 | 16 | ||
17 | DEPENDS += "libxslt-native" | 17 | DEPENDS += "libxslt-native" |
diff --git a/meta/recipes-connectivity/neard/neard_0.19.bb b/meta/recipes-connectivity/neard/neard_0.19.bb index a98f436b98..94df1ac3d6 100644 --- a/meta/recipes-connectivity/neard/neard_0.19.bb +++ b/meta/recipes-connectivity/neard/neard_0.19.bb | |||
@@ -31,7 +31,7 @@ EXTRA_OECONF += "--enable-tools" | |||
31 | do_install:append() { | 31 | do_install:append() { |
32 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 32 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
33 | install -d ${D}${sysconfdir}/init.d/ | 33 | install -d ${D}${sysconfdir}/init.d/ |
34 | sed "s:@installpath@:${libexecdir}/nfc:" ${WORKDIR}/neard.in \ | 34 | sed "s:@installpath@:${libexecdir}/nfc:" ${UNPACKDIR}/neard.in \ |
35 | > ${D}${sysconfdir}/init.d/neard | 35 | > ${D}${sysconfdir}/init.d/neard |
36 | chmod 0755 ${D}${sysconfdir}/init.d/neard | 36 | chmod 0755 ${D}${sysconfdir}/init.d/neard |
37 | fi | 37 | fi |
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb index 2f2644f9a8..af7a74a5fb 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.6.4.bb | |||
@@ -122,22 +122,22 @@ HIGH_RLIMIT_NOFILE ??= "4096" | |||
122 | 122 | ||
123 | do_install:append () { | 123 | do_install:append () { |
124 | install -d ${D}${sysconfdir}/init.d | 124 | install -d ${D}${sysconfdir}/init.d |
125 | install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver | 125 | install -m 0755 ${UNPACKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver |
126 | install -m 0755 ${WORKDIR}/nfscommon ${D}${sysconfdir}/init.d/nfscommon | 126 | install -m 0755 ${UNPACKDIR}/nfscommon ${D}${sysconfdir}/init.d/nfscommon |
127 | 127 | ||
128 | install -m 0755 ${WORKDIR}/nfs-utils.conf ${D}${sysconfdir} | 128 | install -m 0755 ${UNPACKDIR}/nfs-utils.conf ${D}${sysconfdir} |
129 | install -m 0755 ${S}/utils/mount/nfsmount.conf ${D}${sysconfdir} | 129 | install -m 0755 ${S}/utils/mount/nfsmount.conf ${D}${sysconfdir} |
130 | 130 | ||
131 | install -d ${D}${systemd_system_unitdir} | 131 | install -d ${D}${systemd_system_unitdir} |
132 | install -m 0644 ${WORKDIR}/nfs-server.service ${D}${systemd_system_unitdir}/ | 132 | install -m 0644 ${UNPACKDIR}/nfs-server.service ${D}${systemd_system_unitdir}/ |
133 | install -m 0644 ${WORKDIR}/nfs-mountd.service ${D}${systemd_system_unitdir}/ | 133 | install -m 0644 ${UNPACKDIR}/nfs-mountd.service ${D}${systemd_system_unitdir}/ |
134 | install -m 0644 ${WORKDIR}/nfs-statd.service ${D}${systemd_system_unitdir}/ | 134 | install -m 0644 ${UNPACKDIR}/nfs-statd.service ${D}${systemd_system_unitdir}/ |
135 | sed -i -e 's,@SBINDIR@,${sbindir},g' \ | 135 | sed -i -e 's,@SBINDIR@,${sbindir},g' \ |
136 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ | 136 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ |
137 | -e 's,@HIGH_RLIMIT_NOFILE@,${HIGH_RLIMIT_NOFILE},g' \ | 137 | -e 's,@HIGH_RLIMIT_NOFILE@,${HIGH_RLIMIT_NOFILE},g' \ |
138 | ${D}${systemd_system_unitdir}/*.service | 138 | ${D}${systemd_system_unitdir}/*.service |
139 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 139 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
140 | install -m 0644 ${WORKDIR}/proc-fs-nfsd.mount ${D}${systemd_system_unitdir}/ | 140 | install -m 0644 ${UNPACKDIR}/proc-fs-nfsd.mount ${D}${systemd_system_unitdir}/ |
141 | install -d ${D}${systemd_system_unitdir}/sysinit.target.wants/ | 141 | install -d ${D}${systemd_system_unitdir}/sysinit.target.wants/ |
142 | ln -sf ../proc-fs-nfsd.mount ${D}${systemd_system_unitdir}/sysinit.target.wants/proc-fs-nfsd.mount | 142 | ln -sf ../proc-fs-nfsd.mount ${D}${systemd_system_unitdir}/sysinit.target.wants/proc-fs-nfsd.mount |
143 | fi | 143 | fi |
diff --git a/meta/recipes-connectivity/ofono/ofono/0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch b/meta/recipes-connectivity/ofono/ofono/0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch deleted file mode 100644 index 8a5a300adc..0000000000 --- a/meta/recipes-connectivity/ofono/ofono/0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From 22b52db4842611ac31a356f023fc09595384e2ad Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 23 May 2019 18:11:22 -0700 | ||
4 | Subject: [PATCH] mbim: add an optional TEMP_FAILURE_RETRY macro copy | ||
5 | |||
6 | Fixes build on musl which does not provide this macro | ||
7 | |||
8 | Upstream-Status: Submitted [https://lists.ofono.org/pipermail/ofono/2019-May/019370.html] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | drivers/mbimmodem/mbim-private.h | 9 +++++++++ | ||
12 | 1 file changed, 9 insertions(+) | ||
13 | |||
14 | diff --git a/drivers/mbimmodem/mbim-private.h b/drivers/mbimmodem/mbim-private.h | ||
15 | index e159235..51693ea 100644 | ||
16 | --- a/drivers/mbimmodem/mbim-private.h | ||
17 | +++ b/drivers/mbimmodem/mbim-private.h | ||
18 | @@ -21,6 +21,15 @@ | ||
19 | |||
20 | #define align_len(len, boundary) (((len)+(boundary)-1) & ~((boundary)-1)) | ||
21 | |||
22 | +#ifndef TEMP_FAILURE_RETRY | ||
23 | +#define TEMP_FAILURE_RETRY(expression) ({ \ | ||
24 | + __typeof(expression) __result; \ | ||
25 | + do { \ | ||
26 | + __result = (expression); \ | ||
27 | + } while (__result == -1 && errno == EINTR); \ | ||
28 | + __result; }) | ||
29 | +#endif | ||
30 | + | ||
31 | enum mbim_control_message { | ||
32 | MBIM_OPEN_MSG = 0x1, | ||
33 | MBIM_CLOSE_MSG = 0x2, | ||
34 | -- | ||
35 | 2.21.0 | ||
36 | |||
diff --git a/meta/recipes-connectivity/ofono/ofono/0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch b/meta/recipes-connectivity/ofono/ofono/0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch deleted file mode 100644 index 3655b3fd66..0000000000 --- a/meta/recipes-connectivity/ofono/ofono/0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From 76e4054801350ebd4a44057379431a33d460ad0f Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 21 Apr 2021 11:01:34 +0000 | ||
4 | Subject: [PATCH] mbim: Fix build with ell-0.39 by restoring unlikely macro | ||
5 | from ell/util.h | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
10 | --- | ||
11 | drivers/mbimmodem/mbim-private.h | 4 ++++ | ||
12 | 1 file changed, 4 insertions(+) | ||
13 | |||
14 | diff --git a/drivers/mbimmodem/mbim-private.h b/drivers/mbimmodem/mbim-private.h | ||
15 | index 51693eae..d917312c 100644 | ||
16 | --- a/drivers/mbimmodem/mbim-private.h | ||
17 | +++ b/drivers/mbimmodem/mbim-private.h | ||
18 | @@ -30,6 +30,10 @@ | ||
19 | __result; }) | ||
20 | #endif | ||
21 | |||
22 | +/* used to be part of ell/util.h before 0.39: | ||
23 | + https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=2a682421b06e41c45098217a686157f576847021 */ | ||
24 | +#define unlikely(x) __builtin_expect(!!(x), 0) | ||
25 | + | ||
26 | enum mbim_control_message { | ||
27 | MBIM_OPEN_MSG = 0x1, | ||
28 | MBIM_CLOSE_MSG = 0x2, | ||
diff --git a/meta/recipes-connectivity/ofono/ofono_2.4.bb b/meta/recipes-connectivity/ofono/ofono_2.7.bb index dae5cc3c25..bc1f3efd04 100644 --- a/meta/recipes-connectivity/ofono/ofono_2.4.bb +++ b/meta/recipes-connectivity/ofono/ofono_2.7.bb | |||
@@ -10,10 +10,8 @@ DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ell" | |||
10 | SRC_URI = "\ | 10 | SRC_URI = "\ |
11 | ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ | 11 | ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ |
12 | file://ofono \ | 12 | file://ofono \ |
13 | file://0001-mbim-add-an-optional-TEMP_FAILURE_RETRY-macro-copy.patch \ | ||
14 | file://0002-mbim-Fix-build-with-ell-0.39-by-restoring-unlikely-m.patch \ | ||
15 | " | 13 | " |
16 | SRC_URI[sha256sum] = "93580adc1afd1890dc516efb069de0c5cdfef014415256ddfb28ab172df2d11d" | 14 | SRC_URI[sha256sum] = "dabf6ef06b94beaad65253200abe3887046a4e722f4fe373c4264f357ae47ad3" |
17 | 15 | ||
18 | inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data | 16 | inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data |
19 | 17 | ||
@@ -30,14 +28,9 @@ PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, bluez5" | |||
30 | 28 | ||
31 | EXTRA_OECONF += "--enable-test --enable-external-ell" | 29 | EXTRA_OECONF += "--enable-test --enable-external-ell" |
32 | 30 | ||
33 | do_configure:prepend() { | ||
34 | bbnote "Removing bundled ell from ${S}/ell to prevent including it" | ||
35 | rm -rf ${S}/ell | ||
36 | } | ||
37 | |||
38 | do_install:append() { | 31 | do_install:append() { |
39 | install -d ${D}${sysconfdir}/init.d/ | 32 | install -d ${D}${sysconfdir}/init.d/ |
40 | install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono | 33 | install -m 0755 ${UNPACKDIR}/ofono ${D}${sysconfdir}/init.d/ofono |
41 | } | 34 | } |
42 | 35 | ||
43 | PACKAGES =+ "${PN}-tests" | 36 | PACKAGES =+ "${PN}-tests" |
diff --git a/meta/recipes-connectivity/openssh/openssh_9.7p1.bb b/meta/recipes-connectivity/openssh/openssh_9.7p1.bb index d1468c59fc..82da92f63f 100644 --- a/meta/recipes-connectivity/openssh/openssh_9.7p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_9.7p1.bb | |||
@@ -102,8 +102,8 @@ CACHED_CONFIGUREVARS += "ac_cv_header_maillock_h=no" | |||
102 | 102 | ||
103 | do_configure:prepend () { | 103 | do_configure:prepend () { |
104 | export LD="${CC}" | 104 | export LD="${CC}" |
105 | install -m 0644 ${WORKDIR}/sshd_config ${B}/ | 105 | install -m 0644 ${UNPACKDIR}/sshd_config ${B}/ |
106 | install -m 0644 ${WORKDIR}/ssh_config ${B}/ | 106 | install -m 0644 ${UNPACKDIR}/ssh_config ${B}/ |
107 | } | 107 | } |
108 | 108 | ||
109 | do_compile_ptest() { | 109 | do_compile_ptest() { |
@@ -112,7 +112,7 @@ do_compile_ptest() { | |||
112 | 112 | ||
113 | do_install:append () { | 113 | do_install:append () { |
114 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then | 114 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then |
115 | install -D -m 0644 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd | 115 | install -D -m 0644 ${UNPACKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd |
116 | sed -i -e 's:#UsePAM no:UsePAM yes:' ${D}${sysconfdir}/ssh/sshd_config | 116 | sed -i -e 's:#UsePAM no:UsePAM yes:' ${D}${sysconfdir}/ssh/sshd_config |
117 | fi | 117 | fi |
118 | 118 | ||
@@ -121,11 +121,11 @@ do_install:append () { | |||
121 | fi | 121 | fi |
122 | 122 | ||
123 | install -d ${D}${sysconfdir}/init.d | 123 | install -d ${D}${sysconfdir}/init.d |
124 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd | 124 | install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/sshd |
125 | rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin | 125 | rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin |
126 | rmdir ${D}${localstatedir}/run/sshd ${D}${localstatedir}/run ${D}${localstatedir} | 126 | rmdir ${D}${localstatedir}/run/sshd ${D}${localstatedir}/run ${D}${localstatedir} |
127 | install -d ${D}/${sysconfdir}/default/volatiles | 127 | install -d ${D}/${sysconfdir}/default/volatiles |
128 | install -m 644 ${WORKDIR}/volatiles.99_sshd ${D}/${sysconfdir}/default/volatiles/99_sshd | 128 | install -m 644 ${UNPACKDIR}/volatiles.99_sshd ${D}/${sysconfdir}/default/volatiles/99_sshd |
129 | install -m 0755 ${S}/contrib/ssh-copy-id ${D}${bindir} | 129 | install -m 0755 ${S}/contrib/ssh-copy-id ${D}${bindir} |
130 | 130 | ||
131 | # Create config files for read-only rootfs | 131 | # Create config files for read-only rootfs |
@@ -138,8 +138,8 @@ do_install:append () { | |||
138 | 138 | ||
139 | install -d ${D}${systemd_system_unitdir} | 139 | install -d ${D}${systemd_system_unitdir} |
140 | if ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-socket-mode','true','false',d)}; then | 140 | if ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-socket-mode','true','false',d)}; then |
141 | install -c -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_system_unitdir} | 141 | install -c -m 0644 ${UNPACKDIR}/sshd.socket ${D}${systemd_system_unitdir} |
142 | install -c -m 0644 ${WORKDIR}/sshd@.service ${D}${systemd_system_unitdir} | 142 | install -c -m 0644 ${UNPACKDIR}/sshd@.service ${D}${systemd_system_unitdir} |
143 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ | 143 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
144 | -e 's,@SBINDIR@,${sbindir},g' \ | 144 | -e 's,@SBINDIR@,${sbindir},g' \ |
145 | -e 's,@BINDIR@,${bindir},g' \ | 145 | -e 's,@BINDIR@,${bindir},g' \ |
@@ -147,9 +147,9 @@ do_install:append () { | |||
147 | ${D}${systemd_system_unitdir}/sshd.socket | 147 | ${D}${systemd_system_unitdir}/sshd.socket |
148 | fi | 148 | fi |
149 | if ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-service-mode','true','false',d)}; then | 149 | if ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-service-mode','true','false',d)}; then |
150 | install -c -m 0644 ${WORKDIR}/sshd.service ${D}${systemd_system_unitdir} | 150 | install -c -m 0644 ${UNPACKDIR}/sshd.service ${D}${systemd_system_unitdir} |
151 | fi | 151 | fi |
152 | install -c -m 0644 ${WORKDIR}/sshdgenkeys.service ${D}${systemd_system_unitdir} | 152 | install -c -m 0644 ${UNPACKDIR}/sshdgenkeys.service ${D}${systemd_system_unitdir} |
153 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ | 153 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
154 | -e 's,@SBINDIR@,${sbindir},g' \ | 154 | -e 's,@SBINDIR@,${sbindir},g' \ |
155 | -e 's,@BINDIR@,${bindir},g' \ | 155 | -e 's,@BINDIR@,${bindir},g' \ |
@@ -159,7 +159,7 @@ do_install:append () { | |||
159 | sed -i -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \ | 159 | sed -i -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \ |
160 | ${D}${sysconfdir}/init.d/sshd | 160 | ${D}${sysconfdir}/init.d/sshd |
161 | 161 | ||
162 | install -D -m 0755 ${WORKDIR}/sshd_check_keys ${D}${libexecdir}/${BPN}/sshd_check_keys | 162 | install -D -m 0755 ${UNPACKDIR}/sshd_check_keys ${D}${libexecdir}/${BPN}/sshd_check_keys |
163 | } | 163 | } |
164 | 164 | ||
165 | do_install_ptest () { | 165 | do_install_ptest () { |
diff --git a/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh b/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh index 6f23490c87..f90088aab7 100644 --- a/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh +++ b/meta/recipes-connectivity/openssl/files/environment.d-openssl.sh | |||
@@ -3,3 +3,4 @@ export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs" | |||
3 | export SSL_CERT_FILE="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs/ca-certificates.crt" | 3 | export SSL_CERT_FILE="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs/ca-certificates.crt" |
4 | export OPENSSL_MODULES="$OECORE_NATIVE_SYSROOT/usr/lib/ossl-modules/" | 4 | export OPENSSL_MODULES="$OECORE_NATIVE_SYSROOT/usr/lib/ossl-modules/" |
5 | export OPENSSL_ENGINES="$OECORE_NATIVE_SYSROOT/usr/lib/engines-3" | 5 | export OPENSSL_ENGINES="$OECORE_NATIVE_SYSROOT/usr/lib/engines-3" |
6 | export BB_ENV_PASSTHROUGH_ADDITIONS="$BB_ENV_PASSTHROUGH_ADDITIONS SSL_CERT_DIR SSL_CERT_FILE OPENSSL_CONF OPENSSL_MODULES OPENSSL_ENGINES" | ||
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Implement-riscv_vlen_asm-for-riscv32.patch b/meta/recipes-connectivity/openssl/openssl/0001-Implement-riscv_vlen_asm-for-riscv32.patch new file mode 100644 index 0000000000..e398d1074a --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/0001-Implement-riscv_vlen_asm-for-riscv32.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From 725b1530456545e8511adc9cbdd265309dffad53 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongren Zheng <i@zenithal.me> | ||
3 | Date: Fri, 26 Apr 2024 06:03:43 +0000 | ||
4 | Subject: [PATCH] Implement riscv_vlen_asm for riscv32 | ||
5 | |||
6 | riscvcap.c: undefined reference to 'riscv_vlen_asm' | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/openssl/openssl/pull/24270] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | crypto/riscv32cpuid.pl | 17 +++++++++++++++++ | ||
12 | 1 file changed, 17 insertions(+) | ||
13 | |||
14 | diff --git a/crypto/riscv32cpuid.pl b/crypto/riscv32cpuid.pl | ||
15 | index 20694e7..ac1c043 100644 | ||
16 | --- a/crypto/riscv32cpuid.pl | ||
17 | +++ b/crypto/riscv32cpuid.pl | ||
18 | @@ -84,5 +84,22 @@ OPENSSL_cleanse: | ||
19 | ___ | ||
20 | } | ||
21 | |||
22 | +{ | ||
23 | +my ($ret) = ('a0'); | ||
24 | +$code .= <<___; | ||
25 | +################################################################################ | ||
26 | +# size_t riscv_vlen_asm(void) | ||
27 | +# Return VLEN (i.e. the length of a vector register in bits). | ||
28 | +.p2align 3 | ||
29 | +.globl riscv_vlen_asm | ||
30 | +.type riscv_vlen_asm,\@function | ||
31 | +riscv_vlen_asm: | ||
32 | + csrr $ret, vlenb | ||
33 | + slli $ret, $ret, 3 | ||
34 | + ret | ||
35 | +.size riscv_vlen_asm,.-riscv_vlen_asm | ||
36 | +___ | ||
37 | +} | ||
38 | + | ||
39 | print $code; | ||
40 | close STDOUT or die "error closing STDOUT: $!"; | ||
41 | -- | ||
42 | 2.45.0 | ||
43 | |||
diff --git a/meta/recipes-connectivity/openssl/openssl/CVE-2024-4603.patch b/meta/recipes-connectivity/openssl/openssl/CVE-2024-4603.patch new file mode 100644 index 0000000000..cdc3d0d503 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/CVE-2024-4603.patch | |||
@@ -0,0 +1,179 @@ | |||
1 | From 53ea06486d296b890d565fb971b2764fcd826e7e Mon Sep 17 00:00:00 2001 | ||
2 | From: Tomas Mraz <tomas@openssl.org> | ||
3 | Date: Wed, 8 May 2024 15:23:45 +0200 | ||
4 | Subject: [PATCH] Check DSA parameters for excessive sizes before validating | ||
5 | |||
6 | This avoids overly long computation of various validation | ||
7 | checks. | ||
8 | |||
9 | Fixes CVE-2024-4603 | ||
10 | |||
11 | Reviewed-by: Paul Dale <ppzgs1@gmail.com> | ||
12 | Reviewed-by: Matt Caswell <matt@openssl.org> | ||
13 | Reviewed-by: Neil Horman <nhorman@openssl.org> | ||
14 | Reviewed-by: Shane Lontis <shane.lontis@oracle.com> | ||
15 | (Merged from https://github.com/openssl/openssl/pull/24346) | ||
16 | |||
17 | (cherry picked from commit 85ccbab216da245cf9a6503dd327072f21950d9b) | ||
18 | |||
19 | <dropped CHANGES.md modifications as it would need backport of all previous changes> | ||
20 | |||
21 | CVE: CVE-2024-4603 | ||
22 | Upstream-Status: Backport [https://github.com/openssl/openssl/commit/53ea06486d296b890d565fb971b2764fcd826e7e] | ||
23 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
24 | --- | ||
25 | crypto/dsa/dsa_check.c | 44 ++++++++++++-- | ||
26 | .../invalid/p10240_q256_too_big.pem | 57 +++++++++++++++++++ | ||
27 | 2 files changed, 97 insertions(+), 4 deletions(-) | ||
28 | |||
29 | diff --git a/crypto/dsa/dsa_check.c b/crypto/dsa/dsa_check.c | ||
30 | index 7b6d7df88f..e1375dfad9 100644 | ||
31 | --- a/crypto/dsa/dsa_check.c | ||
32 | +++ b/crypto/dsa/dsa_check.c | ||
33 | @@ -19,8 +19,34 @@ | ||
34 | #include "dsa_local.h" | ||
35 | #include "crypto/dsa.h" | ||
36 | |||
37 | +static int dsa_precheck_params(const DSA *dsa, int *ret) | ||
38 | +{ | ||
39 | + if (dsa->params.p == NULL || dsa->params.q == NULL) { | ||
40 | + ERR_raise(ERR_LIB_DSA, DSA_R_BAD_FFC_PARAMETERS); | ||
41 | + *ret = FFC_CHECK_INVALID_PQ; | ||
42 | + return 0; | ||
43 | + } | ||
44 | + | ||
45 | + if (BN_num_bits(dsa->params.p) > OPENSSL_DSA_MAX_MODULUS_BITS) { | ||
46 | + ERR_raise(ERR_LIB_DSA, DSA_R_MODULUS_TOO_LARGE); | ||
47 | + *ret = FFC_CHECK_INVALID_PQ; | ||
48 | + return 0; | ||
49 | + } | ||
50 | + | ||
51 | + if (BN_num_bits(dsa->params.q) >= BN_num_bits(dsa->params.p)) { | ||
52 | + ERR_raise(ERR_LIB_DSA, DSA_R_BAD_Q_VALUE); | ||
53 | + *ret = FFC_CHECK_INVALID_PQ; | ||
54 | + return 0; | ||
55 | + } | ||
56 | + | ||
57 | + return 1; | ||
58 | +} | ||
59 | + | ||
60 | int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret) | ||
61 | { | ||
62 | + if (!dsa_precheck_params(dsa, ret)) | ||
63 | + return 0; | ||
64 | + | ||
65 | if (checktype == OSSL_KEYMGMT_VALIDATE_QUICK_CHECK) | ||
66 | return ossl_ffc_params_simple_validate(dsa->libctx, &dsa->params, | ||
67 | FFC_PARAM_TYPE_DSA, ret); | ||
68 | @@ -39,6 +65,9 @@ int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret) | ||
69 | */ | ||
70 | int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret) | ||
71 | { | ||
72 | + if (!dsa_precheck_params(dsa, ret)) | ||
73 | + return 0; | ||
74 | + | ||
75 | return ossl_ffc_validate_public_key(&dsa->params, pub_key, ret) | ||
76 | && *ret == 0; | ||
77 | } | ||
78 | @@ -50,6 +79,9 @@ int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret) | ||
79 | */ | ||
80 | int ossl_dsa_check_pub_key_partial(const DSA *dsa, const BIGNUM *pub_key, int *ret) | ||
81 | { | ||
82 | + if (!dsa_precheck_params(dsa, ret)) | ||
83 | + return 0; | ||
84 | + | ||
85 | return ossl_ffc_validate_public_key_partial(&dsa->params, pub_key, ret) | ||
86 | && *ret == 0; | ||
87 | } | ||
88 | @@ -58,8 +90,10 @@ int ossl_dsa_check_priv_key(const DSA *dsa, const BIGNUM *priv_key, int *ret) | ||
89 | { | ||
90 | *ret = 0; | ||
91 | |||
92 | - return (dsa->params.q != NULL | ||
93 | - && ossl_ffc_validate_private_key(dsa->params.q, priv_key, ret)); | ||
94 | + if (!dsa_precheck_params(dsa, ret)) | ||
95 | + return 0; | ||
96 | + | ||
97 | + return ossl_ffc_validate_private_key(dsa->params.q, priv_key, ret); | ||
98 | } | ||
99 | |||
100 | /* | ||
101 | @@ -72,8 +106,10 @@ int ossl_dsa_check_pairwise(const DSA *dsa) | ||
102 | BN_CTX *ctx = NULL; | ||
103 | BIGNUM *pub_key = NULL; | ||
104 | |||
105 | - if (dsa->params.p == NULL | ||
106 | - || dsa->params.g == NULL | ||
107 | + if (!dsa_precheck_params(dsa, &ret)) | ||
108 | + return 0; | ||
109 | + | ||
110 | + if (dsa->params.g == NULL | ||
111 | || dsa->priv_key == NULL | ||
112 | || dsa->pub_key == NULL) | ||
113 | return 0; | ||
114 | diff --git a/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem b/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem | ||
115 | new file mode 100644 | ||
116 | index 0000000000..e85e2953b7 | ||
117 | --- /dev/null | ||
118 | +++ b/test/recipes/15-test_dsaparam_data/invalid/p10240_q256_too_big.pem | ||
119 | @@ -0,0 +1,57 @@ | ||
120 | +-----BEGIN DSA PARAMETERS----- | ||
121 | +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 | ||
175 | +vKuje86bePD6kD/LH3wmkA== | ||
176 | +-----END DSA PARAMETERS----- | ||
177 | -- | ||
178 | 2.30.2 | ||
179 | |||
diff --git a/meta/recipes-connectivity/openssl/openssl_3.3.0.bb b/meta/recipes-connectivity/openssl/openssl_3.3.0.bb index 2cdaf4c75d..a361185b65 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.3.0.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.3.0.bb | |||
@@ -12,7 +12,9 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ | |||
12 | file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ | 12 | file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ |
13 | file://0001-Configure-do-not-tweak-mips-cflags.patch \ | 13 | file://0001-Configure-do-not-tweak-mips-cflags.patch \ |
14 | file://0001-Added-handshake-history-reporting-when-test-fails.patch \ | 14 | file://0001-Added-handshake-history-reporting-when-test-fails.patch \ |
15 | file://0001-Implement-riscv_vlen_asm-for-riscv32.patch \ | ||
15 | file://bti.patch \ | 16 | file://bti.patch \ |
17 | file://CVE-2024-4603.patch \ | ||
16 | " | 18 | " |
17 | 19 | ||
18 | SRC_URI:append:class-nativesdk = " \ | 20 | SRC_URI:append:class-nativesdk = " \ |
@@ -136,16 +138,12 @@ do_configure () { | |||
136 | ;; | 138 | ;; |
137 | esac | 139 | esac |
138 | 140 | ||
139 | useprefix=${prefix} | ||
140 | if [ "x$useprefix" = "x" ]; then | ||
141 | useprefix=/ | ||
142 | fi | ||
143 | # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the | 141 | # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the |
144 | # environment variables set by bitbake. Adjust the environment variables instead. | 142 | # environment variables set by bitbake. Adjust the environment variables instead. |
145 | PERLEXTERNAL="$(realpath ${S}/external/perl/Text-Template-*/lib)" | 143 | PERLEXTERNAL="$(realpath ${S}/external/perl/Text-Template-*/lib)" |
146 | test -d "$PERLEXTERNAL" || bberror "PERLEXTERNAL '$PERLEXTERNAL' not found!" | 144 | test -d "$PERLEXTERNAL" || bberror "PERLEXTERNAL '$PERLEXTERNAL' not found!" |
147 | HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="$PERLEXTERNAL" \ | 145 | HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="$PERLEXTERNAL" \ |
148 | perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} ${DEPRECATED_CRYPTO_FLAGS} --prefix=$useprefix --openssldir=${libdir}/ssl-3 --libdir=${libdir} $target | 146 | perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} ${DEPRECATED_CRYPTO_FLAGS} --prefix=${prefix} --openssldir=${libdir}/ssl-3 --libdir=${baselib} $target |
149 | perl ${B}/configdata.pm --dump | 147 | perl ${B}/configdata.pm --dump |
150 | } | 148 | } |
151 | 149 | ||
@@ -181,7 +179,7 @@ do_install:append:class-native () { | |||
181 | 179 | ||
182 | do_install:append:class-nativesdk () { | 180 | do_install:append:class-nativesdk () { |
183 | mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d | 181 | mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d |
184 | install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh | 182 | install -m 644 ${UNPACKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh |
185 | sed 's|/usr/lib/ssl/|/usr/lib/ssl-3/|g' -i ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh | 183 | sed 's|/usr/lib/ssl/|/usr/lib/ssl-3/|g' -i ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh |
186 | } | 184 | } |
187 | 185 | ||
diff --git a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb index 099c58bfc7..0ee47d47c2 100644 --- a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb +++ b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb | |||
@@ -11,14 +11,15 @@ SRC_URI = "file://host-peer \ | |||
11 | 11 | ||
12 | inherit allarch useradd | 12 | inherit allarch useradd |
13 | 13 | ||
14 | S = "${WORKDIR}" | 14 | S = "${WORKDIR}/sources" |
15 | UNPACKDIR = "${S}" | ||
15 | 16 | ||
16 | do_install() { | 17 | do_install() { |
17 | install -d ${D}${sysconfdir}/ppp/peers | 18 | install -d ${D}${sysconfdir}/ppp/peers |
18 | install -m 0644 ${WORKDIR}/host-peer ${D}${sysconfdir}/ppp/peers/host | 19 | install -m 0644 ${S}/host-peer ${D}${sysconfdir}/ppp/peers/host |
19 | 20 | ||
20 | install -d ${D}${sbindir} | 21 | install -d ${D}${sbindir} |
21 | install -m 0755 ${WORKDIR}/ppp-dialin ${D}${sbindir} | 22 | install -m 0755 ${S}/ppp-dialin ${D}${sbindir} |
22 | } | 23 | } |
23 | 24 | ||
24 | USERADD_PACKAGES = "${PN}" | 25 | USERADD_PACKAGES = "${PN}" |
diff --git a/meta/recipes-connectivity/ppp/ppp_2.5.0.bb b/meta/recipes-connectivity/ppp/ppp_2.5.0.bb index 5f0c75de83..36e2585de4 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.5.0.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.5.0.bb | |||
@@ -35,20 +35,20 @@ do_install:append () { | |||
35 | mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d | 35 | mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d |
36 | mkdir -p ${D}${sysconfdir}/ppp/ip-up.d/ | 36 | mkdir -p ${D}${sysconfdir}/ppp/ip-up.d/ |
37 | mkdir -p ${D}${sysconfdir}/ppp/ip-down.d/ | 37 | mkdir -p ${D}${sysconfdir}/ppp/ip-down.d/ |
38 | install -m 0755 ${WORKDIR}/pon ${D}${bindir}/pon | 38 | install -m 0755 ${UNPACKDIR}/pon ${D}${bindir}/pon |
39 | install -m 0755 ${WORKDIR}/poff ${D}${bindir}/poff | 39 | install -m 0755 ${UNPACKDIR}/poff ${D}${bindir}/poff |
40 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ppp | 40 | install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/ppp |
41 | install -m 0755 ${WORKDIR}/ip-up ${D}${sysconfdir}/ppp/ | 41 | install -m 0755 ${UNPACKDIR}/ip-up ${D}${sysconfdir}/ppp/ |
42 | install -m 0755 ${WORKDIR}/ip-down ${D}${sysconfdir}/ppp/ | 42 | install -m 0755 ${UNPACKDIR}/ip-down ${D}${sysconfdir}/ppp/ |
43 | install -m 0755 ${WORKDIR}/08setupdns ${D}${sysconfdir}/ppp/ip-up.d/ | 43 | install -m 0755 ${UNPACKDIR}/08setupdns ${D}${sysconfdir}/ppp/ip-up.d/ |
44 | install -m 0755 ${WORKDIR}/92removedns ${D}${sysconfdir}/ppp/ip-down.d/ | 44 | install -m 0755 ${UNPACKDIR}/92removedns ${D}${sysconfdir}/ppp/ip-down.d/ |
45 | mkdir -p ${D}${sysconfdir}/chatscripts | 45 | mkdir -p ${D}${sysconfdir}/chatscripts |
46 | mkdir -p ${D}${sysconfdir}/ppp/peers | 46 | mkdir -p ${D}${sysconfdir}/ppp/peers |
47 | install -m 0755 ${WORKDIR}/pap ${D}${sysconfdir}/chatscripts | 47 | install -m 0755 ${UNPACKDIR}/pap ${D}${sysconfdir}/chatscripts |
48 | install -m 0755 ${WORKDIR}/ppp_on_boot ${D}${sysconfdir}/ppp/ppp_on_boot | 48 | install -m 0755 ${UNPACKDIR}/ppp_on_boot ${D}${sysconfdir}/ppp/ppp_on_boot |
49 | install -m 0755 ${WORKDIR}/provider ${D}${sysconfdir}/ppp/peers/provider | 49 | install -m 0755 ${UNPACKDIR}/provider ${D}${sysconfdir}/ppp/peers/provider |
50 | install -d ${D}${systemd_system_unitdir} | 50 | install -d ${D}${systemd_system_unitdir} |
51 | install -m 0644 ${WORKDIR}/ppp@.service ${D}${systemd_system_unitdir} | 51 | install -m 0644 ${UNPACKDIR}/ppp@.service ${D}${systemd_system_unitdir} |
52 | sed -i -e 's,@SBINDIR@,${sbindir},g' \ | 52 | sed -i -e 's,@SBINDIR@,${sbindir},g' \ |
53 | ${D}${systemd_system_unitdir}/ppp@.service | 53 | ${D}${systemd_system_unitdir}/ppp@.service |
54 | } | 54 | } |
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.92.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.92.bb index 226cb7ee77..c3ce5bc22e 100644 --- a/meta/recipes-connectivity/resolvconf/resolvconf_1.92.bb +++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.92.bb | |||
@@ -29,7 +29,7 @@ do_compile () { | |||
29 | 29 | ||
30 | do_install () { | 30 | do_install () { |
31 | install -d ${D}${sysconfdir}/default/volatiles | 31 | install -d ${D}${sysconfdir}/default/volatiles |
32 | install -m 0644 ${WORKDIR}/99_resolvconf ${D}${sysconfdir}/default/volatiles | 32 | install -m 0644 ${UNPACKDIR}/99_resolvconf ${D}${sysconfdir}/default/volatiles |
33 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 33 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
34 | install -d ${D}${sysconfdir}/tmpfiles.d | 34 | install -d ${D}${sysconfdir}/tmpfiles.d |
35 | echo "d /run/${BPN}/interface - - - -" \ | 35 | echo "d /run/${BPN}/interface - - - -" \ |
diff --git a/meta/recipes-connectivity/slirp/libslirp_git.bb b/meta/recipes-connectivity/slirp/libslirp_git.bb index 334b786b9b..05830ce833 100644 --- a/meta/recipes-connectivity/slirp/libslirp_git.bb +++ b/meta/recipes-connectivity/slirp/libslirp_git.bb | |||
@@ -5,8 +5,8 @@ LICENSE = "BSD-3-Clause & MIT" | |||
5 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=bca0186b14e6b05e338e729f106db727" | 5 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=bca0186b14e6b05e338e729f106db727" |
6 | 6 | ||
7 | SRC_URI = "git://gitlab.freedesktop.org/slirp/libslirp.git;protocol=https;branch=master" | 7 | SRC_URI = "git://gitlab.freedesktop.org/slirp/libslirp.git;protocol=https;branch=master" |
8 | SRCREV = "3ad1710a96678fe79066b1469cead4058713a1d9" | 8 | SRCREV = "ce314e39458223c2c42245fe536fbe1bcd94e9b1" |
9 | PV = "4.7.0" | 9 | PV = "4.8.0" |
10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
11 | 11 | ||
12 | DEPENDS = " \ | 12 | DEPENDS = " \ |
diff --git a/meta/recipes-connectivity/ssh-pregen-hostkeys/ssh-pregen-hostkeys_1.0.bb b/meta/recipes-connectivity/ssh-pregen-hostkeys/ssh-pregen-hostkeys_1.0.bb index ddd10e6eeb..db5a0eb8ce 100644 --- a/meta/recipes-connectivity/ssh-pregen-hostkeys/ssh-pregen-hostkeys_1.0.bb +++ b/meta/recipes-connectivity/ssh-pregen-hostkeys/ssh-pregen-hostkeys_1.0.bb | |||
@@ -6,14 +6,19 @@ SRC_URI = "file://dropbear_rsa_host_key \ | |||
6 | LICENSE = "MIT" | 6 | LICENSE = "MIT" |
7 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | 7 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" |
8 | 8 | ||
9 | S = "${WORKDIR}/sources" | ||
10 | UNPACKDIR = "${S}" | ||
11 | |||
9 | INHIBIT_DEFAULT_DEPS = "1" | 12 | INHIBIT_DEFAULT_DEPS = "1" |
10 | 13 | ||
14 | COMPATIBLE_MACHINE = "^qemu.*$" | ||
15 | |||
11 | do_install () { | 16 | do_install () { |
12 | install -d ${D}${sysconfdir}/dropbear | 17 | install -d ${D}${sysconfdir}/dropbear |
13 | install ${WORKDIR}/dropbear_rsa_host_key -m 0600 ${D}${sysconfdir}/dropbear/ | 18 | install ${UNPACKDIR}/dropbear_rsa_host_key -m 0600 ${D}${sysconfdir}/dropbear/ |
14 | 19 | ||
15 | install -d ${D}${sysconfdir}/ssh | 20 | install -d ${D}${sysconfdir}/ssh |
16 | install ${WORKDIR}/openssh/* ${D}${sysconfdir}/ssh/ | 21 | install ${UNPACKDIR}/openssh/* ${D}${sysconfdir}/ssh/ |
17 | chmod 0600 ${D}${sysconfdir}/ssh/* | 22 | chmod 0600 ${D}${sysconfdir}/ssh/* |
18 | chmod 0644 ${D}${sysconfdir}/ssh/*.pub | 23 | chmod 0644 ${D}${sysconfdir}/ssh/*.pub |
19 | } \ No newline at end of file | 24 | } |
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb index 22028ce957..8113bcab09 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb | |||
@@ -62,15 +62,15 @@ do_install () { | |||
62 | oe_runmake -C wpa_supplicant DESTDIR="${D}" install | 62 | oe_runmake -C wpa_supplicant DESTDIR="${D}" install |
63 | 63 | ||
64 | install -d ${D}${docdir}/wpa_supplicant | 64 | install -d ${D}${docdir}/wpa_supplicant |
65 | install -m 644 wpa_supplicant/README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant | 65 | install -m 644 wpa_supplicant/README ${UNPACKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant |
66 | 66 | ||
67 | install -d ${D}${sysconfdir} | 67 | install -d ${D}${sysconfdir} |
68 | install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf | 68 | install -m 600 ${UNPACKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf |
69 | 69 | ||
70 | install -d ${D}${sysconfdir}/network/if-pre-up.d/ | 70 | install -d ${D}${sysconfdir}/network/if-pre-up.d/ |
71 | install -d ${D}${sysconfdir}/network/if-post-down.d/ | 71 | install -d ${D}${sysconfdir}/network/if-post-down.d/ |
72 | install -d ${D}${sysconfdir}/network/if-down.d/ | 72 | install -d ${D}${sysconfdir}/network/if-down.d/ |
73 | install -m 755 ${WORKDIR}/wpa-supplicant.sh ${D}${sysconfdir}/network/if-pre-up.d/wpa-supplicant | 73 | install -m 755 ${UNPACKDIR}/wpa-supplicant.sh ${D}${sysconfdir}/network/if-pre-up.d/wpa-supplicant |
74 | ln -sf ../if-pre-up.d/wpa-supplicant ${D}${sysconfdir}/network/if-post-down.d/wpa-supplicant | 74 | ln -sf ../if-pre-up.d/wpa-supplicant ${D}${sysconfdir}/network/if-post-down.d/wpa-supplicant |
75 | 75 | ||
76 | install -d ${D}/${sysconfdir}/dbus-1/system.d | 76 | install -d ${D}/${sysconfdir}/dbus-1/system.d |
@@ -84,7 +84,7 @@ do_install () { | |||
84 | fi | 84 | fi |
85 | 85 | ||
86 | install -d ${D}/etc/default/volatiles | 86 | install -d ${D}/etc/default/volatiles |
87 | install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles | 87 | install -m 0644 ${UNPACKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles |
88 | 88 | ||
89 | install -d ${D}${includedir} | 89 | install -d ${D}${includedir} |
90 | install -m 0644 ${S}/src/common/wpa_ctrl.h ${D}${includedir} | 90 | install -m 0644 ${S}/src/common/wpa_ctrl.h ${D}${includedir} |