Re: wpasupplicant udeb
On Wednesday 28 May 2008 20:59:15 Frans Pop wrote:
> Note: please do not upload yet.
> One thing I'm not yet certain of is what priority the udeb should have and
> how it should be loaded. This will need some discussion.
Just for completeness, I have adapted the patch to allow possibility for
kfreebsd udeb to be possible should it ever be needed.
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}
+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.
--- 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)))
@@ -21,8 +22,10 @@
ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
CONFIG := debian/config/kfreebsd
+ CONFIG_UDEB := debian/config/kfreebsd.udeb
else
CONFIG := debian/config/linux
+ CONFIG_UDEB := debian/config/linux.udeb
endif
@@ -62,6 +65,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 $(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 +104,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 .
--- /dev/null
+++ b/debian/config/kfreebsd.udeb
@@ -0,0 +1,13 @@
+# Debian Installer's wpa_supplicant build time configuration
+CONFIG_DRIVER_BSD=y
+LIBS += -lbsd
+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=freebsd
--- /dev/null
+++ b/debian/config/linux.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
---
Reply to: