summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xpackage/base-files/src/etc/network/if-pre-up.d/04-wireless2
-rw-r--r--package/busybox/config/miscutils/Config.in11
-rw-r--r--package/firefox/Makefile2
-rw-r--r--package/fontconfig/Makefile5
4 files changed, 17 insertions, 3 deletions
diff --git a/package/base-files/src/etc/network/if-pre-up.d/04-wireless b/package/base-files/src/etc/network/if-pre-up.d/04-wireless
index 78442d8ae..ebcec5a12 100755
--- a/package/base-files/src/etc/network/if-pre-up.d/04-wireless
+++ b/package/base-files/src/etc/network/if-pre-up.d/04-wireless
@@ -8,6 +8,8 @@ set -e
[ "$IF_WIRELESS_HWMODE" ] || IF_WIRELESS_HWMODE=g
[ "$IF_WIRELESS_EXTENSION" ] || IF_WIRELESS_EXTENSION=0
+rfkill unblock wlan 2>/dev/null
+
wpa=0
wpa1=0
wpa2=0
diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in
index e28539204..bb7fb2aa7 100644
--- a/package/busybox/config/miscutils/Config.in
+++ b/package/busybox/config/miscutils/Config.in
@@ -547,6 +547,17 @@ config BUSYBOX_READAHEAD
As readahead(2) blocks until each file has been read, it is best to
run this applet as a background job.
+config BUSYBOX_RFKILL
+ bool "rfkill"
+ default y # doesn't build on Ubuntu 9.04
+ help
+ Enable/disable wireless devices.
+
+ rfkill list : list all wireless devices
+ rfkill list bluetooth : list all bluetooth devices
+ rfkill list 1 : list device corresponding to the given index
+ rfkill block|unblock wlan : block/unblock all wlan(wifi) devices
+
config BUSYBOX_RUNLEVEL
bool "runlevel"
default n
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 0e1c6fe9f..b5d034065 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:= graphical webbrowser
PKG_SECTION:= x11/apps
PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk libnotify
PKG_DEPENDS+= nspr nss libjpeg atk pango cairo libxt libx11 libstdcxx
-PKG_DEPENDS+= libxdamage libxfixes libidl libsqlite
+PKG_DEPENDS+= libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf
PKG_BUILDDEP:= alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11
PKG_BUILDDEP+= nspr nss jpeg libXt fontconfig sqlite
PKG_URL:= http://www.mozilla.org/
diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile
index 119c09e9a..9a836fca9 100644
--- a/package/fontconfig/Makefile
+++ b/package/fontconfig/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= fontconfig
PKG_VERSION:= 2.8.0
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 77e15a92006ddc2adbb06f840d591c0e
PKG_DESCR:= fontconfig
PKG_SECTION:= libs
@@ -26,7 +26,8 @@ CONFIGURE_ARGS+= --with-arch=${ARCH} \
--disable-docs
post-install:
- ${INSTALL_DIR} ${IDIR_FONTCONFIG}/usr/lib
+ ${INSTALL_DIR} ${IDIR_FONTCONFIG}/usr/lib ${IDIR_FONTCONFIG}/etc/fonts
${CP} ${WRKINST}/usr/lib/libfontconfig.so* ${IDIR_FONTCONFIG}/usr/lib
+ $(CP) ${WRKINST}/etc/fonts/* ${IDIR_FONTCONFIG}/etc/fonts
include ${TOPDIR}/mk/pkg-bottom.mk