[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: wpasupplicant udeb



On Monday 26 May 2008 00:32:39 Glenn Saberton wrote:
> Jérémy Bobbio wrote:
> > On Fri, May 23, 2008 at 04:09:48PM +0800, Glenn wrote:
> >> It will still build the deb and clients at the moment, which as stated
> >> earlier, some sort of seperate config needs to be made for the udeb.
> >
> > If you can provide a patch doing so for review, it would be great.
> >
> > You might want to have a look at busybox which also use a "config" file
> > for its build system and have several different configuration for its
> > binary packages.
> >
> > Cheers,
> After talking with one of the wpasupplicant maintainers, he has kindly
> agreed to help get an acceptable patch for a wpasupplicant udeb.
> CC'ing him in on this thread. Hopefully we should have a patch
> together in the next few days.

Attached is an initial patch against current state of wpasupplicant package
in version control. Glenn and I haven't nailed down the exact build
configuration of wpa_supplicant that will be used, but we'd really like some
feedback about the packaging changes at this time.

Also, do you think compiling in support for debug messages about association
is something that would be useful to have in the debian-installer environment
for occasions when manual troubleshooting is required? A fair amount of binary
size can be shaved off without it, but unsure if that is wise.

Thanks, Kel.
---
--- a/debian/control
+++ b/debian/control
@@ -38,3 +38,16 @@
  to connect to. It also provides a method for browsing 802.11 SSID scan
  results, an event history log of messages generated by wpa_supplicant,
  and a method to add or edit wpa_supplicant networks.
+
+Package: wpasupplicant-udeb
+Section: debian-installer
+Architecture: any
+XC-Package-Type: udeb
+Depends: ${shlibs:Depends}, dhcp-client-udeb | dhcp3-client-udeb | pump-udeb, ethernet-card-detection
+Description: Client support for WPA and WPA2 (IEEE 802.11i)
+ WPA and WPA2 are methods for securing wireless networks, the former
+ using IEEE 802.1X, and the latter using IEEE 802.11i. This software
+ provides key negotiation with the WPA Authenticator, and controls
+ association with IEEE 802.11i networks.
+ .
+ This is a udeb of wpasupplicant for use by the Debian installer.
--- /dev/null
+++ b/debian/config/udeb
@@ -0,0 +1,12 @@
+# Debian Installer's wpa_supplicant build time configuration
+CONFIG_DRIVER_WEXT=y
+CONFIG_BACKEND=file
+#CONFIG_NO_STDOUT_DEBUG=y
+CONFIG_DEBUG_FILE=y
+CONFIG_NO_AES_EXTRAS=y
+CONFIG_NO_CONFIG_WRITE=y
+CONFIG_NO_CONFIG_BLOBS=y
+CONFIG_MAIN=main
+CONFIG_OS=unix
+CONFIG_ELOOP=eloop
+CONFIG_L2_PACKET=linux
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@
 WPAGUI=wpa_gui-qt4
 
 CFLAGS = -Wall -g
+UDEB_CFLAGS = -Wall -g -Os
 LDFLAGS = -Wl,--as-needed
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -62,6 +63,13 @@
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
+	dh_install
+
+	# udeb for debian installer
+	$(MAKE) -C wpa_supplicant clean; $(RM) wpa_supplicant/.config
+	cp -v debian/config/udeb wpa_supplicant/.config
+	CFLAGS="$(UDEB_CFLAGS)" $(MAKE) -C wpa_supplicant wpa_supplicant
+	dh_install -pwpasupplicant-udeb wpa_supplicant/wpa_supplicant sbin/
 	
 	# ifupdown
 	install --mode=755 -D debian/ifupdown/ifupdown.sh \
@@ -94,7 +102,6 @@
 	dh_installchangelogs wpa_supplicant/ChangeLog
 	dh_installdocs
 	dh_installexamples
-	dh_install
 	dh_installlogrotate --package=wpasupplicant --name=wpa_action
 	dh_installlogrotate --package=wpasupplicant --name=wpa_supplicant
 	dh_installinit --package=wpasupplicant --name=wpa-ifupdown --no-start -- start 15 0 6 .
---


Reply to: