Message ID | 529747E4.3050509@madsdore.dk |
---|---|
State | Changes Requested |
Delegated to: | Esben Haabendal |
Headers | show |
Hi Mads Your patch is completely destroyed by linewrapping. You really should consider using git send-email to send it, and not try to paste in the patch in Thunderbird or any other GUI mailer. /Esben
Mads Doré <dore@madsdore.dk> writes: > diff -urN base.orig/hostapd/hostapd-1.0/hostapd.conf > base/hostapd/hostapd-1.0/hostapd.conf Do we really need to have this huge config file in here? It is almost identical to the one in hostapd-1.0 source. Keeping it in sync is going to cost on each upgrade of hostapd, so it might be a good idea to implement changes to the hostapd.conf from source by adding some code in do_configure to fix it up, according to some USE flags as needed. > diff -urN base.orig/hostapd/hostapd_1.0.oe base/hostapd/hostapd_1.0.oe > --- base.orig/hostapd/hostapd_1.0.oe 1970-01-01 01:00:00.000000000 +0100 > +++ base/hostapd/hostapd_1.0.oe 2013-11-01 10:20:34.000000000 +0100 > +PACKAGE =+ "${PN}-conf" > + > +# RDEPENDS_${PN} += "${LIBS} ${PN}-conf" ØH HVORFOR DEN SIDSTE KLUMP ? You should use the version commented out above, as it makes sure that users of hostapd get the hostapd-conf package also, which I assume is needed for proper operation. /Esben
On 11/28/2013 03:19 PM, Esben Haabendal wrote: > Hi Mads > > Your patch is completely destroyed by linewrapping. You really should > consider using git send-email to send it, and not try to paste in the > patch in Thunderbird or any other GUI mailer. > > /Esben OK, will do that next time. By the way have do I use git send-email to reply on an e-mail to get it on the same thread?
Mads Doré <dore@madsdore.dk> writes: > On 11/28/2013 03:19 PM, Esben Haabendal wrote: >> Your patch is completely destroyed by linewrapping. You really should >> consider using git send-email to send it, and not try to paste in the >> patch in Thunderbird or any other GUI mailer. > > OK, will do that next time. By the way have do I use git send-email to > reply on an e-mail to get it on the same thread? You should use the '--in-reply-to=<identifier>' option to git send-email. The identifier to use is the value of the 'Message-ID:' header of the mail in the thread you want the reply to become a child of. /Esben
Mads Doré <dore@madsdore.dk> writes: > On 11/28/2013 03:25 PM, Esben Haabendal wrote: >> Mads Doré <dore@madsdore.dk> writes: >> >>> diff -urN base.orig/hostapd/hostapd-1.0/hostapd.conf >>> base/hostapd/hostapd-1.0/hostapd.conf >> Do we really need to have this huge config file in here? It is almost >> identical to the one in hostapd-1.0 source. Keeping it in sync is going >> to cost on each upgrade of hostapd, so it might be a good idea to >> implement changes to the hostapd.conf from source by adding some code in >> do_configure to fix it up, according to some USE flags as needed. > > No we don't - but I couldn't easily understand the do_configure and USE > flags description in the documentation. To get the job done I went for a > working and easy solution - full file in and I was on the track again. > Hint taken. The USE flags and task documentation could defintely be improved. But I would really like to see the 40kB conf file to be dropped before merging it. Once in the repo, it will stay forever, adding to clone time and using disk space of all OE-lite/base users. >>> diff -urN base.orig/hostapd/hostapd_1.0.oe base/hostapd/hostapd_1.0.oe >>> --- base.orig/hostapd/hostapd_1.0.oe 1970-01-01 01:00:00.000000000 +0100 >>> +++ base/hostapd/hostapd_1.0.oe 2013-11-01 10:20:34.000000000 +0100 >>> +PACKAGE =+ "${PN}-conf" >>> + >>> +# RDEPENDS_${PN} += "${LIBS} ${PN}-conf" ØH HVORFOR DEN SIDSTE KLUMP ? >> You should use the version commented out above, as it makes sure that >> users of hostapd get the hostapd-conf package also, which I assume is >> needed for proper operation. > > Broke the build, when it was included - don't know why. Removing it made > it build and run on target, works - don't know why. Ok. Are you sure you are actually using the hostapd.conf file then? It should end up as packaged into ${PN}-conf, and without a dependency on it, you wont get it unless you add an explicit dependency on it in your image recipe. /Esben
diff -urN base.orig/hostapd/hostapd_1.0.oe base/hostapd/hostapd_1.0.oe --- base.orig/hostapd/hostapd_1.0.oe 1970-01-01 01:00:00.000000000 +0100 +++ base/hostapd/hostapd_1.0.oe 2013-11-01 10:20:34.000000000 +0100 @@ -0,0 +1,42 @@ +DESCRIPTION = "User space daemon for extended IEEE 802.11 management" +HOMEPAGE = "http://hostap.epitest.fi" +LICENSE = "GPLv2 | BSD" + +SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz" +SRC_URI += "file://defconfig" +SRC_URI += "file://init" +SRC_URI += "file://hostapd.conf" + +inherit c make + +LIBS = "libnl-3 libnl-genl-3 libssl libcrypto" +DEPENDS += "${LIBS}" + +RDEPENDS += "libnl-3 libnl-genl-3 openssl crda" + +S = "${SRCDIR}/hostapd-${PV}/hostapd" + +CFLAGS += "-I${HOST_SYSROOT}${includedir}/libnl3" +# CFLAGS += "-MMD -O2 -Wall -g -I${HOST_SYSROOT}${includedir}/libnl3" + +do_configure() { + install -m 0644 ${SRCDIR}/defconfig ${S}/.config +} + +# install -m 0644 ${S}/hostapd.conf ${D}${sysconfdir} + +do_install() { + install -d ${D}${sbindir} ${D}${sysconfdir}/init.d + install -m 0644 ${SRCDIR}/hostapd.conf ${D}${sysconfdir} + install -m 0755 ${S}/hostapd ${D}${sbindir} + install -m 0755 ${S}/hostapd_cli ${D}${sbindir} + install -m 755 ${SRCDIR}/init ${D}${sysconfdir}/init.d/hostapd +} + +PACKAGE =+ "${PN}-conf" + +# RDEPENDS_${PN} += "${LIBS} ${PN}-conf" ØH HVORFOR DEN SIDSTE KLUMP ? +RDEPENDS_${PN} += "${LIBS}" + +FILES_${PN}-conf = "${sysconfdir}/hostapd.conf" +