From 08a0809fbbc4a7ae761b3e5d9279498964638dbc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Jan 2011 09:54:34 +0100 Subject: copy readelf only on Darwin build system On Cygwin readelf in this directory is not the right binary. The real binary is in .libs/readelf.exe. Toolchain building fails on Cygwin after copying the readelf thingy. --- toolchain/binutils/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index b2c281e37..33f03c7fb 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -40,8 +40,10 @@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled $(MAKE) -C $(WRKBUILD) install - # needed on hosts without readelf + # needed on hosts without readelf, but strange things happen on Cygwin. +ifeq (${OStype},Darwin) $(CP) $(WRKBUILD)/binutils/readelf $(STAGING_HOST_DIR)/bin +endif touch $@ include ${TOPDIR}/mk/toolchain.mk -- cgit v1.2.3 From 9f4a419ecb31241d54b0f2b244b0d159a17285c6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Jan 2011 09:56:24 +0100 Subject: copy fsf config.guess on Cygwin and use it. When compiling gmp under Windows XP on a 64 Bit AMD system, config.guess tries to build with ABI64 and fails. Using configfsf.guess in this case, will fix it. --- toolchain/gmp/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/toolchain/gmp/Makefile b/toolchain/gmp/Makefile index 0e0ed0fca..ed0103ae9 100644 --- a/toolchain/gmp/Makefile +++ b/toolchain/gmp/Makefile @@ -12,8 +12,11 @@ endif $(WRKBUILD)/.headers: $(WRKBUILD)/.configured: +ifneq (,$(filter CYGWIN%,${OStype})) + (cd $(WRKBUILD); cp configfsf.guess config.guess); +endif (cd $(WRKBUILD); \ - $(WRKBUILD)/configure \ + ./configure \ --prefix=$(STAGING_HOST_DIR) \ --disable-shared \ --enable-static \ -- cgit v1.2.3 From 3e60fb80b79b26cccb7e246ffc7d439a78d9b502 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Jan 2011 10:21:05 +0100 Subject: just warn, don't exit on Cygwin --- tools/adk/dkgetsz.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/adk/dkgetsz.c b/tools/adk/dkgetsz.c index fd9d07f22..b8315be70 100644 --- a/tools/adk/dkgetsz.c +++ b/tools/adk/dkgetsz.c @@ -90,6 +90,6 @@ numsecs(int fd) err(1, "ioctl DIOCGDINFO"); return ((unsigned long long)dl.d_secperunit); #else -#error PLEASE DO IMPLEMENT numsecs FOR THIS PLATFORM. +#warning PLEASE DO IMPLEMENT numsecs FOR THIS PLATFORM. #endif } -- cgit v1.2.3 From b627d7e2d4803c4e73c44fbad4ad3f2e23b9873c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Jan 2011 10:21:57 +0100 Subject: remove obsolete -, fails otherwise on Cygwin --- scripts/update-sys | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update-sys b/scripts/update-sys index dd1b4c9a5..925b72a1e 100755 --- a/scripts/update-sys +++ b/scripts/update-sys @@ -36,7 +36,7 @@ arch=$(grep ^ADK_TARGET_ARCH $topdir/.config|cut -f 2 -d = | sed -e 's#"##g') systemsym=$(grep ^ADK_TARGET_SYSTEM_ $topdir/.config|cut -f 1 -d =) system=$(grep ^ADK_TARGET_SYSTEM= $topdir/.config|cut -f 2 -d = | sed -e 's#"##g') systems=$(grep ^ADK_TARGET_SYSTEM= $topdir/.config|cut -f 2 -d = | sed -e 's#"##g'|sed -e 's#-#_#g') -archsym=$(echo ADK_LINUX_$arch|tr '[:lower:]-' '[:upper:]') +archsym=$(echo ADK_LINUX_$arch|tr '[:lower:]' '[:upper:]') if [ -z "$arch" -o -z "$system" ];then defaults -- cgit v1.2.3 From f9ecf651725c10debca0a466de2012bc362d887c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Jan 2011 11:38:29 +0100 Subject: add predefined loader cache --- package/gdk-pixbuf/Makefile | 4 +- package/gdk-pixbuf/files/loaders.cache | 125 +++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 package/gdk-pixbuf/files/loaders.cache diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile index 2ca5ff920..f1eedeeb1 100644 --- a/package/gdk-pixbuf/Makefile +++ b/package/gdk-pixbuf/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= gdk-pixbuf PKG_VERSION:= 2.23.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= a7d6c5f2fe2d481149ed3ba807b5c043 PKG_DESCR:= GDK pixbuf library PKG_SECTION:= libs @@ -23,5 +23,7 @@ post-install: $(IDIR_GDK_PIXBUF)/usr/lib $(CP) $(WRKINST)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*.so \ $(IDIR_GDK_PIXBUF)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/ + $(CP) ./files/loaders.cache \ + $(IDIR_GDK_PIXBUF)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gdk-pixbuf/files/loaders.cache b/package/gdk-pixbuf/files/loaders.cache new file mode 100644 index 000000000..2d8245aa3 --- /dev/null +++ b/package/gdk-pixbuf/files/loaders.cache @@ -0,0 +1,125 @@ +# GdkPixbuf Image Loader Modules file +# Automatically generated file, do not edit +# Created by gdk-pixbuf-query-loaders from gdk-pixbuf-2.23.0 +# +# LoaderDir = /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders +# +"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.so" +"ani" 4 "gdk-pixbuf" "The ANI image format" "LGPL" +"application/x-navi-animation" "" +"ani" "" +"RIFF ACON" " xxxx " 100 + +"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-bmp.so" +"bmp" 5 "gdk-pixbuf" "The BMP image format" "LGPL" +"image/bmp" "image/x-bmp" "image/x-MS-bmp" "" +"bmp" "" +"BM" "" 100 + +"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.so" +"gif" 4 "gdk-pixbuf" "The GIF image format" "LGPL" +"image/gif" "" +"gif" "" +"GIF8" "" 100 + +"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.so" +"icns" 4 "gdk-pixbuf" "The ICNS image format" "GPL" +"image/x-icns" "" +"icns" "" +"icns" "" 100 + +"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.so" +"ico" 5 "gdk-pixbuf" "The ICO image format" "LGPL" +"image/x-icon" "image/x-ico" "image/x-win-bitmap" "" +"ico" "cur" "" +" \001 " "zz znz" 100 +" \002 " "zz znz" 100 + +"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jpeg.so" +"jpeg" 5 "gdk-pixbuf" "The JPEG image format" "LGPL" +"image/jpeg" "" +"jpeg" "jpe" "jpg" "" +"\377\330" "" 100 + +"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pcx.so" +"pcx" 4 "gdk-pixbuf" "The PCX image format" "LGPL" +"image/x-pcx" "" +"pcx" "" +"\n \001" "" 100 +"\n\002\001" "" 100 +"\n\003\001" "" 100 +"\n\004\001" "" 100 +"\n\005\001" "" 100 + +"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so" +"png" 5 "gdk-pixbuf" "The PNG image format" "LGPL" +"image/png" "" +"png" "" +"\211PNG\r\n\032\n" "" 100 + +"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.so" +"pnm" 4 "gdk-pixbuf" "The PNM/PBM/PGM/PPM image format family" "LGPL" +"image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" "" +"pnm" "pbm" "pgm" "ppm" "" +"P1" "" 100 +"P2" "" 100 +"P3" "" 100 +"P4" "" 100 +"P5" "" 100 +"P6" "" 100 + +"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.so" +"qtif" 4 "gdk-pixbuf" "The QTIF image format" "LGPL" +"image/x-quicktime" "image/qtif" "" +"qtif" "qif" "" +"abcdidsc" "xxxx " 100 +"abcdidat" "xxxx " 100 + +"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ras.so" +"ras" 4 "gdk-pixbuf" "The Sun raster image format" "LGPL" +"image/x-cmu-raster" "image/x-sun-raster" "" +"ras" "" +"Y\246j\225" "" 100 + +"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.so" +"tga" 4 "gdk-pixbuf" "The Targa image format" "LGPL" +"image/x-tga" "" +"tga" "targa" "" +" \001\001" "x " 100 +" \001\t" "x " 100 +" \002" "xz " 99 +" \003" "xz " 100 +" \n" "xz " 100 +" \013" "xz " 100 + +"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tiff.so" +"tiff" 1 "gdk-pixbuf" "The TIFF image format" "LGPL" +"image/tiff" "" +"tiff" "tif" "" +"MM *" " z " 100 +"II* " " z" 100 +"II* \020 CR\002 " " z zzz z" 0 + +"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-wbmp.so" +"wbmp" 4 "gdk-pixbuf" "The WBMP image format" "LGPL" +"image/vnd.wap.wbmp" "" +"wbmp" "" +" " "zz" 1 +" `" "z " 1 +" @" "z " 1 +" " "z " 1 + +"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.so" +"xbm" 4 "gdk-pixbuf" "The XBM image format" "LGPL" +"image/x-xbitmap" "" +"xbm" "" +"#define " "" 100 +"/*" "" 50 + +"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.so" +"xpm" 4 "gdk-pixbuf" "The XPM image format" "LGPL" +"image/x-xpixmap" "" +"xpm" "" +"/* XPM */" "" 100 + + -- cgit v1.2.3 From f9646726c72cf341c4c2b765faf8820a2528c425 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Jan 2011 12:08:09 +0100 Subject: add default config dir --- package/fontconfig/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 -- cgit v1.2.3 From 518c7f8ec5375d243c857c8ee16c2a96e9a01db3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Jan 2011 12:08:26 +0100 Subject: fix dependencies --- package/firefox/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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/ -- cgit v1.2.3 From 04b73c418608b5e3c9c21ae176999882e481d578 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Jan 2011 12:09:31 +0100 Subject: unblock wlan before starting networking --- package/base-files/src/etc/network/if-pre-up.d/04-wireless | 2 ++ package/busybox/config/miscutils/Config.in | 11 +++++++++++ 2 files changed, 13 insertions(+) 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 -- cgit v1.2.3