From 07b7b39348d8dcd891eac88dd86f1d075050cb0f Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Tue, 10 Aug 2010 10:57:45 +0200 Subject: openmoko: removed distro As discussed on #oe on Aug 10, 2010. Removed because this is not used or maintained any more. A message * * * Sorry, The Openmoko distribution has been removed on Aug 10, 2010. * It is recommended to use the DISTRO = "shr" instead. \ * \ * If you really need Openmoko you can still find it in git. * * will be given if someone is still using it. Signed-off-by: Frans Meulenbroeks Acked-by: Marcin Juszkiewicz Acked-by: Michael 'Mickey' Lauer Acked-by: Martin Jansa Acked-by: Graeme Gregory --- conf/distro/include/preferred-om-2008-versions.inc | 2124 -------------------- conf/distro/openmoko.conf | 92 +- 2 files changed, 4 insertions(+), 2212 deletions(-) delete mode 100644 conf/distro/include/preferred-om-2008-versions.inc diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc deleted file mode 100644 index 92bb71d595..0000000000 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ /dev/null @@ -1,2124 +0,0 @@ -PREFERRED_VERSION_0xffff ?= "0.2" -PREFERRED_VERSION_0xffff-native ?= "0.2" -PREFERRED_VERSION_aalib ?= "1.4rc5" -PREFERRED_VERSION_abiword ?= "2.5.2" -PREFERRED_VERSION_abiword-embedded ?= "2.5.2" -PREFERRED_VERSION_abiword-plugins ?= "2.5.2" -PREFERRED_VERSION_abuse ?= "0.7.0" -PREFERRED_VERSION_acpid ?= "1.0.4" -PREFERRED_VERSION_acx-firmware ?= "1.0" -PREFERRED_VERSION_addressbook ?= "0.1" -PREFERRED_VERSION_adns ?= "1.0" -PREFERRED_VERSION_agg ?= "2.5" -PREFERRED_VERSION_aircrack ?= "2.41" -PREFERRED_VERSION_aircrack-ng ?= "0.9.1" -PREFERRED_VERSION_albumshaper ?= "2.1" -PREFERRED_VERSION_aliens ?= "1.0.0" -PREFERRED_VERSION_aliens-qt ?= "1.0.0" -PREFERRED_VERSION_alsa-lib ?= "1.0.15" -PREFERRED_VERSION_alsa-oss ?= "1.0.15" -PREFERRED_VERSION_alsa-plugins ?= "1.0.14" -PREFERRED_VERSION_alsa-state ?= "0.2.0" -PREFERRED_VERSION_alsa-utils ?= "1.0.15" -PREFERRED_VERSION_anthy ?= "7811" -PREFERRED_VERSION_anthy-native ?= "7811" -PREFERRED_VERSION_antlr ?= "2.7.7" -PREFERRED_VERSION_antlr-native ?= "2.7.7" -PREFERRED_VERSION_apache2 ?= "2.2.3" -PREFERRED_VERSION_apache2-native ?= "2.2.3" -PREFERRED_VERSION_apex-env ?= "1.5.8" -PREFERRED_VERSION_apex-nslu2 ?= "1.5.8" -PREFERRED_VERSION_apex-nslu2-16mb ?= "1.5.8" -PREFERRED_VERSION_apmd ?= "3.2.2" -PREFERRED_VERSION_applewmproto ?= "1.0.3" -PREFERRED_VERSION_appres ?= "1.0.1" -PREFERRED_VERSION_appweb ?= "2.0.4" -PREFERRED_VERSION_apr ?= "1.2.7" -PREFERRED_VERSION_apr-util ?= "1.2.7" -PREFERRED_VERSION_apt ?= "0.7.3" -PREFERRED_VERSION_apt-native ?= "0.7.3" -PREFERRED_VERSION_argtable ?= "2.7" -PREFERRED_VERSION_ark3116 ?= "0.4.1" -PREFERRED_VERSION_arpwatch ?= "2.1a15" -PREFERRED_VERSION_aspell ?= "0.60.5" -PREFERRED_VERSION_aspell-native ?= "0.60.5" -PREFERRED_VERSION_asterisk = "1.4.17" -PREFERRED_VERSION_asterisk-sounds ?= "1.2.1" -PREFERRED_VERSION_at ?= "3.1.8" -PREFERRED_VERSION_atd ?= "0.70" -PREFERRED_VERSION_atftp ?= "0.7" -PREFERRED_VERSION_atk ?= "1.20.0" -PREFERRED_VERSION_atmelwlandriver ?= "3.4.1.0" -PREFERRED_VERSION_atomic ?= "1.0.1" -PREFERRED_VERSION_audiofile ?= "0.2.6" -PREFERRED_VERSION_audioplayer ?= "1.0" -PREFERRED_VERSION_aumix ?= "2.8" -PREFERRED_VERSION_autoconf ?= "2.61" -PREFERRED_VERSION_autoconf-native ?= "2.61" -PREFERRED_VERSION_autofs ?= "4.1.4" -PREFERRED_VERSION_automake ?= "1.10.2" -PREFERRED_VERSION_automake-native ?= "1.10.2" -PREFERRED_VERSION_avahi ?= "0.6.22" -PREFERRED_VERSION_avahi-python ?= "0.6.21" -PREFERRED_VERSION_avahi-ui ?= "0.6.21" -PREFERRED_VERSION_avetanabt ?= "20060413" -PREFERRED_VERSION_bacula-client ?= "1.38.11" -PREFERRED_VERSION_balsa ?= "2.0.17" -PREFERRED_VERSION_base-files ?= "3.0.14" -PREFERRED_VERSION_base-passwd ?= "3.5.20" -PREFERRED_VERSION_bash ?= "3.2" -PREFERRED_VERSION_bash-completion ?= "20040711" -PREFERRED_VERSION_bazaar ?= "1.2" -PREFERRED_VERSION_bb ?= "1.2" -PREFERRED_VERSION_bc ?= "1.06" -PREFERRED_VERSION_bdftopcf ?= "1.0.1" -PREFERRED_VERSION_beecrypt ?= "3.1.0" -PREFERRED_VERSION_beecrypt-native ?= "3.1.0" -PREFERRED_VERSION_beep ?= "1.2.2" -PREFERRED_VERSION_beepmp ?= "0.9.7" -PREFERRED_VERSION_beforelight ?= "1.0.2" -PREFERRED_VERSION_benchfft ?= "3.1" -PREFERRED_VERSION_bigreqsproto ?= "1.0.2" -PREFERRED_VERSION_bigreqsproto-native ?= "1.0.2" -PREFERRED_VERSION_billiardz ?= "0.1.4" -PREFERRED_VERSION_bind ?= "9.3.6" -PREFERRED_VERSION_bing ?= "1.1.3" -PREFERRED_VERSION_binutils ?= "2.18" -PREFERRED_VERSION_binutils-cross ?= "2.18" -PREFERRED_VERSION_binutils-cross-sdk ?= "2.18" -PREFERRED_VERSION_bison ?= "2.0" -PREFERRED_VERSION_bison-native ?= "2.0" -PREFERRED_VERSION_bitbake ?= "1.8.6" -PREFERRED_VERSION_bitchx ?= "1.1" -PREFERRED_VERSION_bluesnarfer ?= "0.1" -PREFERRED_VERSION_bluez-cups-backend ?= "3.33" -PREFERRED_VERSION_bluez-dtl1-workaround ?= "1.0" -PREFERRED_VERSION_bluez-gnome ?= "0.14" -PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.33" -PREFERRED_VERSION_bluez-hcidump ?= "1.42" -PREFERRED_VERSION_bluez-libs ?= "3.33" -PREFERRED_VERSION_bluez-utils ?= "3.33" -PREFERRED_VERSION_bluez-utils-alsa ?= "3.33" -PREFERRED_VERSION_bmon ?= "2.1.0" -PREFERRED_VERSION_boa ?= "0.94.13" -PREFERRED_VERSION_bochs ?= "2.1" -PREFERRED_VERSION_bogofilter ?= "0.96.0" -PREFERRED_VERSION_boost ?= "1.33.1" -PREFERRED_VERSION_boost-asio ?= "0.3.7" -PREFERRED_VERSION_boost-jam-native ?= "3.1.11" -PREFERRED_VERSION_bootchart ?= "0.9" -PREFERRED_VERSION_bootmenu ?= "0.7" -PREFERRED_VERSION_bootsplash ?= "3.0.7" -PREFERRED_VERSION_bootsplash-native ?= "3.0.7" -PREFERRED_VERSION_brickout ?= "2002.06.09" -PREFERRED_VERSION_brutefir ?= "1.0i" -PREFERRED_VERSION_bt950-cs ?= "0.1" -PREFERRED_VERSION_btscanner ?= "2.0" -PREFERRED_VERSION_btsco ?= "0.42" -PREFERRED_VERSION_btsco-module ?= "0.42" -PREFERRED_VERSION_btxml ?= "1.0" -PREFERRED_VERSION_busybox = "1.13.2" -PREFERRED_VERSION_busybox-static ?= "1.2.1" -PREFERRED_VERSION_bvi ?= "1.3.1" -PREFERRED_VERSION_bwmon ?= "1.3" -PREFERRED_VERSION_bzflag ?= "1.10.6.20040515" -PREFERRED_VERSION_bzflag-server ?= "1.10.6.20040515" -PREFERRED_VERSION_bzip2 ?= "1.0.5" -PREFERRED_VERSION_cacao-cldc ?= "0.98" -PREFERRED_VERSION_cacaoh-cldc-native ?= "0.98" -PREFERRED_VERSION_cairo ?= "1.6.4" -PREFERRED_VERSION_cairo-directfb ?= "1.4.8" -PREFERRED_VERSION_cairomm ?= "1.2.4" -PREFERRED_VERSION_calendar ?= "1.0" -PREFERRED_VERSION_came ?= "1.7" -PREFERRED_VERSION_camera-assistant ?= "0.2.0" -PREFERRED_VERSION_camsource ?= "0.7.0" -PREFERRED_VERSION_c-ares ?= "1.3.0" -PREFERRED_VERSION_cbrpager ?= "0.9.14" -PREFERRED_VERSION_ccache ?= "2.4" -PREFERRED_VERSION_cccc ?= "3.pre84" -PREFERRED_VERSION_ccdv ?= "1.0" -PREFERRED_VERSION_ccdv-native ?= "1.0" -PREFERRED_VERSION_ccxstream ?= "1.0.15" -PREFERRED_VERSION_cdparanoia ?= "9.8alpha" -PREFERRED_VERSION_cdrtools-native ?= "2.01" -PREFERRED_VERSION_cdstatus ?= "0.96.05" -PREFERRED_VERSION_cdtool ?= "2.1.8" -PREFERRED_VERSION_cdump-native ?= "1.0" -PREFERRED_VERSION_centericq ?= "4.11.0" -PREFERRED_VERSION_cetools ?= "0.3" -PREFERRED_VERSION_cetools-native ?= "0.3" -PREFERRED_VERSION_cflow ?= "2.0" -PREFERRED_VERSION_cfu1-modules ?= "2.6" -PREFERRED_VERSION_check ?= "0.9.2" -PREFERRED_VERSION_checkers ?= "1.0.5ern" -PREFERRED_VERSION_cherokee ?= "0.5.5" -PREFERRED_VERSION_cherokee-nossl ?= "0.5.3" -PREFERRED_VERSION_chillispot ?= "1.0RC3" -PREFERRED_VERSION_chkhinge ?= "20040706" -PREFERRED_VERSION_chmlib ?= "0.38" -PREFERRED_VERSION_chrpath ?= "0.13" -PREFERRED_VERSION_chrpath-native ?= "0.13" -PREFERRED_VERSION_ckermit ?= "211" -PREFERRED_VERSION_clamav ?= "0.91.1" -PREFERRED_VERSION_clamsmtp ?= "1.8" -PREFERRED_VERSION_classpath ?= "0.97.2" -PREFERRED_VERSION_classpath-gtk ?= "0.97.2" -PREFERRED_VERSION_classpath-minimal ?= "0.97.2" -PREFERRED_VERSION_classpath-native ?= "0.97.2" -PREFERRED_VERSION_clearsilver ?= "0.10.3" -PREFERRED_VERSION_clish ?= "0.7.1" -PREFERRED_VERSION_cmake-native ?= "2.4.7" -PREFERRED_VERSION_cms92init ?= "0.1" -PREFERRED_VERSION_compositeproto ?= "0.4" -PREFERRED_VERSION_comprec ?= "0.02" -PREFERRED_VERSION_confuse ?= "2.7" -PREFERRED_VERSION_confuse-native ?= "2.7" -PREFERRED_VERSION_connect ?= "0.1" -PREFERRED_VERSION_connman ?= "0.15" -PREFERRED_VERSION_conserver ?= "8.1.14" -PREFERRED_VERSION_console-tools ?= "0.3.2" -PREFERRED_VERSION_contacts ?= "0.7" -PREFERRED_VERSION_coreutils ?= "7.1" -PREFERRED_VERSION_coreutils-native ?= "7.1" -PREFERRED_VERSION_corkscrew ?= "2.0" -PREFERRED_VERSION_corsair ?= "0.2.6" -PREFERRED_VERSION_cpio ?= "2.5" -PREFERRED_VERSION_cppunit ?= "1.10.2" -PREFERRED_VERSION_cpuburn ?= "1.4" -PREFERRED_VERSION_cpufreqd ?= "1.1.2" -PREFERRED_VERSION_cpusage ?= "0.2" -PREFERRED_VERSION_cpuspeed ?= "1.1" -PREFERRED_VERSION_cramfs ?= "1.1" -PREFERRED_VERSION_cramfs-native ?= "1.1" -PREFERRED_VERSION_crimsonfields ?= "0.4.8" -PREFERRED_VERSION_crimsonfields-native ?= "0.4.8" -PREFERRED_VERSION_cron ?= "3.0pl1" -PREFERRED_VERSION_cross-linkage ?= "1.0" -PREFERRED_VERSION_crossword ?= "0.0.3" -PREFERRED_VERSION_cscope ?= "15.5" -PREFERRED_VERSION_ctags-native ?= "5.5.4" -PREFERRED_VERSION_ctorrent ?= "1.3.4" -PREFERRED_VERSION_ctrlproxy ?= "2.6.2" -PREFERRED_VERSION_cumulus ?= "1.2.1" -PREFERRED_VERSION_cups ?= "1.2.12" -PREFERRED_VERSION_curl ?= "7.18.2" -PREFERRED_VERSION_curl-native ?= "7.18.2" -PREFERRED_VERSION_custominput ?= "1.1.0" -PREFERRED_VERSION_cvs ?= "1.12.9" -PREFERRED_VERSION_cxcrypt ?= "1.0" -PREFERRED_VERSION_cyrus-imapd ?= "2.2.12" -PREFERRED_VERSION_cyrus-sasl ?= "2.1.19" -PREFERRED_VERSION_damageext ?= "1.0" -PREFERRED_VERSION_damageproto ?= "1.1.0" -PREFERRED_VERSION_dash ?= "0.5.2" -PREFERRED_VERSION_dasher-gpe ?= "0.0cvs20040828" -PREFERRED_VERSION_dates ?= "0.4.4" -PREFERRED_VERSION_davfs2 ?= "0.2.8" -PREFERRED_VERSION_db3 ?= "3.2.9" -PREFERRED_VERSION_db3-native ?= "3.2.9" -PREFERRED_VERSION_db ?= "4.3.29" -PREFERRED_VERSION_dbench ?= "4.0" -PREFERRED_VERSION_dbh ?= "1.0-18" -PREFERRED_VERSION_db-native ?= "4.3.29" -PREFERRED_VERSION_dbus ?= "1.2.1" -PREFERRED_VERSION_dbus-native ?= "1.2.1" -PREFERRED_VERSION_dbus-glib ?= "0.76" -PREFERRED_VERSION_dbus-glib-native ?= "0.76" -PREFERRED_VERSION_dbus-native ?= "1.0.3" -PREFERRED_VERSION_dbus-python ?= "0.71" -PREFERRED_VERSION_dcetest ?= "1.2" -PREFERRED_VERSION_dcopidl2cpp-native ?= "3.5.4" -PREFERRED_VERSION_dcopidl-native ?= "3.5.4" -PREFERRED_VERSION_dcron ?= "2.3.3" -PREFERRED_VERSION_ddclient ?= "3.6.3" -PREFERRED_VERSION_debianutils ?= "2.30" -PREFERRED_VERSION_dejagnu ?= "1.4.4" -PREFERRED_VERSION_dejagnu-native ?= "1.4.4" -PREFERRED_VERSION_detect-stylus ?= "0.13" -PREFERRED_VERSION_device-mapper ?= "1.01.05" -PREFERRED_VERSION_devimage ?= "0.1" -PREFERRED_VERSION_devimage-image ?= "1.0" -PREFERRED_VERSION_devio ?= "1.2" -PREFERRED_VERSION_devio-native ?= "1.2" -PREFERRED_VERSION_devlabel ?= "0.48.01" -PREFERRED_VERSION_devmem2 ?= "1.0" -PREFERRED_VERSION_devshell ?= "1.0" -PREFERRED_VERSION_dgen-sdl ?= "1.23" -PREFERRED_VERSION_dhcdbd ?= "2.0" -PREFERRED_VERSION_dhclient ?= "2.0pl5" -PREFERRED_VERSION_dhcp ?= "3.0.2" -PREFERRED_VERSION_dhcpcd ?= "1.3.22-pl4" -PREFERRED_VERSION_dhcp-forwarder ?= "0.7" -PREFERRED_VERSION_didiwiki ?= "0.5" -PREFERRED_VERSION_diethotplug ?= "0.4" -PREFERRED_VERSION_diet-x11 ?= "1.1.3" -PREFERRED_VERSION_diffstat ?= "1.39" -PREFERRED_VERSION_diffutils ?= "2.8.1" -PREFERRED_VERSION_dillo ?= "0.8.6" -PREFERRED_VERSION_dillo2 ?= "0.6.6" -PREFERRED_VERSION_dircproxy ?= "1.1.0" -PREFERRED_VERSION_directfb ?= "1.1.0" -PREFERRED_VERSION_directfb-examples ?= "1.0.0" -PREFERRED_VERSION_display-brightness ?= "1.0.0" -PREFERRED_VERSION_distcc ?= "2.18.3" -PREFERRED_VERSION_djvulibre ?= "3.5.19" -PREFERRED_VERSION_dmxproto ?= "2.2.2" -PREFERRED_VERSION_dnsmasq ?= "2.38" -PREFERRED_VERSION_docbook-utils ?= "0.6.14" -PREFERRED_VERSION_docbook-utils-native ?= "0.6.14" -PREFERRED_VERSION_dosbox ?= "0.70" -PREFERRED_VERSION_dosfstools ?= "2.11" -PREFERRED_VERSION_dosfstools-native ?= "2.10" -PREFERRED_VERSION_dpkg ?= "1.13.25" -PREFERRED_VERSION_dpkg-native ?= "1.13.25" -PREFERRED_VERSION_driftnet ?= "0.1.6" -PREFERRED_VERSION_driftnet-nogui ?= "0.1.6" -PREFERRED_VERSION_dropbear ?= "0.51" -PREFERRED_VERSION_dsniff ?= "2.3" -PREFERRED_VERSION_duma ?= "2.5.7" -PREFERRED_VERSION_dvb-image ?= "1.0" -PREFERRED_VERSION_dvbtraffic ?= "0.0cvs20060814" -PREFERRED_VERSION_dviviewer ?= "1.0.2" -PREFERRED_VERSION_e2fsprogs ?= "1.38" -PREFERRED_VERSION_e2fsprogs-libs ?= "1.41.2" -PREFERRED_VERSION_e2fsprogs-libs-native ?= "1.35" -PREFERRED_VERSION_e2fsprogs-native ?= "1.38" -PREFERRED_VERSION_e2tools ?= "0.0.16" -PREFERRED_VERSION_e2tools-native ?= "0.0.16" -PREFERRED_VERSION_eb ?= "4.3" -PREFERRED_VERSION_ebtables ?= "2.0.6" -PREFERRED_VERSION_eciadsl ?= "0.11" -PREFERRED_VERSION_libecj-bootstrap ?= "3.3" -PREFERRED_VERSION_editres ?= "1.0.2" -PREFERRED_VERSION_eds-feed ?= "0.3.2" -PREFERRED_VERSION_eel ?= "2.12.2" -PREFERRED_VERSION_ekg ?= "1.6" -PREFERRED_VERSION_elfkickers ?= "2.0a" -PREFERRED_VERSION_elfkickers-native ?= "2.0a" -PREFERRED_VERSION_elftoaout ?= "2.3" -PREFERRED_VERSION_elftoaout-native ?= "2.3" -PREFERRED_VERSION_elfutils ?= "0.127" -PREFERRED_VERSION_elvis ?= "2.2.0" -PREFERRED_VERSION_elvis-tiny ?= "2.2.0" -PREFERRED_VERSION_emacs ?= "20060801" -PREFERRED_VERSION_emacs-x11 ?= "20060801" -PREFERRED_VERSION_emelfm2 ?= "0.0.8" -PREFERRED_VERSION_empathy ?= "0.5" -PREFERRED_VERSION_emul ?= "1.0.5" -PREFERRED_VERSION_enca ?= "1.9" -PREFERRED_VERSION_enchant ?= "1.3.0" -PREFERRED_VERSION_encodings ?= "1.0.2" -PREFERRED_VERSION_enscript ?= "1.6.4" -PREFERRED_VERSION_entrance ?= "0.9.0.010" -PREFERRED_VERSION_epiphany ?= "2.19.6" -PREFERRED_VERSION_erlang-native ?= "R11B.1" -PREFERRED_VERSION_erlang ?= "R11B.1" -PREFERRED_VERSION_esmtp ?= "0.5.1" -PREFERRED_VERSION_esound ?= "0.2.36" -PREFERRED_VERSION_espgs ?= "8.15.3" -PREFERRED_VERSION_etherpuppet ?= "0.2" -PREFERRED_VERSION_ethload ?= "1.2" -PREFERRED_VERSION_ettercap ?= "0.6.b" -PREFERRED_VERSION_e-uae ?= "0.8.28" -PREFERRED_VERSION_eventlog ?= "0.2.5" -PREFERRED_VERSION_evieext ?= "1.0.2" -PREFERRED_VERSION_evince ?= "2.23.4" -# The only e-wm recipe is a cvs one with SRCDATE floating! -# PREFERRED_VERSION_e-wm ?= "0.16.999.042" -PREFERRED_VERSION_exiv2 ?= "0.15" -PREFERRED_VERSION_exmap-console ?= "0.4.1" -PREFERRED_VERSION_exml ?= "cvs" -PREFERRED_VERSION_exo ?= "0.3.2" -PREFERRED_VERSION_expat ?= "2.0.0" -PREFERRED_VERSION_expat-native ?= "1.95.7" -PREFERRED_VERSION_expect ?= "5.44.1" -PREFERRED_VERSION_ez-ipupdate ?= "3.0.10" -PREFERRED_VERSION_ezx-gpiotool ?= "1877" -PREFERRED_VERSION_faac ?= "1.24" -PREFERRED_VERSION_faad2 ?= "2.0" -PREFERRED_VERSION_fakechroot ?= "2.5" -PREFERRED_VERSION_fakechroot-native ?= "2.5" -PREFERRED_VERSION_fakeconnect ?= "1.2.1" -PREFERRED_VERSION_fakeroot ?= "1.9.6" -PREFERRED_VERSION_fakeroot-native ?= "1.9.6" -PREFERRED_VERSION_fam ?= "2.7.0" -PREFERRED_VERSION_farsight ?= "0.1.5" -PREFERRED_VERSION_fastcgi ?= "2.4.0" -PREFERRED_VERSION_fastjar-native ?= "0.95" -PREFERRED_VERSION_fbgetty ?= "0.1.698" -PREFERRED_VERSION_fbgrab ?= "1.0" -PREFERRED_VERSION_fbpanel ?= "4.3" -PREFERRED_VERSION_fbreader ?= "0.8.2a" -PREFERRED_VERSION_fbset ?= "2.1" -PREFERRED_VERSION_fbui-utils ?= "0.9.14c" -PREFERRED_VERSION_fbvncserver ?= "0.9.4" -PREFERRED_VERSION_fbvncserver-kmodule ?= "0.9.4" -PREFERRED_VERSION_fceu ?= "0.98.13-pre" -PREFERRED_VERSION_fconfig ?= "20060419" -PREFERRED_VERSION_fcron ?= "3.0.2" -PREFERRED_VERSION_feh ?= "1.2.7" -PREFERRED_VERSION_fetchmail ?= "6.2.5" -PREFERRED_VERSION_fftw ?= "3.1.2" -PREFERRED_VERSION_fftwf ?= "3.1.2" -PREFERRED_VERSION_fftwl ?= "3.1.2" -PREFERRED_VERSION_fget ?= "1.3.3" -PREFERRED_VERSION_figment ?= "0.3.5" -PREFERRED_VERSION_file ?= "4.21" -PREFERRED_VERSION_file-native ?= "4.21" -PREFERRED_VERSION_findutils ?= "4.2.29" -PREFERRED_VERSION_findutils-native ?= "4.2.29" -PREFERRED_VERSION_firefox ?= "3.0.1" -PREFERRED_VERSION_fis ?= "1.0" -PREFERRED_VERSION_fish ?= "1.1.0" -PREFERRED_VERSION_fixesproto ?= "4.0" -PREFERRED_VERSION_flac ?= "1.1.2" -PREFERRED_VERSION_flex ?= "2.5.31" -PREFERRED_VERSION_flexis-zaurus ?= "1.0.0" -PREFERRED_VERSION_flex-native ?= "2.5.31" -PREFERRED_VERSION_flnx ?= "0.18" -PREFERRED_VERSION_fltk ?= "1.1.7" -PREFERRED_VERSION_flumotion ?= "0.4.1" -PREFERRED_VERSION_fontcacheproto ?= "0.1.2" -PREFERRED_VERSION_fontcacheproto-native ?= "0.1.2" -PREFERRED_VERSION_fontconfig ?= "2.4.1" -PREFERRED_VERSION_fontconfig-native ?= "2.3.91" -PREFERRED_VERSION_fontsproto ?= "2.0.2" -PREFERRED_VERSION_fontsproto-native ?= "2.0.2" -PREFERRED_VERSION_fonttosfnt ?= "1.0.3" -PREFERRED_VERSION_foonas-init ?= "0.10" -PREFERRED_VERSION_foonas-packages ?= "1.0" -PREFERRED_VERSION_fortune-mod ?= "1.99.1" -PREFERRED_VERSION_fpdf ?= "1.53" -PREFERRED_VERSION_free42-vga ?= "1.4.41" -PREFERRED_VERSION_freeciv ?= "2.0.8" -PREFERRED_VERSION_freedoom ?= "0.3" -PREFERRED_VERSION_freedroid ?= "1.0.2" -PREFERRED_VERSION_freenote ?= "1.12.0" -PREFERRED_VERSION_freeze ?= "1.0" -PREFERRED_VERSION_frodo ?= "4.2" -PREFERRED_VERSION_froot ?= "0.7.1" -PREFERRED_VERSION_frotz ?= "2.43" -PREFERRED_VERSION_frozen-bubble ?= "1.0.0" -PREFERRED_VERSION_fsi-client ?= "20040803" -PREFERRED_VERSION_ftdi-eeprom ?= "0.3" -PREFERRED_VERSION_ftdi-eeprom-native ?= "0.3" -PREFERRED_VERSION_ftpd-topfield ?= "0.7.4" -PREFERRED_VERSION_fuse ?= "2.6.5" -PREFERRED_VERSION_fuse-module ?= "2.6.5" -PREFERRED_VERSION_fush ?= "0.9.0" -PREFERRED_VERSION_fxload ?= "0.0.20020411" -PREFERRED_VERSION_g15daemon ?= "1.2.6a" -PREFERRED_VERSION_gail ?= "1.20.0" -PREFERRED_VERSION_gaim ?= "1.5.0" -PREFERRED_VERSION_gal-2.0 ?= "1.99.11" -PREFERRED_VERSION_gal-2.1 ?= "2.1.10" -PREFERRED_VERSION_galago-daemon ?= "0.3.4" -PREFERRED_VERSION_galculator ?= "1.2.3" -PREFERRED_VERSION_gallery ?= "1.5.5" -PREFERRED_VERSION_gamin ?= "0.1.8" -PREFERRED_VERSION_gammu ?= "1.17.0" -PREFERRED_VERSION_gawk ?= "3.1.4" -PREFERRED_VERSION_gawk-native ?= "3.1.4" -PREFERRED_VERSION_gcalctool ?= "5.7.32" -PREFERRED_VERSION_gccmakedep ?= "1.0.2" -PREFERRED_VERSION_gconf ?= "2.6.1" -PREFERRED_VERSION_gconf-native ?= "2.6.1" -PREFERRED_VERSION_gd ?= "2.0.33" -PREFERRED_VERSION_gdado ?= "2.2" -PREFERRED_VERSION_gdal ?= "1.3.2" -PREFERRED_VERSION_gdb ?= "6.8" -PREFERRED_VERSION_gdb-cross ?= "6.8" -PREFERRED_VERSION_gdb-cross-sdk ?= "6.8" -PREFERRED_VERSION_gdbm ?= "1.8.3" -PREFERRED_VERSION_gdbm-native ?= "1.8.3" -PREFERRED_VERSION_gdk-pixbuf-csource-native ?= "2.12.11" -PREFERRED_VERSION_gdm ?= "2.14.9" -PREFERRED_VERSION_geda ?= "20050820" -PREFERRED_VERSION_geda-gattrib ?= "20050820" -PREFERRED_VERSION_geda-gschem ?= "20050820" -PREFERRED_VERSION_geda-gsymcheck ?= "20050820" -PREFERRED_VERSION_geda-symbols ?= "20050820" -PREFERRED_VERSION_geda-utils ?= "20050820" -PREFERRED_VERSION_gemdropx ?= "0.9" -PREFERRED_VERSION_genboot-native ?= "1.0" -PREFERRED_VERSION_genext2fs ?= "1.3" -PREFERRED_VERSION_genext2fs-native ?= "1.3" -PREFERRED_VERSION_genlist ?= "1.0" -PREFERRED_VERSION_geode-accessbus5536 ?= "2.6.11" -PREFERRED_VERSION_geode-aeslx ?= "2.6.11" -PREFERRED_VERSION_geode-alsa5536 ?= "2.6.11" -PREFERRED_VERSION_gettext ?= "0.17" -PREFERRED_VERSION_gettext-native ?= "0.17" -PREFERRED_VERSION_gftp ?= "2.0.18" -PREFERRED_VERSION_ghettotooth ?= "1.0" -PREFERRED_VERSION_giac ?= "0.5.0" -PREFERRED_VERSION_giblib ?= "1.2.4" -PREFERRED_VERSION_gif2png ?= "2.5.1" -PREFERRED_VERSION_gift ?= "0.11.5" -PREFERRED_VERSION_giftcurs ?= "0.6.2" -PREFERRED_VERSION_gimp ?= "2.3.19" -PREFERRED_VERSION_ginspector ?= "20050529" -PREFERRED_VERSION_git ?= "1.6.0.4" -PREFERRED_VERSION_git-native ?= "1.6.0.4" -PREFERRED_VERSION_gizmod ?= "2.3" -PREFERRED_VERSION_gkrellm ?= "2.2.10" -PREFERRED_VERSION_glib-1.2 ?= "1.2.10" -PREFERRED_VERSION_glib-1.2-native ?= "1.2.10" -PREFERRED_VERSION_glib-2.0 ?= "2.16.4" -PREFERRED_VERSION_glib-2.0-native ?= "2.16.1" -PREFERRED_VERSION_glibc ?= "2.6.1" -PREFERRED_VERSION_glibc-initial ?= "2.6.1" -PREFERRED_VERSION_glibmm ?= "2.12.10" -PREFERRED_VERSION_glider ?= "1.0.0" -PREFERRED_VERSION_gloox ?= "0.8.9" -PREFERRED_VERSION_glproto ?= "1.4.8" -PREFERRED_VERSION_glrr ?= "20050529" -PREFERRED_VERSION_glrr-widgets ?= "20050529" -PREFERRED_VERSION_glurp ?= "0.11.3" -PREFERRED_VERSION_gmailfs ?= "0.7.3" -PREFERRED_VERSION_gmp ?= "4.2.2" -PREFERRED_VERSION_gmpc ?= "0.13.0" -PREFERRED_VERSION_gmp-native ?= "4.2.2" -PREFERRED_VERSION_gnash ?= "0.8.3" -PREFERRED_VERSION_gnocky ?= "0.0.3" -PREFERRED_VERSION_gnokii ?= "0.6.14" -PREFERRED_VERSION_gnomebaker ?= "0.6.0" -PREFERRED_VERSION_gnome-common ?= "2.20.0" -PREFERRED_VERSION_gnome-cups-manager ?= "0.31" -PREFERRED_VERSION_gnome-desktop ?= "2.18.3" -PREFERRED_VERSION_gnome-doc-utils ?= "0.12.0" -PREFERRED_VERSION_gnome-games ?= "2.6.1" -PREFERRED_VERSION_gnome-icon-theme ?= "2.22.0" -PREFERRED_VERSION_gnome-keyring ?= "2.20.0" -PREFERRED_VERSION_gnome-menus ?= "2.16.1" -PREFERRED_VERSION_gnome-mime-data ?= "2.18.0" -PREFERRED_VERSION_gnome-panel ?= "2.18.1" -PREFERRED_VERSION_gnome-power ?= "0.0.5" -PREFERRED_VERSION_gnome-power-manager ?= "2.18.3" -PREFERRED_VERSION_gnomesword ?= "2.1.2" -PREFERRED_VERSION_gnome-themes ?= "2.6.2" -PREFERRED_VERSION_gnome-vfs ?= "2.22.0" -PREFERRED_VERSION_gnome-vfs-extras ?= "0.99.13" -PREFERRED_VERSION_gnome-vfs-obexftp ?= "0.4" -PREFERRED_VERSION_gnuchess ?= "5.05" -PREFERRED_VERSION_gnumeric ?= "1.8.4" -PREFERRED_VERSION_gnupg ?= "1.4.2.2" -PREFERRED_VERSION_gnuplot ?= "4.2.2" -PREFERRED_VERSION_gnuradio ?= "3.0.4" -PREFERRED_VERSION_gnutls ?= "1.6.3" -PREFERRED_VERSION_gob2 ?= "2.0.14" -PREFERRED_VERSION_gobby ?= "0.4.1" -PREFERRED_VERSION_goffice ?= "0.2.1" -PREFERRED_VERSION_gparted ?= "0.3.3" -PREFERRED_VERSION_gpe-aerial ?= "0.3.0" -PREFERRED_VERSION_gpe-announce ?= "0.13" -PREFERRED_VERSION_gpe-applauncher ?= "0.11" -PREFERRED_VERSION_gpe-appmgr ?= "2.8" -PREFERRED_VERSION_gpe-autostarter ?= "0.12" -PREFERRED_VERSION_gpe-beam ?= "0.2.9" -PREFERRED_VERSION_gpe-bluetooth ?= "0.55" -PREFERRED_VERSION_gpe-bootsplash ?= "1.15" -PREFERRED_VERSION_gpe-bootsplash-theme-e ?= "1.0" -PREFERRED_VERSION_gpe-bootsplash-theme-gpephone ?= "1.0" -PREFERRED_VERSION_gpe-buttonbox ?= "0.5" -PREFERRED_VERSION_gpe-calculator ?= "0.2" -PREFERRED_VERSION_gpe-calendar ?= "0.91" -PREFERRED_VERSION_gpe-clock ?= "0.25" -PREFERRED_VERSION_gpe-conf ?= "0.2.6" -PREFERRED_VERSION_gpe-confd ?= "0.16" -PREFERRED_VERSION_gpe-contacts ?= "0.47" -PREFERRED_VERSION_gpe-contacts-hildon ?= "0.42" -PREFERRED_VERSION_gpe-dm ?= "0.51" -PREFERRED_VERSION_gpe-edit ?= "0.40" -PREFERRED_VERSION_gpe-expenses ?= "0.0.6" -PREFERRED_VERSION_gpe-filemanager ?= "0.30" -PREFERRED_VERSION_gpe-fsi ?= "0.1" -PREFERRED_VERSION_gpe-go ?= "0.05" -PREFERRED_VERSION_gpe-helpviewer ?= "1.0" -PREFERRED_VERSION_gpe-icons ?= "0.25" -PREFERRED_VERSION_gpe-irc ?= "0.08" -PREFERRED_VERSION_gpe-keylock ?= "0.12" -PREFERRED_VERSION_gpe-life ?= "0.2" -PREFERRED_VERSION_gpe-lights ?= "0.13" -PREFERRED_VERSION_gpe-login ?= "0.91" -PREFERRED_VERSION_gpe-mini-browser ?= "0.21" -PREFERRED_VERSION_gpe-mini-browser-hildon ?= "0.17" -PREFERRED_VERSION_gpe-mininet ?= "0.7" -PREFERRED_VERSION_gpe-mixer ?= "0.42" -PREFERRED_VERSION_gpe-nmf ?= "0.22" -PREFERRED_VERSION_gpe-othello ?= "0.2-1" -PREFERRED_VERSION_gpe-ownerinfo ?= "0.28" -PREFERRED_VERSION_gpe-package ?= "0.4" -PREFERRED_VERSION_gpe-phonepanel ?= "0.9" -PREFERRED_VERSION_gpe-plucker ?= "0.4" -PREFERRED_VERSION_gpe-question ?= "0.04" -PREFERRED_VERSION_gperf ?= "3.0.3" -PREFERRED_VERSION_gperf-native ?= "3.0.3" -PREFERRED_VERSION_gperiodic ?= "1.3.3" -PREFERRED_VERSION_gpe-scap ?= "1.3" -PREFERRED_VERSION_gpe-session-scripts ?= "0.67" -PREFERRED_VERSION_gpe-session-scripts-phone ?= "0.67" -PREFERRED_VERSION_gpe-shield ?= "0.9" -PREFERRED_VERSION_gpe-sketchbook ?= "0.2.9" -PREFERRED_VERSION_gpe-snes ?= "0.2" -PREFERRED_VERSION_gpe-soundbite ?= "1.0.6" -PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" -PREFERRED_VERSION_gpe-su ?= "0.19" -PREFERRED_VERSION_gpesyncd ?= "2.0" -PREFERRED_VERSION_gpe-synctool ?= "0.2" -PREFERRED_VERSION_gpe-taskmanager ?= "0.20" -PREFERRED_VERSION_gpe-terminal ?= "1.1" -PREFERRED_VERSION_gpe-tetris ?= "0.6-4" -PREFERRED_VERSION_gpe-theme-clearlooks ?= "0.3" -PREFERRED_VERSION_gpe-theme-e17 ?= "0.1" -PREFERRED_VERSION_gpe-theme-foxbox ?= "0.1" -PREFERRED_VERSION_gpe-theme-industrial ?= "0.2" -PREFERRED_VERSION_gpe-today ?= "0.11" -PREFERRED_VERSION_gpe-todo ?= "0.56" -PREFERRED_VERSION_gpe-todo-hildon ?= "0.55" -PREFERRED_VERSION_gpe-watch ?= "0.10" -PREFERRED_VERSION_gpe-what ?= "0.43" -PREFERRED_VERSION_gpe-windowlist ?= "0.1" -PREFERRED_VERSION_gpgme ?= "1.1.4" -PREFERRED_VERSION_gphoto2 ?= "2.4.0" -PREFERRED_VERSION_gpicview ?= "0.1.5" -PREFERRED_VERSION_gpm ?= "1.20.1" -PREFERRED_VERSION_gpp ?= "2.21" -PREFERRED_VERSION_gpsbabel ?= "1.3.3" -PREFERRED_VERSION_gpsd ?= "2.38" -PREFERRED_VERSION_gpsdrive ?= "2.10pre4" -PREFERRED_VERSION_gpstk ?= "1.2" -PREFERRED_VERSION_gqview ?= "2.1.1" -PREFERRED_VERSION_granule ?= "1.2.4" -PREFERRED_VERSION_grass ?= "6.2.1" -PREFERRED_VERSION_grep ?= "2.5.1" -PREFERRED_VERSION_grep-native ?= "2.5.1" -PREFERRED_VERSION_grip ?= "3.2.0" -PREFERRED_VERSION_groff ?= "1.19.2" -PREFERRED_VERSION_gs ?= "8.16" -PREFERRED_VERSION_gsl ?= "1.4" -PREFERRED_VERSION_gsmmux ?= "alpha-2" -PREFERRED_VERSION_gsoap ?= "2.7.7" -PREFERRED_VERSION_gsoap-native ?= "2.7.7" -PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6" -PREFERRED_VERSION_gspcav1 ?= "20070110" -PREFERRED_VERSION_gst-ffmpeg ?= "0.10.6" -PREFERRED_VERSION_gst-meta-base ?= "0.10" -PREFERRED_VERSION_gst-plugin-pulse ?= "0.9.7" -PREFERRED_VERSION_gst-plugins-bad ?= "0.10.6" -PREFERRED_VERSION_gst-plugins-base ?= "0.10.22" -PREFERRED_VERSION_gst-plugins-farsight ?= "0.10.1" -PREFERRED_VERSION_gst-plugins-good ?= "0.10.13" -PREFERRED_VERSION_gst-plugins-ugly ?= "0.10.10" -PREFERRED_VERSION_gst-pulse = "0.9.7" -PREFERRED_VERSION_gstreamer ?= "0.10.22" -PREFERRED_VERSION_gthumb ?= "2.6.9" -PREFERRED_VERSION_gtk+ ?= "2.12.11" -PREFERRED_VERSION_gtk2-ssh-askpass ?= "0.3" -PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" -PREFERRED_VERSION_gtk-clearlooks-engine ?= "0.6.2" -PREFERRED_VERSION_gtk-doc ?= "1.0" -PREFERRED_VERSION_gtk-doc-native ?= "1.0" -PREFERRED_VERSION_gtk-engines ?= "2.7.4" -PREFERRED_VERSION_gtkhtml-2.0 ?= "2.6.3" -PREFERRED_VERSION_gtkhtml-3.0 ?= "3.0.10" -PREFERRED_VERSION_gtkhtml-3.1 ?= "3.1.16" -PREFERRED_VERSION_gtkhtml-3.6 ?= "3.6.2" -PREFERRED_VERSION_gtkhtml-3.8 ?= "3.8.2" -PREFERRED_VERSION_gtkimageview ?= "1.3.0" -PREFERRED_VERSION_gtk-industrial-engine ?= "0.2.46.0" -PREFERRED_VERSION_gtkmathview ?= "0.7.6" -PREFERRED_VERSION_gtkmm ?= "2.10.10" -PREFERRED_VERSION_gtk-sato-engine ?= "0.1" -PREFERRED_VERSION_gtk-sharp ?= "2.10.2" -PREFERRED_VERSION_gtk-smooth-engine ?= "0.5.8" -PREFERRED_VERSION_gtksourceview1 ?= "1.7.2" -PREFERRED_VERSION_gtkterm2 ?= "0.2.3" -PREFERRED_VERSION_gtk-xfce-engine ?= "2.4.1" -PREFERRED_VERSION_gtracer ?= "0.0.10" -PREFERRED_VERSION_guichan ?= "0.7.1" -PREFERRED_VERSION_guile ?= "1.6.4" -PREFERRED_VERSION_guile-native ?= "1.8.2" -PREFERRED_VERSION_gutenprint ?= "5.1.3" -PREFERRED_VERSION_gutenprint-native ?= "5.1.3" -PREFERRED_VERSION_gvim ?= "7.0" -PREFERRED_VERSION_gweled ?= "0.5" -PREFERRED_VERSION_gxine ?= "0.4.1enhanced" -PREFERRED_VERSION_gzip ?= "1.3.5" -PREFERRED_VERSION_hal ?= "0.5.11" -PREFERRED_VERSION_hal-info ?= "20080508" -PREFERRED_VERSION_haserl ?= "0.8.0" -PREFERRED_VERSION_havp ?= "0.86" -PREFERRED_VERSION_hdparm ?= "6.9" -PREFERRED_VERSION_helloworld ?= "1.0.0" -PREFERRED_VERSION_hexatrolic ?= "1.0beta3" -PREFERRED_VERSION_hfsplusutils ?= "1.0.4-4" -PREFERRED_VERSION_hfsutils ?= "3.2.6" -PREFERRED_VERSION_hibernate-script ?= "1.12" -PREFERRED_VERSION_hicolor-icon-theme ?= "0.10" -PREFERRED_VERSION_hiker ?= "0.9.1" -PREFERRED_VERSION_hildon-base-lib ?= "0.11.1" -PREFERRED_VERSION_hildon-control-panel ?= "0.9.1-1.2" -PREFERRED_VERSION_hildon-fm ?= "0.9.1-2" -PREFERRED_VERSION_hildon-home ?= "0.8.20-2" -PREFERRED_VERSION_hildon-initscripts ?= "0.8.14-1" -PREFERRED_VERSION_hildon-lgpl ?= "0.12.1" -PREFERRED_VERSION_hildon-libs ?= "0.15.1" -PREFERRED_VERSION_hildon-navigator ?= "0.9.6-2" -PREFERRED_VERSION_hildon-status-bar ?= "0.8.11-1" -PREFERRED_VERSION_hildon-thumbnail ?= "0.11" -PREFERRED_VERSION_hostap-conf ?= "1.0" -PREFERRED_VERSION_hostap-daemon ?= "0.4.4" -PREFERRED_VERSION_hostap-utils ?= "0.4.7" -PREFERRED_VERSION_hotplug-dbus ?= "0.9" -PREFERRED_VERSION_hotplug-ng ?= "002" -PREFERRED_VERSION_hotplug-qcop ?= "cvs" -PREFERRED_VERSION_howl ?= "1.0.0" -PREFERRED_VERSION_hsetroot ?= "1.0.2" -PREFERRED_VERSION_htb-init ?= "0.8.5" -PREFERRED_VERSION_httppc ?= "0.8.5" -PREFERRED_VERSION_htun ?= "0.9.5" -PREFERRED_VERSION_hvsc ?= "45" -PREFERRED_VERSION_hwdata ?= "0.191" -PREFERRED_VERSION_hydra ?= "4.5" -PREFERRED_VERSION_iaimaster ?= "0.5" -PREFERRED_VERSION_iana-etc ?= "2.20" -PREFERRED_VERSION_ica-bin ?= "8.0" -PREFERRED_VERSION_iceauth ?= "1.0.2" -PREFERRED_VERSION_icebloxx ?= "1.0.0" -PREFERRED_VERSION_icecc-create-env ?= "0.1" -PREFERRED_VERSION_icewm ?= "1.2.30" -PREFERRED_VERSION_icmpquery ?= "1.03" -PREFERRED_VERSION_ico ?= "1.0.2" -PREFERRED_VERSION_icu ?= "3.6" -PREFERRED_VERSION_icu-native ?= "3.6" -PREFERRED_VERSION_id3lib ?= "3.8.3" -PREFERRED_VERSION_ifplugd ?= "0.25" -PREFERRED_VERSION_ifupdown ?= "0.6.8" -PREFERRED_VERSION_iksemel ?= "1.2" -PREFERRED_VERSION_imagemagick ?= "6.3.5-10" -PREFERRED_VERSION_imake ?= "1.0.2" -PREFERRED_VERSION_imlib ?= "1.9.15" -PREFERRED_VERSION_imlib2 ?= "1.4.0.002" -PREFERRED_VERSION_imposter ?= "0.3" -PREFERRED_VERSION_inetutils ?= "1.4.2" -PREFERRED_VERSION_initscripts ?= "1.0" -PREFERRED_VERSION_initscripts-openprotium ?= "1.0" -PREFERRED_VERSION_initscripts-slugos ?= "1.0" -PREFERRED_VERSION_inkscape ?= "0.43" -PREFERRED_VERSION_inkwp ?= "0.1.1" -PREFERRED_VERSION_inotify-tools ?= "2.1" -PREFERRED_VERSION_inputproto ?= "1.4.4" -PREFERRED_VERSION_insttrain ?= "1.0.5" -PREFERRED_VERSION_interbench ?= "0.30" -PREFERRED_VERSION_intercom ?= "0.15" -PREFERRED_VERSION_intltool ?= "0.35.5" -PREFERRED_VERSION_intltool-native ?= "0.35.5" -PREFERRED_VERSION_iozone3 ?= "263" -PREFERRED_VERSION_ipaq-sleep ?= "0.9" -PREFERRED_VERSION_ipatience ?= "0.1" -PREFERRED_VERSION_iperf ?= "2.0.2" -PREFERRED_VERSION_ipkg ?= "0.99.163" -PREFERRED_VERSION_ipkg-collateral ?= "1.0" -PREFERRED_VERSION_ipkg-native ?= "0.99.163" -PREFERRED_VERSION_iproute2 ?= "2.6.22" -PREFERRED_VERSION_ipsec-tools ?= "0.6.7" -PREFERRED_VERSION_iptables ?= "1.3.8" -PREFERRED_VERSION_iptstate ?= "2.2.1" -PREFERRED_VERSION_iputils ?= "20020927" -PREFERRED_VERSION_iqnotes ?= "2.0.99-2.1.0rc1" -PREFERRED_VERSION_ircp ?= "0.3" -PREFERRED_VERSION_irdadump ?= "0.9.16" -PREFERRED_VERSION_irda-utils ?= "0.9.16" -PREFERRED_VERSION_irk-belkin ?= "0.11" -PREFERRED_VERSION_irk-targus ?= "0.11.0" -PREFERRED_VERSION_irssi ?= "0.8.10" -PREFERRED_VERSION_iso-codes ?= "1.4" -PREFERRED_VERSION_ixp4xx-npe-native ?= "2.4" -PREFERRED_VERSION_jack ?= "0.103.0" -PREFERRED_VERSION_jamvm ?= "1.5.2" -PREFERRED_VERSION_jards ?= "1.0" -PREFERRED_VERSION_jhead ?= "2.6.0" -PREFERRED_VERSION_jikes ?= "1.22" -PREFERRED_VERSION_jikes-native ?= "1.21" -PREFERRED_VERSION_joe ?= "3.1" -PREFERRED_VERSION_js ?= "1.5" -PREFERRED_VERSION_juce ?= "1.29" -PREFERRED_VERSION_justreader ?= "2.0k" -PREFERRED_VERSION_kaffe-gtk ?= "1.1.5" -PREFERRED_VERSION_kaffeh-native ?= "1.1.5" -PREFERRED_VERSION_kakasi ?= "2.3.4" -PREFERRED_VERSION_kakasi-native ?= "2.3.4" -PREFERRED_VERSION_kanatest ?= "0.3.6" -PREFERRED_VERSION_kazehakase ?= "0.4.7" -PREFERRED_VERSION_kbd ?= "1.12" -PREFERRED_VERSION_kbproto ?= "1.0.3" -PREFERRED_VERSION_kdepimpi ?= "2.2.7" -PREFERRED_VERSION_kernbench ?= "0.41" -PREFERRED_VERSION_kernel-module-wlags49-h1-cs ?= "718" -PREFERRED_VERSION_kernel-module-wlags49-h2-cs ?= "718" -PREFERRED_VERSION_kexec-tools ?= "1.101" -PREFERRED_VERSION_keylaunch ?= "2.0.10" -PREFERRED_VERSION_keymap-locales ?= "1.0" -PREFERRED_VERSION_keymaps ?= "1.0" -PREFERRED_VERSION_keyring ?= "0.6.8" -PREFERRED_VERSION_kf ?= "0.5.4.1" -PREFERRED_VERSION_kismet ?= "2007-10-R1" -PREFERRED_VERSION_klimt ?= "0.6.1" -PREFERRED_VERSION_knights ?= "1.14" -PREFERRED_VERSION_konqueror-embedded ?= "20070212" -PREFERRED_VERSION_kpengine ?= "0.1" -PREFERRED_VERSION_kphonepi ?= "1.0.0" -PREFERRED_VERSION_kstars-embedded ?= "0.8.5" -PREFERRED_VERSION_ksymoops ?= "2.4.9" -PREFERRED_VERSION_ktimetrackerpi ?= "0.9.7" -PREFERRED_VERSION_kxml2 ?= "2.3.0" -PREFERRED_VERSION_labyrinth ?= "0.7" -PREFERRED_VERSION_lame ?= "3.96.1" -PREFERRED_VERSION_lbreakout2 ?= "2.6beta" -PREFERRED_VERSION_lcdproc ?= "0.5.1" -PREFERRED_VERSION_lcms ?= "1.15" -PREFERRED_VERSION_leafpad ?= "0.8.9" -PREFERRED_VERSION_led ?= "0.0cvs20060814" -PREFERRED_VERSION_lemon ?= "3.3.5" -PREFERRED_VERSION_lemon-native ?= "3.3.5" -PREFERRED_VERSION_less ?= "406" -PREFERRED_VERSION_lessertunjo ?= "0.0.10" -PREFERRED_VERSION_lftp ?= "3.5.1" -PREFERRED_VERSION_liba52 ?= "0.7.4" -PREFERRED_VERSION_libaal ?= "1.0.4" -PREFERRED_VERSION_libabenabler ?= "0.1" -PREFERRED_VERSION_libabenabler2 ?= "1.0" -PREFERRED_VERSION_libaio ?= "0.3.106" -PREFERRED_VERSION_libaio-oracle ?= "0.3.0" -PREFERRED_VERSION_libalgorithm-diff-perl ?= "1.1902" -PREFERRED_VERSION_libalgorithm-diff-perl-native ?= "1.1902" -PREFERRED_VERSION_libao ?= "0.8.6" -PREFERRED_VERSION_libao-alsa ?= "0.8.6" -PREFERRED_VERSION_libao-plugin-alsa ?= "0.8.6" -PREFERRED_VERSION_libapplewm ?= "1.0.0" -PREFERRED_VERSION_libarchive-tar-perl ?= "1.30" -PREFERRED_VERSION_libarchive-tar-perl-native ?= "1.30" -PREFERRED_VERSION_libarena ?= "0.2" -PREFERRED_VERSION_libart-lgpl ?= "2.3.19" -PREFERRED_VERSION_libassa ?= "3.4.2" -PREFERRED_VERSION_libassuan ?= "0.6.9" -PREFERRED_VERSION_libatomics-ops ?= "1.2" -PREFERRED_VERSION_libbedic ?= "1.0" -PREFERRED_VERSION_libbonobo ?= "2.22.0" -PREFERRED_VERSION_libbonoboui ?= "2.18.0" -PREFERRED_VERSION_libcache-cache-perl ?= "1.05" -PREFERRED_VERSION_libcache-cache-perl-native ?= "1.05" -PREFERRED_VERSION_libcalenabler ?= "1.0" -PREFERRED_VERSION_libcap ?= "1.10" -PREFERRED_VERSION_libccaudio2 ?= "0.9.0" -PREFERRED_VERSION_libcdaudio ?= "0.99.12p2" -PREFERRED_VERSION_libcgicc ?= "3.2.3" -PREFERRED_VERSION_libchenabler ?= "0.1" -PREFERRED_VERSION_libclass-container-perl ?= "0.12" -PREFERRED_VERSION_libclass-container-perl-native ?= "0.12" -PREFERRED_VERSION_libclass-data-inheritable-perl ?= "0.06" -PREFERRED_VERSION_libclass-data-inheritable-perl-native ?= "0.06" -PREFERRED_VERSION_libcompress-zlib-perl ?= "1.42" -PREFERRED_VERSION_libcompress-zlib-perl-native ?= "1.42" -PREFERRED_VERSION_libcontactsdb ?= "0.5" -PREFERRED_VERSION_libcroco ?= "0.6.1" -PREFERRED_VERSION_libcwd ?= "0.99.47" -PREFERRED_VERSION_libdaemon ?= "0.13" -PREFERRED_VERSION_libdata-optlist-perl ?= "0.101" -PREFERRED_VERSION_libdata-optlist-perl-native ?= "0.101" -PREFERRED_VERSION_libdbi ?= "0.7.2" -PREFERRED_VERSION_libdbi-drivers ?= "0.7.1" -PREFERRED_VERSION_libddmpeg ?= "1.5" -PREFERRED_VERSION_libdes ?= "4.01" -PREFERRED_VERSION_libdevel-stacktrace-perl ?= "1.13" -PREFERRED_VERSION_libdevel-stacktrace-perl-native ?= "1.13" -PREFERRED_VERSION_libdictionary ?= "1.0" -PREFERRED_VERSION_libdigest-sha1-perl ?= "2.11" -PREFERRED_VERSION_libdigest-sha1-perl-native ?= "2.11" -PREFERRED_VERSION_libdisplaymigration ?= "0.99" -PREFERRED_VERSION_libdmx ?= "1.0.2" -PREFERRED_VERSION_libdotdesktop ?= "0.11" -PREFERRED_VERSION_libdrm ?= "2.3.0" -PREFERRED_VERSION_libdvb ?= "0.5.5.1" -PREFERRED_VERSION_libdvdnav ?= "0.1.10" -PREFERRED_VERSION_libdvdread ?= "0.9.6" -PREFERRED_VERSION_libedit ?= "20050118" -PREFERRED_VERSION_libeina ?= "0.96.7" -PREFERRED_VERSION_libelf ?= "0.8.6" -PREFERRED_VERSION_liberror-perl ?= "0.17004" -PREFERRED_VERSION_liberror-perl-native ?= "0.17004" -PREFERRED_VERSION_libesmtp ?= "1.0.4" -PREFERRED_VERSION_libevent ?= "1.1a" -PREFERRED_VERSION_libeventdb ?= "0.90" -PREFERRED_VERSION_libevnet ?= "0.3.1" -PREFERRED_VERSION_libexception-class-perl ?= "1.23" -PREFERRED_VERSION_libexception-class-perl-native ?= "1.23" -PREFERRED_VERSION_libexif ?= "0.6.13" -PREFERRED_VERSION_libextutils-cbuilder-perl ?= "0.18" -PREFERRED_VERSION_libextutils-cbuilder-perl-native ?= "0.18" -PREFERRED_VERSION_libextutils-depends-perl ?= "0.205" -PREFERRED_VERSION_libextutils-depends-perl-native ?= "0.205" -PREFERRED_VERSION_libextutils-parsexs-perl ?= "2.16" -PREFERRED_VERSION_libextutils-parsexs-perl-native ?= "2.16" -PREFERRED_VERSION_libextutils-pkgconfig-perl ?= "1.07" -PREFERRED_VERSION_libextutils-pkgconfig-perl-native ?= "1.07" -PREFERRED_VERSION_libflv ?= "0.2" -PREFERRED_VERSION_libfontenc ?= "1.0.4" -PREFERRED_VERSION_libfontenc-native ?= "1.0.4" -PREFERRED_VERSION_libfribidi ?= "0.10.4" -PREFERRED_VERSION_libfs ?= "1.0.0" -PREFERRED_VERSION_libftdi ?= "0.18" -PREFERRED_VERSION_libftdi-native ?= "0.18" -PREFERRED_VERSION_libg15 ?= "1.2.1" -PREFERRED_VERSION_libg15render ?= "1.2" -PREFERRED_VERSION_libgalago ?= "0.3.3" -PREFERRED_VERSION_libgc ?= "6.7" -PREFERRED_VERSION_libgcrypt ?= "1.4.0" -PREFERRED_VERSION_libgeda ?= "20050820" -PREFERRED_VERSION_libgemwidget ?= "1.0" -PREFERRED_VERSION_libglade ?= "2.6.2" -PREFERRED_VERSION_libglademm ?= "2.4.1" -PREFERRED_VERSION_libgmime ?= "2.1.7" -PREFERRED_VERSION_libgnome ?= "2.18.0" -PREFERRED_VERSION_libgnomecanvas ?= "2.20.0" -PREFERRED_VERSION_libgnomecups ?= "0.2.2" -PREFERRED_VERSION_libgnomeprint ?= "2.8.2" -PREFERRED_VERSION_libgnomeprintui ?= "2.8.2" -PREFERRED_VERSION_libgnomeui ?= "2.18.1" -PREFERRED_VERSION_libgpelaunch ?= "0.14" -PREFERRED_VERSION_libgpephone ?= "0.4" -PREFERRED_VERSION_libgpepimc ?= "0.9" -PREFERRED_VERSION_libgpepimc-hildon ?= "0.5" -PREFERRED_VERSION_libgpevtype ?= "0.50" -PREFERRED_VERSION_libgpewidget ?= "0.117" -PREFERRED_VERSION_libgpewidget-hildon ?= "0.102" -PREFERRED_VERSION_libgpg-error ?= "1.4" -PREFERRED_VERSION_libgphoto2 ?= "2.4.0" -PREFERRED_VERSION_libgpsbt ?= "0.1" -PREFERRED_VERSION_libgpsmgr ?= "0.1" -PREFERRED_VERSION_libgsf ?= "1.14.2" -PREFERRED_VERSION_libgsm ?= "1.0.10" -PREFERRED_VERSION_libgtkinput ?= "0.3" -PREFERRED_VERSION_libgtkstylus ?= "0.3" -PREFERRED_VERSION_libhal-nm ?= "0.0.2" -PREFERRED_VERSION_libhandoff ?= "0.1" -PREFERRED_VERSION_libhangul ?= "0.0.4" -PREFERRED_VERSION_libhildonfm ?= "1.9.41" -PREFERRED_VERSION_libhildonhelp ?= "1.9.1" -PREFERRED_VERSION_libhildonmime ?= "1.9.5" -PREFERRED_VERSION_libhtml-mason-perl ?= "1.35" -PREFERRED_VERSION_libiac ?= "1.0" -PREFERRED_VERSION_libice ?= "1.0.4" -PREFERRED_VERSION_libiconv ?= "1.11" -PREFERRED_VERSION_libid3 ?= "1.1" -PREFERRED_VERSION_libidl ?= "0.8.10" -PREFERRED_VERSION_libidl-native ?= "0.8.10" -PREFERRED_VERSION_libidn ?= "0.5.19" -PREFERRED_VERSION_libim ?= "0.2" -PREFERRED_VERSION_libintl-perl ?= "1.16" -PREFERRED_VERSION_libintl-perl-native ?= "1.16" -PREFERRED_VERSION_libio-zlib-perl ?= "1.04" -PREFERRED_VERSION_libio-zlib-perl-native ?= "1.04" -PREFERRED_VERSION_libjingle-tapioca ?= "0.3.10" -PREFERRED_VERSION_liblbxutil ?= "1.0.1" -PREFERRED_VERSION_liblipsevent ?= "0.1" -PREFERRED_VERSION_liblocale-gettext-perl ?= "1.05" -PREFERRED_VERSION_liblocale-gettext-perl-native ?= "1.05" -PREFERRED_VERSION_liblockfile ?= "1.06" -PREFERRED_VERSION_liblog-dispatch-perl ?= "2.13" -PREFERRED_VERSION_liblog-dispatch-perl-native ?= "2.13" -PREFERRED_VERSION_liblog-log4perl-perl ?= "1.06" -PREFERRED_VERSION_liblog-log4perl-perl-native ?= "1.06" -PREFERRED_VERSION_libmad ?= "0.15.1b" -PREFERRED_VERSION_libmail-sendmail-perl ?= "0.79" -PREFERRED_VERSION_libmailwrapper ?= "1.2.3" -PREFERRED_VERSION_libmatchbox ?= "1.9" -PREFERRED_VERSION_libmath-bigint-gmp-perl ?= "1.18" -PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2" -PREFERRED_VERSION_libmimedir ?= "0.4.2" -PREFERRED_VERSION_libmng ?= "1.0.8" -PREFERRED_VERSION_libmodplug ?= "0.8" -PREFERRED_VERSION_libmodule-build-perl ?= "0.2805" -PREFERRED_VERSION_libmodule-build-perl-native ?= "0.2805" -PREFERRED_VERSION_libmrss ?= "0.17.2" -PREFERRED_VERSION_libmsgenabler ?= "1.0" -PREFERRED_VERSION_libmusicbrainz ?= "2.1.4" -PREFERRED_VERSION_libnet ?= "1.1.2.1" -PREFERRED_VERSION_libnetfilter-queue ?= "0.0.13" -PREFERRED_VERSION_libnet-ip-perl ?= "1.25" -PREFERRED_VERSION_libnet-ip-perl-native ?= "1.25" -PREFERRED_VERSION_libnetserver-generic-perl ?= "1.03" -PREFERRED_VERSION_libnfnetlink ?= "0.0.30" -PREFERRED_VERSION_libnids ?= "1.18" -PREFERRED_VERSION_libnotify ?= "0.4.4" -PREFERRED_VERSION_libnss-mdns ?= "0.9" -PREFERRED_VERSION_libnxml ?= "0.16" -PREFERRED_VERSION_libogg ?= "1.1.3" -PREFERRED_VERSION_liboil ?= "0.3.15" -PREFERRED_VERSION_libol ?= "0.3.18" -PREFERRED_VERSION_liboldx ?= "1.0.1" -PREFERRED_VERSION_liboop ?= "1.0" -PREFERRED_VERSION_libopenraw ?= "0.0.2" -PREFERRED_VERSION_libopensync ?= "0.22" -PREFERRED_VERSION_libopensync-plugin-evo2-sync ?= "0.22" -PREFERRED_VERSION_libopensync-plugin-file ?= "0.18" -PREFERRED_VERSION_libopensync-plugin-file-sync ?= "0.22" -PREFERRED_VERSION_libopensync-plugin-gpe ?= "0.18" -PREFERRED_VERSION_libopensync-plugin-irmc ?= "0.18" -PREFERRED_VERSION_libopensync-plugin-irmc-sync ?= "0.22" -PREFERRED_VERSION_libosso ?= "1.20" -PREFERRED_VERSION_libosso-gsf ?= "1.11.10.4" -PREFERRED_VERSION_libosso-help ?= "2.1.2" -PREFERRED_VERSION_libpam ?= "0.79" -PREFERRED_VERSION_libparams-util-perl ?= "0.20" -PREFERRED_VERSION_libparams-util-perl-native ?= "0.20" -PREFERRED_VERSION_libparams-validate-perl ?= "0.86" -PREFERRED_VERSION_libparams-validate-perl-native ?= "0.86" -PREFERRED_VERSION_libpcap ?= "0.9.8" -PREFERRED_VERSION_libpcl ?= "1.4" -PREFERRED_VERSION_libpcre ?= "7.6" -PREFERRED_VERSION_libpcre-native ?= "7.6" -PREFERRED_VERSION_libperl6-junction-perl ?= "1.10" -PREFERRED_VERSION_libpng ?= "1.2.20" -PREFERRED_VERSION_libpng-native ?= "1.2.20" -PREFERRED_VERSION_libpthread-stubs ?= "0.1" -PREFERRED_VERSION_libqanava ?= "0.0.7" -PREFERRED_VERSION_libqtaux2 ?= "1.2.3" -PREFERRED_VERSION_librcf ?= "0.4" -PREFERRED_VERSION_librecord ?= "0.1" -PREFERRED_VERSION_librecord2 ?= "0.1" -PREFERRED_VERSION_librewrite ?= "0.1" -PREFERRED_VERSION_librsvg ?= "2.16.1" -PREFERRED_VERSION_librsync ?= "0.9.7" -PREFERRED_VERSION_librtaudio ?= "3.0.1" -PREFERRED_VERSION_libsamplerate0 ?= "0.1.2" -PREFERRED_VERSION_libschedule ?= "0.17" -PREFERRED_VERSION_libsdl-directfb ?= "1.2.9" -PREFERRED_VERSION_libsdl-gfx ?= "2.0.11" -PREFERRED_VERSION_libsdl-image ?= "1.2.6" -PREFERRED_VERSION_libsdl-mixer ?= "1.2.6" -PREFERRED_VERSION_libsdl-native ?= "1.2.11" -PREFERRED_VERSION_libsdl-net ?= "1.2.7" -PREFERRED_VERSION_libsdl-ttf ?= "2.0.3" -PREFERRED_VERSION_libsdl-ttf-native ?= "2.0.3" -PREFERRED_VERSION_libsdl-x11 ?= "1.2.11" -PREFERRED_VERSION_libsettings ?= "0.3" -PREFERRED_VERSION_libsexy ?= "0.1.11" -PREFERRED_VERSION_libsidplay ?= "1.36.59" -PREFERRED_VERSION_libsigcx0 ?= "0.6.4" -PREFERRED_VERSION_libsm ?= "1.0.3" -PREFERRED_VERSION_libsndfile1 ?= "1.0.17" -PREFERRED_VERSION_libsoundgen ?= "0.6" -PREFERRED_VERSION_libsoup ?= "2.2.100" -PREFERRED_VERSION_libspf2 ?= "1.0.4" -PREFERRED_VERSION_libspiff ?= "0.8.2" -PREFERRED_VERSION_libssh ?= "0.11" -PREFERRED_VERSION_libsub-exporter-perl ?= "0.970" -PREFERRED_VERSION_libsub-exporter-perl-native ?= "0.970" -PREFERRED_VERSION_libsub-install-perl ?= "0.922" -PREFERRED_VERSION_libsub-install-perl-native ?= "0.922" -PREFERRED_VERSION_libsub-uplevel-perl ?= "0.13" -PREFERRED_VERSION_libsub-uplevel-perl-native ?= "0.13" -PREFERRED_VERSION_libsvg ?= "0.1.4" -PREFERRED_VERSION_libtelepathy ?= "0.0.53" -PREFERRED_VERSION_libtest-builder-tester-perl ?= "1.01" -PREFERRED_VERSION_libtest-differences-perl ?= "0.47" -PREFERRED_VERSION_libtest-exception-perl ?= "0.22" -PREFERRED_VERSION_libtest-mockmodule-perl ?= "0.05" -PREFERRED_VERSION_libtest-output-perl ?= "0.10" -PREFERRED_VERSION_libtext-diff-perl ?= "0.35" -PREFERRED_VERSION_libtext-diff-perl-native ?= "0.35" -PREFERRED_VERSION_libticables ?= "3.9.2" -PREFERRED_VERSION_libticalcs ?= "4.5.9" -PREFERRED_VERSION_libtifiles ?= "0.6.5" -PREFERRED_VERSION_libtinymail ?= "0.0.3" -PREFERRED_VERSION_libtododb ?= "0.11" -PREFERRED_VERSION_libtomcrypt ?= "0.97b" -PREFERRED_VERSION_libtomoe-gtk ?= "0.1.0" -PREFERRED_VERSION_libtool ?= "2.2.4" -PREFERRED_VERSION_libtool-cross ?= "2.2.4" -PREFERRED_VERSION_libtool-native ?= "2.2.4" -PREFERRED_VERSION_libtool-sdk ?= "2.2.4" -PREFERRED_VERSION_libungif ?= "4.1.3" -PREFERRED_VERSION_libupnp ?= "1.3.1" -PREFERRED_VERSION_liburiparser ?= "0.5.1" -PREFERRED_VERSION_liburi-perl ?= "1.35" -PREFERRED_VERSION_liburi-perl-native ?= "1.35" -PREFERRED_VERSION_libusb ?= "0.1.12" -PREFERRED_VERSION_libusb-native ?= "0.1.12" -PREFERRED_VERSION_libversion-perl ?= "0.6701" -PREFERRED_VERSION_libversion-perl-native ?= "0.6701" -PREFERRED_VERSION_libvisual ?= "0.1.3" -PREFERRED_VERSION_libvisual-plugins ?= "0.1.3" -PREFERRED_VERSION_libvncserver ?= "0.9.1" -PREFERRED_VERSION_libvocenabler ?= "0.1" -PREFERRED_VERSION_libvorbis ?= "1.0.1" -PREFERRED_VERSION_libw100 ?= "0.0.2" -PREFERRED_VERSION_libwindowswm ?= "1.0.0" -PREFERRED_VERSION_libwnck ?= "2.13.5" -PREFERRED_VERSION_libwpd ?= "0.8.6" -PREFERRED_VERSION_libx11 ?= "1.1.3" -PREFERRED_VERSION_libx11-native = "1.0.3" -PREFERRED_VERSION_libxau ?= "1.0.3" -PREFERRED_VERSION_libxau-native ?= "1.0.3" -PREFERRED_VERSION_libxaw ?= "1.0.4" -PREFERRED_VERSION_libxcb ?= "1.0" -PREFERRED_VERSION_libxcomposite ?= "0.4.0" -PREFERRED_VERSION_libxcursor ?= "1.1.9" -PREFERRED_VERSION_libxdamage ?= "1.1.1" -PREFERRED_VERSION_libxdmcp ?= "1.0.2" -PREFERRED_VERSION_libxdmcp-native ?= "1.0.2" -PREFERRED_VERSION_libxevie ?= "1.0.2" -PREFERRED_VERSION_libxext ?= "1.0.3" -PREFERRED_VERSION_libxfce4mcs ?= "4.4.1" -PREFERRED_VERSION_libxfce4util ?= "4.4.1" -PREFERRED_VERSION_libxfcegui4 ?= "4.4.1" -PREFERRED_VERSION_libxfixes ?= "4.0.3" -PREFERRED_VERSION_libxfont ?= "1.3.1" -PREFERRED_VERSION_libxfontcache ?= "1.0.4" -PREFERRED_VERSION_libxfont-native ?= "1.3.0" -PREFERRED_VERSION_libxft ?= "2.1.12" -PREFERRED_VERSION_libxi ?= "1.1.3" -PREFERRED_VERSION_libxinerama ?= "1.0.2" -PREFERRED_VERSION_libxkbfile ?= "1.0.4" -PREFERRED_VERSION_libxkbui ?= "1.0.2" -PREFERRED_VERSION_libxml2 ?= "2.7.2" -PREFERRED_VERSION_libxml2-native ?= "2.7.2" -PREFERRED_VERSION_libxml-parser-perl ?= "2.34" -PREFERRED_VERSION_libxml-parser-perl-native ?= "2.34" -PREFERRED_VERSION_libxmu ?= "1.0.3" -PREFERRED_VERSION_libxp ?= "1.0.0" -PREFERRED_VERSION_libxpm ?= "3.5.7" -PREFERRED_VERSION_libxprintapputil ?= "1.0.1" -PREFERRED_VERSION_libxprintutil ?= "1.0.1" -PREFERRED_VERSION_libxrandr ?= "1.2.2" -PREFERRED_VERSION_libxrender ?= "0.9.4" -PREFERRED_VERSION_libxres ?= "1.0.3" -PREFERRED_VERSION_libxscrnsaver ?= "1.1.2" -PREFERRED_VERSION_libxsettings ?= "0.11" -PREFERRED_VERSION_libxsettings-client ?= "0.17" -PREFERRED_VERSION_libxslt ?= "1.1.22" -PREFERRED_VERSION_libxslt-native ?= "1.1.21" -PREFERRED_VERSION_libxt ?= "1.0.5" -PREFERRED_VERSION_libxtrap ?= "1.0.0" -PREFERRED_VERSION_libxtst ?= "1.0.3" -PREFERRED_VERSION_libxv ?= "1.0.3" -PREFERRED_VERSION_libxvmc ?= "1.0.4" -PREFERRED_VERSION_libxxf86dga ?= "1.0.2" -PREFERRED_VERSION_libxxf86misc ?= "1.0.1" -PREFERRED_VERSION_libxxf86vm ?= "1.0.1" -PREFERRED_VERSION_libyaml-perl ?= "0.62" -PREFERRED_VERSION_libyaml-perl-native ?= "0.62" -PREFERRED_VERSION_lighttpd ?= "1.4.18" -PREFERRED_VERSION_lineak ?= "0.8.3" -PREFERRED_VERSION_linphone ?= "1.6.0" -PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" -PREFERRED_VERSION_linux-hotplug ?= "20040920" -PREFERRED_VERSION_linux-libc-headers ?= "2.6.22" -PREFERRED_VERSION_lisa ?= "0.2.2" -PREFERRED_VERSION_live555 ?= "20051005" -PREFERRED_VERSION_llvm ?= "2.0" -PREFERRED_VERSION_llvm-native ?= "2.1" -PREFERRED_VERSION_lmbench ?= "2.0.4" -PREFERRED_VERSION_lmsensors-apps ?= "2.10.1" -PREFERRED_VERSION_lndir ?= "1.0.1" -PREFERRED_VERSION_loader ?= "0.04" -PREFERRED_VERSION_login-manager ?= "1.0" -PREFERRED_VERSION_logrotate ?= "3.7.1" -PREFERRED_VERSION_logrotate-script ?= "cvs" -PREFERRED_VERSION_loudmouth ?= "1.2.2" -PREFERRED_VERSION_lrzsz ?= "0.12.20" -PREFERRED_VERSION_lsh ?= "1.5.5" -PREFERRED_VERSION_lsof ?= "4.78" -PREFERRED_VERSION_ltp ?= "20070228" -PREFERRED_VERSION_ltrace ?= "0.4" -PREFERRED_VERSION_lttng-control ?= "0.12" -PREFERRED_VERSION_lttng-viewer ?= "0.8.41-20060512" -PREFERRED_VERSION_lua ?= "5.0.2" -PREFERRED_VERSION_lua-gtk2 ?= "0.3" -PREFERRED_VERSION_lua-native ?= "5.0.2" -PREFERRED_VERSION_luit ?= "1.0.2" -PREFERRED_VERSION_lvm2 ?= "2.01.15" -PREFERRED_VERSION_lxt ?= "1.0" -PREFERRED_VERSION_lyx ?= "1.4.4" -PREFERRED_VERSION_lzma ?= "4.17" -PREFERRED_VERSION_lzma-native ?= "4.17" -PREFERRED_VERSION_lzo ?= "1.08" -PREFERRED_VERSION_lzo-native ?= "1.08" -PREFERRED_VERSION_m4 ?= "1.4.8" -PREFERRED_VERSION_m4-native ?= "1.4.8" -PREFERRED_VERSION_macchanger ?= "1.5.0" -PREFERRED_VERSION_madfu ?= "1.2" -PREFERRED_VERSION_madplay ?= "0.15.2b" -PREFERRED_VERSION_mahjongg ?= "1.0.0" -PREFERRED_VERSION_mailutils ?= "0.3.1" -PREFERRED_VERSION_mailx ?= "8.1.2-0.20050715cvs" -PREFERRED_VERSION_make ?= "3.81" -PREFERRED_VERSION_makedepend ?= "1.0.1" -PREFERRED_VERSION_makedepend-native ?= "1.0.1" -PREFERRED_VERSION_makedev ?= "2.3.1" -PREFERRED_VERSION_makedevs ?= "1.0.0" -PREFERRED_VERSION_makedevs-native ?= "1.0.0" -PREFERRED_VERSION_make-native ?= "3.81" -PREFERRED_VERSION_makeself-native ?= "cvs" -PREFERRED_VERSION_maki ?= "1.0.4ern" -PREFERRED_VERSION_man ?= "1.5p" -PREFERRED_VERSION_man-pages ?= "2.41" -PREFERRED_VERSION_manufacturers ?= "20031209" -PREFERRED_VERSION_mapnik ?= "0.4.0" -PREFERRED_VERSION_maradns ?= "1.0.39" -PREFERRED_VERSION_masqmail ?= "0.2.21" -PREFERRED_VERSION_matchbox ?= "0.9.1" -PREFERRED_VERSION_matchbox-applet-cards ?= "1.0.2" -PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" -PREFERRED_VERSION_matchbox-applet-startup-monitor ?= "0.1" -PREFERRED_VERSION_matchbox-applet-volume ?= "0.1" -PREFERRED_VERSION_matchbox-common ?= "0.9.1" -PREFERRED_VERSION_matchbox-desktop ?= "0.9.1" -PREFERRED_VERSION_matchbox-panel ?= "0.9.3" -PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1" -PREFERRED_VERSION_matchbox-panel-manager ?= "0.1" -PREFERRED_VERSION_matchbox-theme-sato ?= "0.1" -PREFERRED_VERSION_matchbox-themes-extra ?= "0.3" -PREFERRED_VERSION_matchbox-themes-gtk ?= "1.0" -PREFERRED_VERSION_matchbox-wm ?= "1.2" -PREFERRED_VERSION_mathomatic ?= "unstable" -PREFERRED_VERSION_matrixssl ?= "1.1.1" -PREFERRED_VERSION_mb-applet-tasks ?= "1.0.0" -PREFERRED_VERSION_mb-desktop-xine ?= "0.4" -PREFERRED_VERSION_mbmerlin ?= "0.8.1-2" -PREFERRED_VERSION_mc ?= "4.6.1" -PREFERRED_VERSION_mce-dev ?= "1.5.6" -PREFERRED_VERSION_mdadm ?= "2.5.5" -PREFERRED_VERSION_mdev ?= "1.2.1" -PREFERRED_VERSION_mdk2 ?= "v33" -PREFERRED_VERSION_memedit ?= "0.7" -PREFERRED_VERSION_memtester ?= "4.0.6" -PREFERRED_VERSION_meta-e-x11 ?= "1.0" -PREFERRED_VERSION_meta-e-x11-core ?= "1.0" -PREFERRED_VERSION_meta-gpe ?= "1.0" -PREFERRED_VERSION_meta-gpe-extras ?= "1.0" -PREFERRED_VERSION_meta-gpephone ?= "1.0" -PREFERRED_VERSION_metakit ?= "2.4.9.3" -PREFERRED_VERSION_metalog ?= "0.7" -PREFERRED_VERSION_meta-maemo ?= "1.0" -PREFERRED_VERSION_meta-sdk ?= "1.0" -PREFERRED_VERSION_meta-sdk-gpe ?= "1.0" -PREFERRED_VERSION_meta-sdk-sbox ?= "1.0" -PREFERRED_VERSION_meta-sdk-sbox-gpe ?= "1.0" -PREFERRED_VERSION_meta-sdl ?= "1.0" -PREFERRED_VERSION_meta-sectest-gpe ?= "1.0" -PREFERRED_VERSION_meta-toolchain ?= "1.0" -PREFERRED_VERSION_mgetty ?= "1.1.30" -PREFERRED_VERSION_miau ?= "0.5.3" -PREFERRED_VERSION_microcom ?= "1.02" -PREFERRED_VERSION_micro-emacs ?= "20060909" -PREFERRED_VERSION_microwindows ?= "0.90" -PREFERRED_VERSION_midori ?= "0.0.17" -PREFERRED_VERSION_midpath-backend-alsa ?= "0.2+0.3rc2" -PREFERRED_VERSION_midpath-backend-escher ?= "0.2+0.3rc2" -PREFERRED_VERSION_midpath-backend-esd ?= "0.2+0.3rc2" -PREFERRED_VERSION_midpath-backend-fb ?= "0.2+0.3rc2" -PREFERRED_VERSION_midpath-backend-gtk ?= "0.2+0.3rc2" -PREFERRED_VERSION_midpath-backend-pulseaudio ?= "0.2+0.3rc2" -PREFERRED_VERSION_midpath-backend-qt3x11 ?= "0.2+0.3rc2" -PREFERRED_VERSION_midpath-backend-qt4x11 ?= "0.2+0.3rc2" -PREFERRED_VERSION_midpath-backend-qte ?= "0.2+0.3rc2" -PREFERRED_VERSION_midpath-backend-sdl ?= "0.2+0.3rc2" -PREFERRED_VERSION_midpath-cldc ?= "0.2+0.3rc2" -PREFERRED_VERSION_midpath-core ?= "0.2+0.3rc2" -PREFERRED_VERSION_midpath-demos ?= "0.2+0.3rc2" -PREFERRED_VERSION_midpath-jgl ?= "0.2+0.3rc2" -PREFERRED_VERSION_midpath-location ?= "0.2+0.3rc2" -PREFERRED_VERSION_midpath-m3g ?= "0.2+0.3rc2" -PREFERRED_VERSION_midpath-maemo ?= "0.2+0.3rc2" -PREFERRED_VERSION_midpath-messaging ?= "0.2+0.3rc2" -PREFERRED_VERSION_midpath-opengles ?= "0.2+0.3rc2" -PREFERRED_VERSION_midpath-openmoko ?= "0.2+0.3rc2" -PREFERRED_VERSION_midpath-svg ?= "0.2+0.3rc2" -PREFERRED_VERSION_midpath-webservices ?= "0.2+0.3rc2" -PREFERRED_VERSION_mikmod ?= "3.2.2-beta1" -PREFERRED_VERSION_mileage ?= "4.2.0-cvs-20060814" -PREFERRED_VERSION_militaryalphabet ?= "0.2.1" -PREFERRED_VERSION_mime-support ?= "3.28" -PREFERRED_VERSION_miniclipboard ?= "0.3" -PREFERRED_VERSION_minicom ?= "2.1" -PREFERRED_VERSION_minifo-modules ?= "0.6.1-pre1" -PREFERRED_VERSION_miniinit ?= "1.0" -PREFERRED_VERSION_minimix ?= "0.9" -PREFERRED_VERSION_minipredict ?= "1.0" -PREFERRED_VERSION_mipv6 ?= "1.1-v2.4.26" -PREFERRED_VERSION_misdn ?= "cvs" -PREFERRED_VERSION_mkbot ?= "0.3" -PREFERRED_VERSION_mkfontdir ?= "1.0.3" -PREFERRED_VERSION_mkfontdir-native ?= "1.0.3" -PREFERRED_VERSION_mobilemesh ?= "1.2" -PREFERRED_VERSION_moc ?= "2.4.0" -PREFERRED_VERSION_modphp ?= "5.1.6" -PREFERRED_VERSION_modplugplay ?= "1.0" -PREFERRED_VERSION_module-init-tools ?= "3.2.2" -PREFERRED_VERSION_module-init-tools-cross ?= "3.2.2" -PREFERRED_VERSION_modutils ?= "2.4.27" -PREFERRED_VERSION_modutils-collateral ?= "1.0" -PREFERRED_VERSION_modutils-cross ?= "2.4.27" -PREFERRED_VERSION_modutils-initscripts ?= "1.0" -PREFERRED_VERSION_moin ?= "1.5.8" -PREFERRED_VERSION_mono ?= "1.2.5.1" -PREFERRED_VERSION_mono-mcs-intermediate ?= "1.2.5.1" -PREFERRED_VERSION_mono-native ?= "1.2.5.1" -PREFERRED_VERSION_monotone-4 ?= "0.19" -PREFERRED_VERSION_monotone-5 ?= "0.25.2" -PREFERRED_VERSION_monotone-6 ?= "0.34" -PREFERRED_VERSION_motion ?= "3.2.6" -PREFERRED_VERSION_moto-boot-usb-native ?= "0.1.0" -PREFERRED_VERSION_mousepad ?= "0.2.12" -PREFERRED_VERSION_mp3blaster ?= "3.2.3" -PREFERRED_VERSION_mpc ?= "0.12.1" -PREFERRED_VERSION_mpeg2dec ?= "0.4.0b" -PREFERRED_VERSION_mpfr ?= "2.3.1" -PREFERRED_VERSION_mpfr-native ?= "2.3.1" -PREFERRED_VERSION_mpg123 ?= "0.66" -PREFERRED_VERSION_mpg321 ?= "0.2.10" -PREFERRED_VERSION_mplayer-common ?= "0.0.1" -PREFERRED_VERSION_mrxvt ?= "0.5.2" -PREFERRED_VERSION_msmtp ?= "1.4.10" -PREFERRED_VERSION_msn-cap ?= "1.0" -PREFERRED_VERSION_msynctool ?= "0.22" -PREFERRED_VERSION_mt-daapd ?= "0.2.3" -PREFERRED_VERSION_mtools ?= "3.9.9" -PREFERRED_VERSION_mtools-native ?= "3.9.9" -PREFERRED_VERSION_mtpaint ?= "3.02" -PREFERRED_VERSION_mtr ?= "0.65" -PREFERRED_VERSION_multisync ?= "0.90.18" -PREFERRED_VERSION_murasaki ?= "0.8.8" -PREFERRED_VERSION_mutt ?= "1.5.15" -PREFERRED_VERSION_mysql ?= "4.1.18" -PREFERRED_VERSION_mysql-native ?= "4.1.18" -PREFERRED_VERSION_mythfront-config ?= "1.10" -PREFERRED_VERSION_mythfront-session ?= "1.5" -PREFERRED_VERSION_nabi ?= "0.17" -PREFERRED_VERSION_nail ?= "11.21" -PREFERRED_VERSION_nano ?= "2.0.7" -PREFERRED_VERSION_nasm-native ?= "0.98.38" -PREFERRED_VERSION_nautilus ?= "2.12.2" -PREFERRED_VERSION_nautilus-cd-burner ?= "2.8.5" -PREFERRED_VERSION_nbd ?= "2.8.7" -PREFERRED_VERSION_ncftp ?= "3.2.0" -PREFERRED_VERSION_ncmpc ?= "0.11.1" -PREFERRED_VERSION_ncurses ?= "5.4" -PREFERRED_VERSION_ncurses-native ?= "5.4" -PREFERRED_VERSION_ndisc6 ?= "0.6.7" -PREFERRED_VERSION_neon ?= "0.25.5" -PREFERRED_VERSION_net6 ?= "1.3.1" -PREFERRED_VERSION_netatalk ?= "2.0.3" -PREFERRED_VERSION_netbase ?= "4.21" -PREFERRED_VERSION_netcat ?= "0.7.1" -PREFERRED_VERSION_netpbm ?= "10.28" -PREFERRED_VERSION_netperf ?= "2.4.2" -PREFERRED_VERSION_net-snmp ?= "5.4.1" -PREFERRED_VERSION_net-tools ?= "1.60" -PREFERRED_VERSION_network-manager-applet ?= "0.6.5" -PREFERRED_VERSION_network-suspend-scripts ?= "1.1" -PREFERRED_VERSION_nfs-utils ?= "1.1.2" -PREFERRED_VERSION_ngrep ?= "1.42" -PREFERRED_VERSION_nis-all ?= "1.0" -PREFERRED_VERSION_nkf ?= "2.07" -PREFERRED_VERSION_nkf-native ?= "2.07" -PREFERRED_VERSION_nmap ?= "4.20" -PREFERRED_VERSION_nmixer ?= "2.0" -PREFERRED_VERSION_nmm ?= "0.0.2" -PREFERRED_VERSION_nogravity ?= "2.0" -PREFERRED_VERSION_notecase ?= "1.2.6" -PREFERRED_VERSION_notez ?= "1.1.0" -PREFERRED_VERSION_notification-daemon ?= "0.3.7" -PREFERRED_VERSION_nsd ?= "2.0.0" -PREFERRED_VERSION_ntfs-3g ?= "1.0" -PREFERRED_VERSION_ntop ?= "3.0" -PREFERRED_VERSION_ntp ?= "4.2.2p3" -PREFERRED_VERSION_ntpclient ?= "2003_194" -PREFERRED_VERSION_ntp-ssl ?= "4.1.2" -PREFERRED_VERSION_nunome ?= "1.0.2" -PREFERRED_VERSION_nylon-feed ?= "1.0" -PREFERRED_VERSION_obby ?= "0.4.1" -PREFERRED_VERSION_obexftp ?= "0.20" -PREFERRED_VERSION_obexpush ?= "1.0.0" -PREFERRED_VERSION_obexpush-native ?= "1.0.0" -PREFERRED_VERSION_octave ?= "2.1.73" -PREFERRED_VERSION_offlineimap ?= "4.0.14" -PREFERRED_VERSION_olsrd ?= "0.5.3" -PREFERRED_VERSION_omext ?= "0.2" -PREFERRED_VERSION_omniorb ?= "4.0.7" -PREFERRED_VERSION_omniorb-native ?= "4.0.7" -PREFERRED_VERSION_openal ?= "0.0.8" -PREFERRED_VERSION_openh323 ?= "1.13.5.4" -PREFERRED_VERSION_openjade ?= "1.3.2" -PREFERRED_VERSION_openjade-native ?= "1.3.2" -PREFERRED_VERSION_openntpd ?= "3.9p1" -PREFERRED_VERSION_openobex ?= "1.3" -PREFERRED_VERSION_openpbx.org ?= "1.2_rc3" -PREFERRED_VERSION_openpbx.org-perl ?= "1.0" -PREFERRED_VERSION_openprotium-init ?= "0.10" -PREFERRED_VERSION_openprotium-packages ?= "1.0" -PREFERRED_VERSION_opensp ?= "1.5" -PREFERRED_VERSION_opensp-native ?= "1.5" -PREFERRED_VERSION_openssh ?= "4.6p1" -PREFERRED_VERSION_openssl ?= "0.9.8j" -PREFERRED_VERSION_openssl-native ?= "0.9.8j" -PREFERRED_VERSION_openswan ?= "2.4.7" -PREFERRED_VERSION_openttd ?= "0.6.3" -PREFERRED_VERSION_openvpn ?= "2.0.9" -PREFERRED_VERSION_oplinux-packages ?= "1.0" -PREFERRED_VERSION_oprofile ?= "0.9.4" -PREFERRED_VERSION_orage ?= "4.4.1" -PREFERRED_VERSION_orbit2 ?= "2.14.12" -PREFERRED_VERSION_orbit2-native ?= "2.14.12" -PREFERRED_VERSION_orinoco-conf ?= "1.0" -PREFERRED_VERSION_orinoco-modules ?= "0.15rc2" -PREFERRED_VERSION_orpheus ?= "1.5" -PREFERRED_VERSION_ortp ?= "0.7.1" -PREFERRED_VERSION_osso-af-settings ?= "0.8.5" -PREFERRED_VERSION_osso-af-startup ?= "0.28-1" -PREFERRED_VERSION_osso-af-utils ?= "0.4" -PREFERRED_VERSION_osso-app-killer ?= "0.4-3" -PREFERRED_VERSION_osso-application-installer ?= "1.0.03-1" -PREFERRED_VERSION_osso-bttools ?= "0.25.1" -PREFERRED_VERSION_osso-core-config ?= "200515.1" -PREFERRED_VERSION_osso-dsp-headers ?= "0.1" -PREFERRED_VERSION_osso-esd ?= "0.5" -PREFERRED_VERSION_osso-gwconnect ?= "1.0.8" -PREFERRED_VERSION_osso-gwobex ?= "0.26.1" -PREFERRED_VERSION_osso-ic-oss ?= "1.0.4" -PREFERRED_VERSION_osso-screenshot-tool ?= "1.20-1" -PREFERRED_VERSION_osso-sounds ?= "0.3-1" -PREFERRED_VERSION_osso-thumbnail ?= "0.7" -PREFERRED_VERSION_otpkeygen ?= "1.3.0" -PREFERRED_VERSION_outo ?= "0.1.1" -PREFERRED_VERSION_p3scan ?= "2.9.05d" -PREFERRED_VERSION_p4 ?= "05.2" -PREFERRED_VERSION_package-index ?= "1.0" -PREFERRED_VERSION_pad-native ?= "1.0" -PREFERRED_VERSION_pairs ?= "1.1.1" -PREFERRED_VERSION_pango ?= "1.18.3" -PREFERRED_VERSION_panoramixext ?= "1.1" -PREFERRED_VERSION_parted ?= "1.8.7" -PREFERRED_VERSION_patch ?= "2.5.9" -PREFERRED_VERSION_patcher ?= "20040913" -PREFERRED_VERSION_patcher-native ?= "20040913" -PREFERRED_VERSION_patchutils ?= "0.2.31" -PREFERRED_VERSION_pax-utils ?= "0.1.13" -PREFERRED_VERSION_pax-utils-native ?= "0.1.13" -PREFERRED_VERSION_pbltool-native ?= "0.2" -PREFERRED_VERSION_pciutils ?= "2.2.4" -PREFERRED_VERSION_pcmanfm ?= "0.5" -PREFERRED_VERSION_pcmcia-cs ?= "3.2.8" -PREFERRED_VERSION_pcmciautils ?= "014" -PREFERRED_VERSION_pdamaze ?= "1.0.0" -PREFERRED_VERSION_pdm ?= "1.0" -PREFERRED_VERSION_perl ?= "5.8.8" -PREFERRED_VERSION_perl-native ?= "5.8.8" -PREFERRED_VERSION_petitepainture ?= "1.5" -PREFERRED_VERSION_phalanx ?= "22" -PREFERRED_VERSION_phoneserver ?= "1.0" -PREFERRED_VERSION_php ?= "5.2.0" -PREFERRED_VERSION_php-native ?= "5.2.0" -PREFERRED_VERSION_picocom ?= "1.4" -PREFERRED_VERSION_pidgin ?= "2.6.5" -PREFERRED_VERSION_pine ?= "4.64" -PREFERRED_VERSION_pipeman ?= "1.0.0" -PREFERRED_VERSION_pipepanic ?= "0.1.1" -PREFERRED_VERSION_pivotinit ?= "1.0.0" -PREFERRED_VERSION_pixman ?= "0.11.4" -PREFERRED_VERSION_pixops-test ?= "1.0" -PREFERRED_VERSION_pkgconfig ?= "0.23" -PREFERRED_VERSION_pkgconfig-native ?= "0.23" -PREFERRED_VERSION_plinciv ?= "0.16" -PREFERRED_VERSION_plone ?= "2.1.2" -PREFERRED_VERSION_plot ?= "0.28" -PREFERRED_VERSION_pme ?= "1.0.3" -PREFERRED_VERSION_pmount ?= "0.9.4" -PREFERRED_VERSION_pmtools ?= "20050926" -PREFERRED_VERSION_poboxserver ?= "1.2.5" -PREFERRED_VERSION_pocketcellar ?= "1.1" -PREFERRED_VERSION_pocketsphinx ?= "0.2.1" -PREFERRED_VERSION_poppler ?= "0.8.4" -PREFERRED_VERSION_poppler-data ?= "0.1" -PREFERRED_VERSION_popt ?= "1.7" -PREFERRED_VERSION_popt-native ?= "1.7" -PREFERRED_VERSION_poptop ?= "1.3.4" -PREFERRED_VERSION_poqetpresenter ?= "0.0.6" -PREFERRED_VERSION_portabase ?= "1.9" -PREFERRED_VERSION_portmap ?= "6.0" -PREFERRED_VERSION_postfix ?= "2.0.20" -PREFERRED_VERSION_postfix-native ?= "2.0.20" -PREFERRED_VERSION_postgresql ?= "8.1.8" -PREFERRED_VERSION_povray ?= "3.6.1" -PREFERRED_VERSION_powermanga ?= "0.79" -PREFERRED_VERSION_powernowd ?= "0.96" -PREFERRED_VERSION_powertop ?= "1.8" -PREFERRED_VERSION_ppp ?= "2.4.3" -PREFERRED_VERSION_ppp-dsl ?= "0.1-monolithic" -PREFERRED_VERSION_pptp-linux ?= "1.7.1" -PREFERRED_VERSION_prboom ?= "2.2.6" -PREFERRED_VERSION_prboom-devconfig ?= "1.0" -PREFERRED_VERSION_prelink ?= "20060712" -PREFERRED_VERSION_printproto ?= "1.0.3" -PREFERRED_VERSION_prism2-firmware-update ?= "1.7.4" -PREFERRED_VERSION_prism54-firmware ?= "1.0.4.3" -PREFERRED_VERSION_prism54-module ?= "1.2" -PREFERRED_VERSION_prism-firmware ?= "1.0" -PREFERRED_VERSION_prismstumbler ?= "0.7.3" -PREFERRED_VERSION_privoxy ?= "3.0.3" -PREFERRED_VERSION_procps ?= "3.2.7" -PREFERRED_VERSION_proj-4 ?= "4.9" -PREFERRED_VERSION_proj-4-native ?= "4.9" -PREFERRED_VERSION_psmisc ?= "22.2" -PREFERRED_VERSION_psplash-zap ?= "1.0" -PREFERRED_VERSION_pth ?= "2.0.2" -PREFERRED_VERSION_pulseaudio ?= "0.9.10" -PREFERRED_VERSION_puppy ?= "1.11" -PREFERRED_VERSION_puzz-le ?= "2.0.0" -PREFERRED_VERSION_puzzles ?= "r7436" -PREFERRED_VERSION_pvrusb2-mci ?= "20060903" -PREFERRED_VERSION_pwdutils ?= "2.6" -PREFERRED_VERSION_pwlib ?= "1.5.2" -PREFERRED_VERSION_pwmpi ?= "2.2.7" -PREFERRED_VERSION_pxaregs ?= "1.14" -PREFERRED_VERSION_python24 ?= "2.4.4" -PREFERRED_VERSION_python24-native ?= "2.4.0" -PREFERRED_VERSION_python24-pyqt2 ?= "3.13" -PREFERRED_VERSION_python24-pyqwt2 ?= "3.10" -PREFERRED_VERSION_python24-sip ?= "4.1.1" -PREFERRED_VERSION_python ?= "2.6.1" -PREFERRED_VERSION_python-ao ?= "0.82" -PREFERRED_VERSION_python-constraint ?= "1.1" -PREFERRED_VERSION_python-dbus ?= "0.83.0" -PREFERRED_VERSION_python-fam ?= "1.1.1" -PREFERRED_VERSION_python-fnorb ?= "1.3" -PREFERRED_VERSION_python-fpconst ?= "0.6.0" -PREFERRED_VERSION_python-gammu ?= "0.24" -PREFERRED_VERSION_python-gmpy ?= "1.0.1" -PREFERRED_VERSION_python-gnosis ?= "1.2.2" -PREFERRED_VERSION_python-gst ?= "0.10.10" -PREFERRED_VERSION_python-hmm ?= "0.4" -PREFERRED_VERSION_python-imaging ?= "1.1.6" -PREFERRED_VERSION_python-imdbpy ?= "3.1" -PREFERRED_VERSION_python-inotify ?= "0.1.0" -PREFERRED_VERSION_python-irclib ?= "0.4.6" -PREFERRED_VERSION_python-itools ?= "0.16.5" -PREFERRED_VERSION_python-libgmail ?= "0.1.6" -PREFERRED_VERSION_python-logilab-common ?= "0.9.3" -PREFERRED_VERSION_python-lxml ?= "1.3.3" -PREFERRED_VERSION_python-mad ?= "0.6" -PREFERRED_VERSION_python-mysqldb ?= "1.2.1" -PREFERRED_VERSION_python-native ?= "2.6.1" -PREFERRED_VERSION_python-numarray ?= "1.1.1" -PREFERRED_VERSION_python-numeric ?= "23.7" -PREFERRED_VERSION_python-ogg ?= "1.3" -PREFERRED_VERSION_python-pexpect ?= "2.1" -PREFERRED_VERSION_python-pybluez ?= "0.13" -PREFERRED_VERSION_python-pycairo ?= "1.4.0" -PREFERRED_VERSION_python-pychecker ?= "0.8.17" -PREFERRED_VERSION_python-pycodes ?= "1.2" -PREFERRED_VERSION_python-pycrypto ?= "2.0.1" -PREFERRED_VERSION_python-pycurl ?= "7.18.2" -PREFERRED_VERSION_python-pyephem ?= "3.7.2a" -PREFERRED_VERSION_python-pyfits ?= "1.1" -PREFERRED_VERSION_python-pyflakes ?= "0.2.1" -PREFERRED_VERSION_python-pygame ?= "1.8.1" -PREFERRED_VERSION_python-pygnome ?= "2.16.2" -PREFERRED_VERSION_python-pygobject ?= "2.16.0" -PREFERRED_VERSION_python-pygobject-native ?= "2.16.0" -PREFERRED_VERSION_python-pygoogle ?= "0.6" -PREFERRED_VERSION_python-pygtk-1.2 ?= "0.6.12" -PREFERRED_VERSION_python-pygtk ?= "2.10.4" -PREFERRED_VERSION_python-pyid3lib ?= "0.5.1" -PREFERRED_VERSION_python-pyiw ?= "0.3.3" -PREFERRED_VERSION_python-pylinda ?= "0.6" -PREFERRED_VERSION_python-pylint ?= "0.13.2" -PREFERRED_VERSION_python-pymetar ?= "0.11" -PREFERRED_VERSION_python-pymp3 ?= "0.3.4" -PREFERRED_VERSION_python-pyrad ?= "0.8" -PREFERRED_VERSION_python-pyraf ?= "1.4" -PREFERRED_VERSION_python-pyreverse ?= "0.5.2" -PREFERRED_VERSION_python-pyrex ?= "0.9.8.4" -PREFERRED_VERSION_python-pyrex-native ?= "0.9.8.5" -PREFERRED_VERSION_python-pyro ?= "3.7" -PREFERRED_VERSION_python-pyserial ?= "2.4" -PREFERRED_VERSION_python-pytester ?= "0.6.0" -PREFERRED_VERSION_python-pythondaap ?= "0.4" -PREFERRED_VERSION_python-pyvisa ?= "1.1" -PREFERRED_VERSION_python-pyweather ?= "0.7.0" -PREFERRED_VERSION_python-pywpa ?= "0.3.4" -PREFERRED_VERSION_python-pyxml ?= "0.8.4" -PREFERRED_VERSION_python-pyxmlrpc ?= "0.8.8.3" -PREFERRED_VERSION_python-pyzeroconf ?= "0.12" -PREFERRED_VERSION_python-scapy ?= "1.1.1" -PREFERRED_VERSION_python-scons ?= "0.97" -PREFERRED_VERSION_python-scons-native ?= "0.97" -PREFERRED_VERSION_python-setuptools ?= "0.6c8" -PREFERRED_VERSION_python-setuptools-native ?= "0.6c9" -PREFERRED_VERSION_python-sgmlop ?= "1.1" -PREFERRED_VERSION_python-simplejson ?= "1.7.1" -PREFERRED_VERSION_python-snmplib ?= "0.1.1" -PREFERRED_VERSION_python-soappy ?= "0.11.6" -PREFERRED_VERSION_python-spydi ?= "0.9.7" -PREFERRED_VERSION_python-spyro ?= "0.9.22" -PREFERRED_VERSION_python-sqlobject ?= "0.9.1" -PREFERRED_VERSION_python-sword ?= "1.5.9" -PREFERRED_VERSION_python-urwid ?= "0.9.8.1" -PREFERRED_VERSION_python-vmaps ?= "1.1" -PREFERRED_VERSION_python-vorbis ?= "1.3" -PREFERRED_VERSION_python-webpy ?= "0.21" -PREFERRED_VERSION_qclockchange ?= "0.1a" -PREFERRED_VERSION_qcoptest ?= "0.1.1" -PREFERRED_VERSION_qc-usb-messenger ?= "1.1" -PREFERRED_VERSION_qfish2 ?= "1.1.0" -PREFERRED_VERSION_qgis ?= "0.8.1" -PREFERRED_VERSION_qiv ?= "1.9" -PREFERRED_VERSION_qjackctl ?= "0.3.1a" -PREFERRED_VERSION_qmake2-native ?= "2.10a" -PREFERRED_VERSION_qmake-native ?= "1.07a" -PREFERRED_VERSION_qmatrix ?= "1.1.0" -PREFERRED_VERSION_qof ?= "0.7.2" -PREFERRED_VERSION_qolyester ?= "20050728" -PREFERRED_VERSION_qpdf2 ?= "2.2.1" -PREFERRED_VERSION_qpealarmclock ?= "1.0.9" -PREFERRED_VERSION_qpealarmclockapplet ?= "1.0.9" -PREFERRED_VERSION_qpe-gaim ?= "20041030" -PREFERRED_VERSION_qpegps ?= "0.9.3.1" -PREFERRED_VERSION_qpe-inputhelper-applet ?= "1.0.0" -PREFERRED_VERSION_qpe-libgaim ?= "1.5.0" -PREFERRED_VERSION_qpenmapfe ?= "1.0.0" -PREFERRED_VERSION_qpf-arabic ?= "1.0" -PREFERRED_VERSION_qpf-bitstream-vera ?= "1.10" -PREFERRED_VERSION_qpf-bitstream-vera-sans-mono ?= "1.10" -PREFERRED_VERSION_qpf-font-common ?= "1.0" -PREFERRED_VERSION_qpf-freemono ?= "1.0" -PREFERRED_VERSION_qpf-freeserif ?= "1.0" -PREFERRED_VERSION_qpf-helvetica ?= "1.0" -PREFERRED_VERSION_qpf-hunkysans ?= "0.3.0" -PREFERRED_VERSION_qpf-hunkyserif ?= "0.3.0" -PREFERRED_VERSION_qpf-qte ?= "2.3.10" -PREFERRED_VERSION_qpf-unifont ?= "1.0" -PREFERRED_VERSION_qpf-unismall ?= "1.0.0" -PREFERRED_VERSION_qpf-utopia ?= "1.0" -PREFERRED_VERSION_qplot ?= "2.0.1-cvs-20020420" -PREFERRED_VERSION_qpobox ?= "0.5.4" -PREFERRED_VERSION_qpphoto ?= "1.0.2" -PREFERRED_VERSION_qscintilla ?= "1.65-gpl-1.6" -PREFERRED_VERSION_qsvn ?= "0.3.0" -PREFERRED_VERSION_qt4-x11-free ?= "4.4.1" -PREFERRED_VERSION_qtplot ?= "0.2" -PREFERRED_VERSION_qt-x11-free ?= "3.3.7" -PREFERRED_VERSION_qt-x11-free-native ?= "3.3.5" -PREFERRED_VERSION_quagga ?= "0.99.8" -PREFERRED_VERSION_quake1 ?= "0.0.1" -PREFERRED_VERSION_quetoo ?= "0.6.1" -PREFERRED_VERSION_quilt ?= "0.45" -PREFERRED_VERSION_quilt-native ?= "0.45" -PREFERRED_VERSION_qwt ?= "4.2.0rc1" -PREFERRED_VERSION_qxmp ?= "1.0" -PREFERRED_VERSION_radlib ?= "2.6.2" -PREFERRED_VERSION_radlib-mysql ?= "2.6.2" -PREFERRED_VERSION_radvd ?= "1.0" -PREFERRED_VERSION_rage ?= "0.2.0.003" -PREFERRED_VERSION_randrext ?= "1.0" -PREFERRED_VERSION_randrproto ?= "1.2.1" -PREFERRED_VERSION_rdesktop ?= "1.5.0" -PREFERRED_VERSION_rdiff-backup ?= "1.1.5" -PREFERRED_VERSION_readline ?= "4.3" -PREFERRED_VERSION_readline-native ?= "4.3" -PREFERRED_VERSION_reaim ?= "7.0.1.13" -PREFERRED_VERSION_recode ?= "3.6" -PREFERRED_VERSION_recode-native ?= "3.6" -PREFERRED_VERSION_recordproto ?= "1.13.2" -PREFERRED_VERSION_redfang ?= "2.5" -PREFERRED_VERSION_refdbg ?= "1.2" -PREFERRED_VERSION_regex-markup ?= "0.10.0" -PREFERRED_VERSION_reiser4progs ?= "1.0.4" -PREFERRED_VERSION_reiserfsprogs ?= "3.6.19" -PREFERRED_VERSION_renderproto ?= "0.9.3" -PREFERRED_VERSION_resistorui ?= "0.9" -PREFERRED_VERSION_resolvconf ?= "1.43" -PREFERRED_VERSION_resourceext ?= "1.0" -PREFERRED_VERSION_resourceproto ?= "1.0.2" -PREFERRED_VERSION_rfakeap ?= "0.2" -PREFERRED_VERSION_rglueap ?= "0.1" -PREFERRED_VERSION_rhythmbox ?= "0.8.7" -PREFERRED_VERSION_rlpr ?= "2.05" -PREFERRED_VERSION_r-native ?= "2.0.0" -PREFERRED_VERSION_roadmap-gtk2 ?= "1.1.0" -PREFERRED_VERSION_rott ?= "1.0" -PREFERRED_VERSION_rox-filer ?= "2.5" -PREFERRED_VERSION_rpm ?= "4.4" -PREFERRED_VERSION_rp-pppoe ?= "3.8" -PREFERRED_VERSION_rrdtool ?= "1.0.49" -PREFERRED_VERSION_rsync ?= "2.6.9" -PREFERRED_VERSION_rt2570 ?= "1.1.0-b2" -PREFERRED_VERSION_rt2570-k2wrlz ?= "1.6.1" -PREFERRED_VERSION_rt73-k2wrlz ?= "2.0.1" -PREFERRED_VERSION_rtaudio-tests ?= "3.0.1" -PREFERRED_VERSION_ruby ?= "1.8.5" -PREFERRED_VERSION_ruby-native ?= "1.8.5" -PREFERRED_VERSION_rxvt ?= "2.8.0" -PREFERRED_VERSION_rxvt-unicode ?= "7.9" -PREFERRED_VERSION_sablevm ?= "1.12" -PREFERRED_VERSION_sablevm-classpath ?= "1.12" -PREFERRED_VERSION_salsa-lib ?= "0.0.1" -PREFERRED_VERSION_samba ?= "3.0.23c" -PREFERRED_VERSION_samba-essential ?= "3.0.20" -PREFERRED_VERSION_sane-backends ?= "1.0.17" -PREFERRED_VERSION_sane-frontends ?= "1.0.13" -PREFERRED_VERSION_sato-icon-theme ?= "0.1" -PREFERRED_VERSION_sbagen ?= "1.4.1" -PREFERRED_VERSION_sbrsh ?= "7.1" -PREFERRED_VERSION_scap ?= "0.1" -PREFERRED_VERSION_sccd ?= "1.0" -PREFERRED_VERSION_scew ?= "0.3.1" -PREFERRED_VERSION_schedstat-utils ?= "1.0" -PREFERRED_VERSION_schroedinger ?= "1.0.5" -PREFERRED_VERSION_screen ?= "4.0.2" -PREFERRED_VERSION_scrnsaverproto ?= "1.1.0" -PREFERRED_VERSION_scsi-idle ?= "2.4.23" -PREFERRED_VERSION_sctzap ?= "0.0cvs20060814" -PREFERRED_VERSION_scummvm ?= "0.10.0" -PREFERRED_VERSION_scummvm-qpe ?= "0.6.1b" -PREFERRED_VERSION_scw ?= "0.4.3" -PREFERRED_VERSION_sdcc ?= "2.5.0" -PREFERRED_VERSION_sdcc-native ?= "2.5.0" -PREFERRED_VERSION_sdk-default-icons ?= "0.2-1" -PREFERRED_VERSION_sdk-default-theme ?= "0.1-1" -PREFERRED_VERSION_sdk-default-theme-config ?= "1.0-1" -PREFERRED_VERSION_sdl-perl ?= "1.20.3" -PREFERRED_VERSION_sed ?= "4.1.2" -PREFERRED_VERSION_sed-native ?= "4.1.2" -PREFERRED_VERSION_ser ?= "0.9.0" -PREFERRED_VERSION_serload-native ?= "1.0" -PREFERRED_VERSION_sessreg ?= "1.0.3" -PREFERRED_VERSION_setmixer ?= "27DEC94" -PREFERRED_VERSION_setserial ?= "2.17" -PREFERRED_VERSION_setxkbmap ?= "1.0.4" -PREFERRED_VERSION_sgml-common ?= "0.6.3" -PREFERRED_VERSION_sgml-common-native ?= "0.6.3" -PREFERRED_VERSION_shared-mime-info ?= "0.51" -PREFERRED_VERSION_sharp-compat-libs ?= "0.5" -PREFERRED_VERSION_sharprom-toolchain-native ?= "1.0" -PREFERRED_VERSION_shasum-native ?= "1.0" -PREFERRED_VERSION_shfs-modules ?= "0.35" -PREFERRED_VERSION_shfs-utils ?= "0.35" -PREFERRED_VERSION_shisensho ?= "1.0.0" -PREFERRED_VERSION_shopper ?= "1.2.1" -PREFERRED_VERSION_shorewall ?= "2.0.9-monolithic" -PREFERRED_VERSION_sidplay-base ?= "1.0.9" -PREFERRED_VERSION_sidplayer ?= "1.5.0" -PREFERRED_VERSION_silo ?= "1.4.8" -PREFERRED_VERSION_simh ?= "3.7-1" -PREFERRED_VERSION_simpad-utilities ?= "1.0" -PREFERRED_VERSION_sip3-native ?= "4.0.1" -PREFERRED_VERSION_sipsak ?= "0.9.6" -PREFERRED_VERSION_skippy-xd ?= "0.5.0" -PREFERRED_VERSION_sl ?= "3.03" -PREFERRED_VERSION_slang ?= "1.4.9" -PREFERRED_VERSION_slcalc ?= "1.2.1" -PREFERRED_VERSION_sliderulez ?= "0.92" -PREFERRED_VERSION_slotsig ?= "0.6" -PREFERRED_VERSION_slrn ?= "0.9.8.0" -PREFERRED_VERSION_slsnif ?= "0.4.4" -PREFERRED_VERSION_slugimage-native ?= "1.0" -PREFERRED_VERSION_slugos-init ?= "0.10" -PREFERRED_VERSION_slugos-native ?= "1.0" -PREFERRED_VERSION_slugos-native-packages ?= "1.0" -PREFERRED_VERSION_slugtool ?= "1.0" -PREFERRED_VERSION_slugtool-native ?= "1.0" -PREFERRED_VERSION_slutils ?= "0.1.0" -PREFERRED_VERSION_smartmontools ?= "5.37" -PREFERRED_VERSION_sms ?= "1.1" -PREFERRED_VERSION_sn9c102 ?= "1.32" -PREFERRED_VERSION_snes232 ?= "cvs" -PREFERRED_VERSION_snes9x ?= "1.43-WIP1" -PREFERRED_VERSION_snes9x-sdl ?= "1.39" -PREFERRED_VERSION_snes9x-sdl-qpe ?= "1.39" -PREFERRED_VERSION_socat ?= "1.3.2.1" -PREFERRED_VERSION_sofia-sip ?= "1.11.7" -PREFERRED_VERSION_softfan ?= "0.10" -PREFERRED_VERSION_sokoban ?= "1.3.8ern" -PREFERRED_VERSION_soundserver ?= "1.0" -PREFERRED_VERSION_soundtracker ?= "0.6.8" -PREFERRED_VERSION_soundtracker-gtk2 ?= "0.6.7" -PREFERRED_VERSION_sox ?= "13.0.0" -PREFERRED_VERSION_sox-native ?= "13.0.0" -PREFERRED_VERSION_spandsp ?= "0.0.3" -PREFERRED_VERSION_spca5xx ?= "20060501" -PREFERRED_VERSION_spectrum-fw ?= "1.0" -PREFERRED_VERSION_speex ?= "1.1+1.2rc1" -PREFERRED_VERSION_sphinxbase ?= "0.1" -PREFERRED_VERSION_squashfs-lzma-tools ?= "3.1r2" -PREFERRED_VERSION_squashfs-lzma-tools-native ?= "3.1r2" -PREFERRED_VERSION_squashfs-tools ?= "3.1r2" -PREFERRED_VERSION_squashfs-tools-native ?= "3.1r2" -PREFERRED_VERSION_squeak-nox ?= "3.4-2" -PREFERRED_VERSION_squid ?= "2.6.STABLE14" -PREFERRED_VERSION_sshfs-fuse ?= "1.8" -PREFERRED_VERSION_ssmtp ?= "2.61" -PREFERRED_VERSION_stagemanager-native ?= "0.0.1" -PREFERRED_VERSION_startup-monitor ?= "0.18-2" -PREFERRED_VERSION_startup-notification ?= "0.8" -PREFERRED_VERSION_stat ?= "3.3" -PREFERRED_VERSION_stat-native ?= "3.3" -PREFERRED_VERSION_strace ?= "4.5.15" -PREFERRED_VERSION_streamripper ?= "1.61.10" -PREFERRED_VERSION_stress ?= "0.18.8" -PREFERRED_VERSION_stunnel ?= "4.09" -PREFERRED_VERSION_subapplet ?= "1.0.8" -PREFERRED_VERSION_subversion ?= "1.4.3" -PREFERRED_VERSION_sudo ?= "1.6.8p12" -PREFERRED_VERSION_supertux ?= "0.1.2" -PREFERRED_VERSION_supybot ?= "0.77.0" -PREFERRED_VERSION_suspend-desktop ?= "1.0" -PREFERRED_VERSION_swfdec ?= "0.5.1" -PREFERRED_VERSION_swig ?= "1.3.31" -PREFERRED_VERSION_swig-native ?= "1.3.31" -PREFERRED_VERSION_sword ?= "1.5.9" -PREFERRED_VERSION_sylpheed ?= "2.2.9" -PREFERRED_VERSION_synaesthesia ?= "2.4" -PREFERRED_VERSION_syncml-client ?= "0.1" -PREFERRED_VERSION_synergy ?= "1.3.1" -PREFERRED_VERSION_sysfsutils ?= "2.0.0" -PREFERRED_VERSION_sysklogd ?= "1.4.1" -PREFERRED_VERSION_syslinux-native ?= "3.63" -PREFERRED_VERSION_syslog-ng ?= "1.6.11" -PREFERRED_VERSION_sysvinit ?= "2.86" -PREFERRED_VERSION_t1lib ?= "5.0.2" -PREFERRED_VERSION_taglib ?= "1.4" -PREFERRED_VERSION_taglibc ?= "1.4" -PREFERRED_VERSION_tango-icon-theme ?= "0.7.2" -PREFERRED_VERSION_tango-icon-theme-extras ?= "0.1.0" -PREFERRED_VERSION_tapioca ?= "0.3.9" -PREFERRED_VERSION_tapiocaui ?= "0.3.9.1" -PREFERRED_VERSION_tapioca-xmpp ?= "0.3.9" -PREFERRED_VERSION_tar ?= "1.18" -PREFERRED_VERSION_tasklistapplet ?= "1.0.5" -PREFERRED_VERSION_tasks ?= "0.10" -PREFERRED_VERSION_tcpdump ?= "3.9.7" -PREFERRED_VERSION_tcpick ?= "0.1.22" -PREFERRED_VERSION_tcptraceroute ?= "1.5beta6" -PREFERRED_VERSION_tcptrack ?= "1.1.2" -PREFERRED_VERSION_tcp-wrappers ?= "7.6" -PREFERRED_VERSION_tda1004x-firmware ?= "1.0" -PREFERRED_VERSION_telepathy-gabble ?= "0.5.10" -PREFERRED_VERSION_telepathy-glib ?= "0.5.10" -PREFERRED_VERSION_telepathy-mission-control ?= "4.22" -PREFERRED_VERSION_teleport ?= "0.34" -PREFERRED_VERSION_temtor ?= "0.0.1" -PREFERRED_VERSION_termcap ?= "11.0.1" -PREFERRED_VERSION_terminus ?= "1.0" -PREFERRED_VERSION_tesseract ?= "1.0" -PREFERRED_VERSION_tetex ?= "3.0" -PREFERRED_VERSION_tetex-native ?= "3.0" -PREFERRED_VERSION_tetex-texmf ?= "3.0" -PREFERRED_VERSION_texinfo ?= "4.8a" -PREFERRED_VERSION_texlive ?= "2007" -PREFERRED_VERSION_texmaker ?= "1.3" -PREFERRED_VERSION_thcrut ?= "1.2.5" -PREFERRED_VERSION_thttpd ?= "2.25b" -PREFERRED_VERSION_thumbpad ?= "0.8" -PREFERRED_VERSION_thunar ?= "0.8.0" -PREFERRED_VERSION_thunderbird ?= "1.0.7" -PREFERRED_VERSION_tickypip ?= "0.1.2" -PREFERRED_VERSION_tickypip-levels ?= "1.1" -PREFERRED_VERSION_tightvnc ?= "1.3dev7" -PREFERRED_VERSION_tiinit ?= "3.2.26" -PREFERRED_VERSION_time ?= "1.7" -PREFERRED_VERSION_timesleuth ?= "1.05ern" -PREFERRED_VERSION_timezones ?= "1.2.0" -PREFERRED_VERSION_tin ?= "1.9.1" -PREFERRED_VERSION_tinc ?= "1.0.2" -PREFERRED_VERSION_tinylogin ?= "1.4" -PREFERRED_VERSION_tinyscheme ?= "1.35" -PREFERRED_VERSION_tmake ?= "1.11" -PREFERRED_VERSION_tmdns ?= "20030116" -PREFERRED_VERSION_tn5250 ?= "0.16.5" -PREFERRED_VERSION_tomoe ?= "0.2.1" -PREFERRED_VERSION_tor ?= "0.1.1.26" -PREFERRED_VERSION_totem ?= "1.0.4" -PREFERRED_VERSION_tracker ?= "0.5.4" -PREFERRED_VERSION_transconnect ?= "1.3-beta" -PREFERRED_VERSION_trapproto ?= "3.4.3" -PREFERRED_VERSION_tree ?= "1.5.1" -PREFERRED_VERSION_treecc ?= "0.3.6" -PREFERRED_VERSION_treecc-native ?= "0.3.6" -PREFERRED_VERSION_tremor ?= "20041119" -PREFERRED_VERSION_tron ?= "1.0.0" -PREFERRED_VERSION_tscalib ?= "0.0.1-3" -PREFERRED_VERSION_tsclient ?= "0.140" -PREFERRED_VERSION_tslib ?= "1.0" -PREFERRED_VERSION_ttf-bitstream-vera ?= "1.10" -PREFERRED_VERSION_ttf-dejavu ?= "2.23" -PREFERRED_VERSION_ttf-gentium ?= "1.02" -PREFERRED_VERSION_ttf-hunkyfonts ?= "0.3.0" -PREFERRED_VERSION_ttf-liberation ?= "0.2" -PREFERRED_VERSION_ttf-sazanami ?= "20040629" -PREFERRED_VERSION_ttyconv ?= "0.2.3" -PREFERRED_VERSION_ttyrec ?= "1.0.8" -PREFERRED_VERSION_tuxnes ?= "0.75" -PREFERRED_VERSION_twin ?= "0.4.6" -PREFERRED_VERSION_twisted ?= "2.5.0" -PREFERRED_VERSION_twm ?= "1.0.3" -PREFERRED_VERSION_twutils ?= "0.2" -PREFERRED_VERSION_txdrug ?= "0.1" -PREFERRED_VERSION_tximage ?= "0.2" -PREFERRED_VERSION_u2nl ?= "1.3" -PREFERRED_VERSION_uae4all ?= "0.7.1" -PREFERRED_VERSION_ubahnnav ?= "0.4.1" -PREFERRED_VERSION_u-boot ?= "1.2.0" -PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4" -PREFERRED_VERSION_u-boot-utils ?= "1.2.0" -PREFERRED_VERSION_udev ?= "118" -PREFERRED_VERSION_udev-hostap-cs-vcc-workaround ?= "1.0" -PREFERRED_VERSION_udhcp ?= "0.9.8" -PREFERRED_VERSION_ufraw ?= "0.12" -PREFERRED_VERSION_uicmoc3-native ?= "3.3.5" -PREFERRED_VERSION_uicmoc4-native ?= "4.3.3" -PREFERRED_VERSION_uicmoc-native ?= "2.3.10" -PREFERRED_VERSION_uim ?= "1.3.1" -PREFERRED_VERSION_uim-native ?= "1.3.1" -PREFERRED_VERSION_uim-tomoe-gtk ?= "0.2.0" -PREFERRED_VERSION_ulxmlrpcpp ?= "1.5.2" -PREFERRED_VERSION_uml-utilities ?= "20040406" -PREFERRED_VERSION_unfreeze ?= "1.0" -PREFERRED_VERSION_unionfs-modules ?= "1.0.13" -PREFERRED_VERSION_unionfs-utils ?= "1.0.13" -PREFERRED_VERSION_unionroot ?= "0.1.1" -PREFERRED_VERSION_units ?= "1.80" -PREFERRED_VERSION_unixbench ?= "4.1.0" -PREFERRED_VERSION_unrar ?= "3.4.3" -PREFERRED_VERSION_unrar-native ?= "3.4.3" -PREFERRED_VERSION_unzip ?= "552" -PREFERRED_VERSION_unzip-native ?= "552" -PREFERRED_VERSION_update-alternatives-cworth ?= "0.99.154" -PREFERRED_VERSION_update-alternatives-cworth-native ?= "0.99.154" -PREFERRED_VERSION_update-alternatives-dpkg ?= "1.13.22" -PREFERRED_VERSION_update-alternatives-dpkg-native ?= "1.13.22" -PREFERRED_VERSION_update-modules ?= "1.0" -PREFERRED_VERSION_upstart ?= "0.3.8" -PREFERRED_VERSION_uqm ?= "0.5.0" -PREFERRED_VERSION_usb-gadget-mode ?= "0.0.2" -PREFERRED_VERSION_usbutils ?= "0.70" -PREFERRED_VERSION_usbview ?= "1.0" -PREFERRED_VERSION_ushare ?= "0.9.7" -PREFERRED_VERSION_usound ?= "0.2.0" -PREFERRED_VERSION_usrp ?= "0.12" -PREFERRED_VERSION_util-linux ?= "2.12r" -PREFERRED_VERSION_util-linux-native ?= "2.12r" -PREFERRED_VERSION_util-macros ?= "1.1.5" -PREFERRED_VERSION_util-macros-native ?= "1.1.5" -PREFERRED_VERSION_uucp ?= "1.07" -PREFERRED_VERSION_v4l2apps ?= "20020317" -PREFERRED_VERSION_vala ?= "0.5.7" -PREFERRED_VERSION_vala-native ?= "0.5.7" -PREFERRED_VERSION_vde ?= "2.0.2" -PREFERRED_VERSION_vectoroids ?= "1.1.0" -PREFERRED_VERSION_videoplayer ?= "0.1" -PREFERRED_VERSION_videoproto ?= "2.2.2" -PREFERRED_VERSION_vim ?= "7.0" -PREFERRED_VERSION_vim-tiny ?= "7.0" -PREFERRED_VERSION_vino ?= "2.16.0" -PREFERRED_VERSION_visiscript ?= "0.4.3" -PREFERRED_VERSION_visual-boot ?= "0.0.1" -PREFERRED_VERSION_vlan ?= "1.9" -PREFERRED_VERSION_vlc-gpe ?= "0.8.4" -PREFERRED_VERSION_vmedit ?= "0.02" -PREFERRED_VERSION_vnc ?= "3.3.7" -PREFERRED_VERSION_vochistory ?= "0.1" -PREFERRED_VERSION_voicecall ?= "0.1" -PREFERRED_VERSION_void11 ?= "0.2.0" -PREFERRED_VERSION_vorbis-tools ?= "1.0.1" -PREFERRED_VERSION_vpnc ?= "0.3.3" -PREFERRED_VERSION_vsftpd ?= "2.0.5" -PREFERRED_VERSION_vte ?= "0.16.14" -PREFERRED_VERSION_vtun ?= "2.6" -PREFERRED_VERSION_w3cam ?= "0.7.2" -PREFERRED_VERSION_wakelan ?= "1.1" -PREFERRED_VERSION_watchdog ?= "5.3.1" -PREFERRED_VERSION_wbxml2 ?= "0.9.0" -PREFERRED_VERSION_webcam-server ?= "0.50" -PREFERRED_VERSION_wget ?= "1.9.1" -PREFERRED_VERSION_whois ?= "4.5.25" -PREFERRED_VERSION_wifistix-modules ?= "5.0.16.p0" -PREFERRED_VERSION_wiggle ?= "0.6" -PREFERRED_VERSION_wiggle-native ?= "0.6" -PREFERRED_VERSION_win4 ?= "1.0.1" -PREFERRED_VERSION_windowswmproto ?= "1.0.3" -PREFERRED_VERSION_wireshark ?= "0.99.4" -PREFERRED_VERSION_wlan-ng-modules ?= "0.2.7" -PREFERRED_VERSION_wlan-ng-utils ?= "0.2.7" -PREFERRED_VERSION_wmctrl ?= "1.07" -PREFERRED_VERSION_wpa-gui ?= "0.4.8" -PREFERRED_VERSION_wpa-supplicant ?= "0.6.9" -PREFERRED_VERSION_wpa-supplicant-nossl ?= "0.2.6" -PREFERRED_VERSION_wpa-supplicant-ssl ?= "0.2.6" -PREFERRED_VERSION_wrt-imagetools-native ?= "1.0" -PREFERRED_VERSION_wrt-init ?= "1.0" -PREFERRED_VERSION_wrt-utils ?= "1.0" -PREFERRED_VERSION_wv ?= "1.2.0" -PREFERRED_VERSION_wview-sim ?= "3.1.3" -PREFERRED_VERSION_wview-sim-mysql ?= "3.1.3" -PREFERRED_VERSION_wview-vpro ?= "3.1.3" -PREFERRED_VERSION_wview-vpro-mysql ?= "3.1.3" -PREFERRED_VERSION_wview-wxt510 ?= "3.1.3" -PREFERRED_VERSION_wview-wxt510-mysql ?= "3.1.3" -PREFERRED_VERSION_wxwidgets ?= "2.8.7" -PREFERRED_VERSION_x11perf ?= "1.4.1" -PREFERRED_VERSION_x11vnc ?= "0.9.3" -PREFERRED_VERSION_xaos ?= "3.2.3" -PREFERRED_VERSION_xauth ?= "1.0.2" -PREFERRED_VERSION_xawtv ?= "3.93" -PREFERRED_VERSION_xbacklight ?= "1.1" -PREFERRED_VERSION_xbase-clients ?= "1.0" -PREFERRED_VERSION_xbitmaps ?= "1.0.1" -PREFERRED_VERSION_xcb-demo ?= "0.1" -PREFERRED_VERSION_xcb-proto ?= "1.0" -PREFERRED_VERSION_xcb-util ?= "0.2" -PREFERRED_VERSION_xchat ?= "2.8.4" -PREFERRED_VERSION_xcmiscproto ?= "1.1.2" -PREFERRED_VERSION_xcmiscproto-native ?= "1.1.2" -PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" -PREFERRED_VERSION_xdbedizzy ?= "1.0.2" -PREFERRED_VERSION_xdemineur ?= "2.1.1" -PREFERRED_VERSION_xdm ?= "1.1.6" -PREFERRED_VERSION_xdpyinfo ?= "1.0.2" -PREFERRED_VERSION_xerces-c ?= "2.7.0" -PREFERRED_VERSION_xev ?= "1.0.2" -PREFERRED_VERSION_xextproto ?= "7.0.2" -PREFERRED_VERSION_xextproto-native ?= "7.0.2" -PREFERRED_VERSION_xf86bigfontproto ?= "1.1.2" -PREFERRED_VERSION_xf86bigfontproto-native ?= "1.1.2" -PREFERRED_VERSION_xf86dga ?= "1.0.2" -PREFERRED_VERSION_xf86dgaproto ?= "2.0.3" -PREFERRED_VERSION_xf86driproto ?= "2.0.3" -PREFERRED_VERSION_xf86-input-evdev ?= "1.1.5" -PREFERRED_VERSION_xf86-input-keyboard ?= "1.2.2" -PREFERRED_VERSION_xf86-input-mouse ?= "1.2.2" -PREFERRED_VERSION_xf86-input-penmount ?= "1.2.0" -PREFERRED_VERSION_xf86miscproto ?= "0.9.2" -PREFERRED_VERSION_xf86rushproto ?= "1.1.2" -PREFERRED_VERSION_xf86-video-ati ?= "6.6.193" -PREFERRED_VERSION_xf86-video-fbdev ?= "0.3.1" -PREFERRED_VERSION_xf86-video-i128 ?= "1.1.0.6" -PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5" -PREFERRED_VERSION_xf86-video-newport ?= "0.2.1" -PREFERRED_VERSION_xf86-video-nsc ?= "2.8.2" -PREFERRED_VERSION_xf86-video-nv ?= "2.1.3" -PREFERRED_VERSION_xf86-video-s3 ?= "0.5.0" -PREFERRED_VERSION_xf86-video-savage ?= "2.1.3" -PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.5.1" -PREFERRED_VERSION_xf86-video-sis ?= "0.9.3" -PREFERRED_VERSION_xf86-video-tdfx ?= "1.3.0" -PREFERRED_VERSION_xf86-video-trident ?= "1.2.3" -PREFERRED_VERSION_xf86-video-tseng ?= "1.1.1" -PREFERRED_VERSION_xf86-video-vesa ?= "1.3.0" -PREFERRED_VERSION_xf86-video-via ?= "0.2.2" -PREFERRED_VERSION_xf86-video-vmware ?= "10.14.1" -PREFERRED_VERSION_xf86-video-voodoo ?= "1.1.1" -PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2" -PREFERRED_VERSION_xfcalendar ?= "4.2.3" -PREFERRED_VERSION_xfce4-appfinder ?= "4.4.1" -PREFERRED_VERSION_xfce4-dev-tools ?= "4.4.0" -PREFERRED_VERSION_xfce4-icon-theme ?= "4.4.1" -PREFERRED_VERSION_xfce4-mixer ?= "4.4.1" -PREFERRED_VERSION_xfce4-panel ?= "4.4.1" -PREFERRED_VERSION_xfce4-session ?= "4.4.1" -PREFERRED_VERSION_xfce-mcs-manager ?= "4.4.1" -PREFERRED_VERSION_xfce-mcs-plugins ?= "4.4.1" -PREFERRED_VERSION_xfce-terminal ?= "0.2.6" -PREFERRED_VERSION_xfdesktop ?= "4.4.1" -PREFERRED_VERSION_xffm ?= "4.3.99.2" -PREFERRED_VERSION_xfonts-xorg ?= "6.8" -PREFERRED_VERSION_xfprint ?= "4.4.1" -PREFERRED_VERSION_xfs ?= "1.0.4" -PREFERRED_VERSION_xfsprogs ?= "2.8.16" -PREFERRED_VERSION_xfwm4 ?= "4.4.1" -PREFERRED_VERSION_xfwm4-themes ?= "4.4.1" -PREFERRED_VERSION_xhost ?= "1.0.2" -PREFERRED_VERSION_xineramaproto ?= "1.1.2" -PREFERRED_VERSION_xinetd ?= "2.3.13" -PREFERRED_VERSION_xinit ?= "1.0.5" -PREFERRED_VERSION_xkbd ?= "0.8.15" -PREFERRED_VERSION_xmame ?= "0.100" -PREFERRED_VERSION_xmame-tiny ?= "0.100" -PREFERRED_VERSION_xmms ?= "1.2.10" -PREFERRED_VERSION_xmms-embedded ?= "20040327" -PREFERRED_VERSION_xmms-mad ?= "0.10" -PREFERRED_VERSION_xmms-tremor ?= "1.0" -PREFERRED_VERSION_xmodmap ?= "1.0.3" -PREFERRED_VERSION_xmonobut ?= "0.4.1" -PREFERRED_VERSION_xorg-cf-files ?= "1.0.2" -PREFERRED_VERSION_xorg-headers-native ?= "1.0" -PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2" -PREFERRED_VERSION_xoscope ?= "1.12" -PREFERRED_VERSION_xournal ?= "0.4.0.1" -PREFERRED_VERSION_xpext ?= "1.0-5" -PREFERRED_VERSION_xprint ?= "0.9.001" -PREFERRED_VERSION_xprop ?= "1.0.2" -PREFERRED_VERSION_xproto ?= "7.0.10" -PREFERRED_VERSION_xproto-native ?= "7.0.10" -PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.2" -PREFERRED_VERSION_xqt ?= "0.0.9" -PREFERRED_VERSION_xqt2 ?= "20060509" -PREFERRED_VERSION_xrandr ?= "1.2.2" -PREFERRED_VERSION_xrdb ?= "1.0.4" -PREFERRED_VERSION_xscreensaver ?= "4.22" -PREFERRED_VERSION_xscrnsaverh ?= "1.0" -PREFERRED_VERSION_xserver-common ?= "1.18" -PREFERRED_VERSION_xserver-kdrive ?= "1.3.0.0" -PREFERRED_VERSION_xserver-kdrive-common ?= "0.1" -PREFERRED_VERSION_xserver-nodm-init ?= "1.0" -PREFERRED_VERSION_xserver-xorg ?= "1.3.0.0" -PREFERRED_VERSION_xset ?= "1.0.3" -PREFERRED_VERSION_xsetroot ?= "1.0.2" -PREFERRED_VERSION_xsp ?= "1.0.0-8" -PREFERRED_VERSION_xst ?= "0.15" -PREFERRED_VERSION_xstroke ?= "0.6" -PREFERRED_VERSION_xterm ?= "207" -PREFERRED_VERSION_xtrans ?= "1.0.4" -PREFERRED_VERSION_xtrans-native ?= "1.0.3" -PREFERRED_VERSION_xtscal ?= "0.6.3" -PREFERRED_VERSION_xvinfo ?= "1.0.2" -PREFERRED_VERSION_yeaphone ?= "0.1" -PREFERRED_VERSION_ypbind-mt ?= "1.19" -PREFERRED_VERSION_ypserv ?= "2.17" -PREFERRED_VERSION_yp-tools ?= "2.9" -PREFERRED_VERSION_zauralign ?= "1.0.2" -PREFERRED_VERSION_zaurus-tarball-native ?= "1.0" -PREFERRED_VERSION_zbedic ?= "1.0" -PREFERRED_VERSION_zbench ?= "2.0" -PREFERRED_VERSION_zcip ?= "4" -PREFERRED_VERSION_zd1211-firmware ?= "1.3" -PREFERRED_VERSION_zd1211 ?= "r85" -PREFERRED_VERSION_zddice ?= "1.0.0" -PREFERRED_VERSION_zeroconf ?= "0.9" -PREFERRED_VERSION_zgscore ?= "1.0.2" -PREFERRED_VERSION_zile ?= "2.2.15" -PREFERRED_VERSION_zip ?= "2.32" -PREFERRED_VERSION_zip-native ?= "2.32" -PREFERRED_VERSION_zipsc ?= "0.4.3" -PREFERRED_VERSION_ziq ?= "1.1ern" -PREFERRED_VERSION_zlapspeed ?= "1.0.0" -PREFERRED_VERSION_zlib ?= "1.2.3" -PREFERRED_VERSION_zlib-native ?= "1.2.3" -PREFERRED_VERSION_zmerlin ?= "0.9.1" -PREFERRED_VERSION_zope ?= "3.3.1" -PREFERRED_VERSION_zrally ?= "0.90" -PREFERRED_VERSION_zrev7 ?= "1.0.1" -PREFERRED_VERSION_zroadmap ?= "1.1.0" -PREFERRED_VERSION_zsafe ?= "2.1.3" -PREFERRED_VERSION_zsh ?= "4.1.1" -PREFERRED_VERSION_zshopi ?= "0.2" -PREFERRED_VERSION_zsubhunt ?= "1.0.0ern" -PREFERRED_VERSION_ztappy ?= "0.9.3ern" -PREFERRED_VERSION_zten ?= "1.6.2" -PREFERRED_VERSION_zuc ?= "1.1.2ern" -PREFERRED_VERSION_zudoku ?= "1.1" -PREFERRED_VERSION_zziplib ?= "0.10.82" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 2b34c40bc3..34c7179929 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -1,88 +1,4 @@ -#----------------------------------------------------------------------------- -#@TYPE: Distribution -#@NAME: Openmoko -#@DESCRIPTION: Linux Distribution Configuration for the Openmoko Platform -#----------------------------------------------------------------------------- - -require conf/distro/include/preferred-om-2008-versions.inc -require conf/distro/include/angstrom-2007-for-openmoko.inc - -# -# Header -# -DISTRO_NAME = "openmoko" -DISTRO_VERSION = "-${DATE}" -#DISTRO_TYPE = "release" -DISTRO_TYPE = "debug" -DISTRO = "openmoko" - -OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" - -LIBC = "glibc" -require conf/distro/include/${LIBC}.inc - -INHERIT += "packaged-staging" - -CVS_TARBALL_STASH += "http://downloads.openmoko.org/developer/sources/" - -PREMIRRORS = "(ftp|https?)$://.*/.* http://downloads.openmoko.org/developer/sources/" - -DISTRO_FEED_PREFIX ?= "om-dev" -DISTRO_FEED_URI ?= "http://downloads.openmoko.org/repository/testing" - -AB_DEPLOY_EXTRA ?= "" -DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE_ARCH}/${AB_DEPLOY_EXTRA}" - -IMAGE_INITSCRIPTS = "initscripts-openmoko" - -# We try to minimize the distro features in the default image. -DISTRO_FEATURES = "wifi ppp alsa ext2 vfat usbhost" - -# Some features (bluetooth, usbgadget) include packages we do not like. -# Pick some of the packages manually. -DISTRO_EXTRA_RDEPENDS += " \ - bluez4 \ - kernel-module-g-ether \ - " - -# 2.18 seems to break badly on 64-bit systems -PREFERRED_VERSION_binutils ?= "2.17.50.0.12" -PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12" - -# Bleeding-edge developers should add the following lines to their local.conf: -# require conf/distro/include/fso-autorev.inc - -# override the PACKAGE_ARCH of certain packages for openmoko distro - -# Same kernel so same usb -PACKAGE_ARCH_pn-usb-gadget-mode_om-gta01 = "armv4t" -PACKAGE_ARCH_pn-usb-gadget-mode_om-gta02 = "armv4t" -# same kernel so same keymaps -PACKAGE_ARCH_pn-keymaps_om-gta01 = "armv4t" -PACKAGE_ARCH_pn-keymaps_om-gta02 = "armv4t" -# neod knows about both machines -PACKAGE_ARCH_pn-neod_om-gta01 = "armv4t" -PACKAGE_ARCH_pn-neod_om-gta02 = "armv4t" - -# Select package providers -PREFERRED_PROVIDER_gtk+ = "gtk+" -PREFERRED_PROVIDER_opkg = "opkg" -PREFERRED_PROVIDER_libgsmd = "libgsmd" - -# for jalimo -PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" -PREFERRED_PROVIDER_classpath = "classpath" -PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial" -PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk" -PREFERRED_PROVIDER_midpath = "midpath-openmoko" - -# We don't use this, but select one to shut bitbake up. -PREFERRED_PROVIDER_virtual/libqte2 = "qte" - -# Helper to say what image we built -OM_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/om-version" -ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${OM_VERSION_FILE};cd $OLD_PWD;" -ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo VERSION: `git-log -n1 --pretty=oneline|awk '{print $1}'` >> ${OM_VERSION_FILE}; cd $OLD_PWD;" -ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${OM_VERSION_FILE}; cd $OLD_PWD;" -ROOTFS_POSTPROCESS_COMMAND += "echo Build Host: `cat /etc/hostname` >> ${OM_VERSION_FILE};" -ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${OM_VERSION_FILE};" +WARNING:="${@bb.fatal('\n*\n*\n* Sorry, The Openmoko distribution has been removed on Aug 10, 2010. \ +\n* It is recommended to use DISTRO = \"shr\" distro instead. \ +\n* \ +\n* If you really need Openmoko you can still find it in git.\n*\n*\n')}" -- cgit v1.2.3 From 24ed3287fee7fde8807e4cf81c35ffbd9dfcbc07 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Tue, 10 Aug 2010 18:06:03 +0200 Subject: mokoslug.conf: removed distro approved by mwester and rwhitby on irc Signed-off-by: Frans Meulenbroeks --- conf/distro/mokoslug.conf | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 conf/distro/mokoslug.conf diff --git a/conf/distro/mokoslug.conf b/conf/distro/mokoslug.conf deleted file mode 100644 index 1fba9e6a74..0000000000 --- a/conf/distro/mokoslug.conf +++ /dev/null @@ -1,27 +0,0 @@ -#@-------------------------------------------------------------------- -#@TYPE: Distribution -#@NAME: MokoSlug -#@DESCRIPTION: The Linux Server companion for Openmoko phones -#@MAINTAINER: Rod Whitby -#@-------------------------------------------------------------------- - -# MokoSlug is based on Angstrom, and would hopefully just be done by features one day ... -require conf/distro/angstrom-2008.1.conf - -DISTRO_NAME = "MokoSlug" -DISTRO_VERSION = "1.0-alpha" -DISTRO_REVISION = "1" -DISTRO_TYPE = "debug" - -MACHINE_TASK_PROVIDER = "task-boot dropbear" -MACHINE_TASK_PROVIDER_append_nslu2 = " sysconf" - -# Even though the NSLU2 does not have built-in bluetooth, -# we assume that a MokoSlug gateway has a bluetooth dongle. -MACHINE_FEATURES_append_nslu2 = " bluetooth" - -# No room for debug apps on an NSLU2. -DEBUG_APPS_nslu2 = "" - -# No room for a kernel image on an NSLU2. -IMAGE_PREPROCESS_COMMAND_append_nslu2 = "rm ${IMAGE_ROOTFS}/boot/zImage*;" -- cgit v1.2.3 From 335234b673488741c7549d486a259b9c3ab7db9d Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Tue, 10 Aug 2010 18:09:07 +0200 Subject: angstrom-2007-for-openmoko.inc: removed was not used any more. XorA said on #oe that this was created for him, and that it could go Signed-off-by: Frans Meulenbroeks --- conf/distro/include/angstrom-2007-for-openmoko.inc | 235 --------------------- 1 file changed, 235 deletions(-) delete mode 100644 conf/distro/include/angstrom-2007-for-openmoko.inc diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc deleted file mode 100644 index 73ab17e6b0..0000000000 --- a/conf/distro/include/angstrom-2007-for-openmoko.inc +++ /dev/null @@ -1,235 +0,0 @@ -#@-------------------------------------------------------------------- -#@TYPE: Distribution -#@NAME: Angstrom -#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices -#@MAINTAINER: Koen Kooi -#@-------------------------------------------------------------------- - -DISTRO_VERSION = "2007.11RC3" -DISTRO_REVISION = "51" - -require conf/distro/include/sane-srcdates.inc -require conf/distro/include/sane-srcrevs.inc - -#Images built can have to modes: -# 'debug': empty rootpassword, strace included -# 'release' no root password, no strace and gdb by default -DISTRO_TYPE ?= "debug" -#DISTRO_TYPE = "release" - -# Ship just basic locale by default. Locales are big (~1Mb uncompr.), so -# shipping some adhoc subset will be still useless and size burden for -# users of all other languages/countries. Instead, worth to make it easy -# to install additional languages: installer/wizard + metapackages which -# will RRECOMMEND as much as possible content for a given language -# (locales, UI transalations, help, etc. - useless for pros, but really -# helpful for common users). -# Also, it appears that no locales fit in 16Mb for now. "C" locale rules! -IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}' - -# set feed path variables -FEED_BASEPATH = "feeds/2007/${ANGSTROM_PKG_FORMAT}/${LIBC}/" - - -#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback -CVS_TARBALL_STASH ?= "http://www.angstrom-distribution.org/unstable/sources/" - -#Make sure we use 2.6 on machines with a 2.4/2.6 selector -KERNEL = "kernel26" -MACHINE_KERNEL_VERSION = "2.6" -PCMCIA_MANAGER = "pcmciautils" - -#Preferred version for the kernel on various machines -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20" -PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}" -RDEPENDS_kernel-base_hx4700 = "" -RDEPENDS_kernel-base_htcuniversal = "" - -PREFERRED_PROVIDER_libgsmd = "libgsmd" - -# older gtk-webcore releases don't work on ARM/EABI -# We need to switch to a fixed SRCDATE or release as soon as possible -PREFERRED_VERSION_osb-browser = "0.5.0+svn${SRCDATE}" -PREFERRED_VERSION_osb-jscore = "0.5.2+svn${SRCDATE}" -PREFERRED_VERSION_osb-nrcit = "0.5.2+svn${SRCDATE}" -PREFERRED_VERSION_osb-nrcore = "0.5.2+svn${SRCDATE}" - -PREFERRED_PROVIDER_avahi = "avahi" - -#Small machines prefer kdrive, but we might ship full Xorg in other images -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" -PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" - -#use EABI ready toolchain -PREFERRED_VERSION_gcc ?= "4.1.2" -PREFERRED_VERSION_gcc-cross ?= "4.1.2" -PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2" -PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2" -PREFERRED_VERSION_gcc-cross-intermediate ?= "4.1.2" - -PREFERRED_VERSION_gcc_dht-walnut ?= "4.1.1" -PREFERRED_VERSION_gcc-cross_dht-walnut ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk_dht-walnut ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial_dht-walnut ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-intermediate_dht-walnut ?= "4.1.1" - -PREFERRED_VERSION_gcc_xilinx-ml403 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross_xilinx-ml403 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk_xilinx-ml403 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial_xilinx-ml403 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-intermediate_xilinx-ml403 ?= "4.1.1" - -PREFERRED_VERSION_gcc_mpc8323e-rdb ?= "4.1.1" -PREFERRED_VERSION_gcc-cross_mpc8323e-rdb ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk_mpc8323e-rdb ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial_mpc8323e-rdb ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-intermediate_mpc8323e-rdb ?= "4.1.1" - -PREFERRED_VERSION_binutils ?= "2.18" -PREFERRED_VERSION_binutils-cross ?= "2.18" -PREFERRED_VERSION_binutils-cross-sdk ?= "2.18" - -#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc_avr32 = "avr32-gcc-cross" -PREFERRED_VERSION_avr32-gcc = "4.1.2" -PREFERRED_VERSION_avr32-gcc-cross = "4.1.2" -PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.0.2" -PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.0.2" -PREFERRED_VERSION_gcc-cross-intermediate_avr32 = "4.0.2" - -PREFERRED_VERSION_binutils_avr32 = "2.17" -PREFERRED_VERSION_binutils-cross_avr32 = "2.17" -PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" - -#This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against -PREFERRED_VERSION_linux-libc-headers ?= "2.6.20" -PREFERRED_VERSION_linux-libc-headers_bfin = "2.6.21" - -#Prefer glibc 2.5 and uclibc 0.9.29, these have had the most testing. -PREFERRED_VERSION_glibc ?= "2.5" -PREFERRED_VERSION_uclibc ?= "0.9.29" -PREFERRED_VERSION_uclibc-initial ?= "0.9.29" - -#there's is no avr32 patch for 0.9.29 -PREFERRED_VERSION_uclibc_avr32 = "0.9.28" -PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28" - -PREFERRED_VERSION_glibc-initial ?= "2.5" - -# To use an EABI compatible version 3 series gcc, either uncomment -# the lines below or set them in local.conf: -# -# PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3" -# PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3" -# PREFERRED_VERSION_gcc-cross-intermediate = "3.4.4+csl-arm-2005q3" - -#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom -require conf/distro/include/preferred-xorg-versions.inc -require conf/distro/include/preferred-gpe-versions-2.8.inc -require conf/distro/include/preferred-e-versions.inc - - -# Virtuals: -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" - -#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo) -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc" - -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibceabi-libc-for-gcc = "uclibc-initial" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibceabi-libc-for-gcc = "uclibc-initial" - -# hostap stuff, we prefer the in-kernel modules, but those don't work for all machines -PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" -PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules" -PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules" - -PREFERRED_PROVIDER_virtual/db ?= "db" -PREFERRED_PROVIDER_virtual/db-native ?= "db-native" -PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" -PREFERRED_PROVIDER_virtual/libx11-native ?= "libx11-native" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" - -# Others: -PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" -PREFERRED_PROVIDER_dbus-glib = "dbus-glib" -PREFERRED_PROVIDER_esound ?= "pulseaudio" -PREFERRED_PROVIDER_gconf ?= "gconf-dbus" -PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs" -PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs" -PREFERRED_PROVIDER_tslib ?= "tslib" -PREFERRED_PROVIDER_tslib-conf ?= "tslib" -PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" -PREFERRED_PROVIDER_ntp ?= "ntp" -PREFERRED_PROVIDER_hotplug = "udev" -PREFERRED_PROVIDER_libxss = "libxss" - -# we don't ship gtk-directfb by default -PREFERRED_PROVIDER_gtk+ ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" - - -#Silence a warning during parsing -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" - -#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH} -ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" -require conf/distro/include/angstrom${ARM_ABI}.inc - -# do some task-base stuff here - -# We want to ship extra debug utils in the rootfs when doing a debug build -DEBUG_APPS ?= "" -DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}' - -#this should go away soon -EXTRA_STUFF ?= "" - - -# Angstrom want to ship some extra stuff. This should be moved into task-base eventually -# contains ipkg specific stuff as well :( - -#work around a bitbake bug where mtd-utils-native isn't created so do_rootfs fails -DISTRO_EXTRA_DEPENDS += " \ - mtd-utils-native \ - " - -DISTRO_EXTRA_RDEPENDS += "\ - update-modules \ -# ${@base_contains("MACHINE_FEATURES", "screen", "exquisite", "",d)} \ - angstrom-version \ - opkg opkg-collateral distro-feed-configs \ - util-linux-mount util-linux-umount \ - ${EXTRA_STUFF} \ - ${DEBUG_APPS} \ - " - -DISTRO_EXTRA_RRECOMMENDS += " \ - kernel-module-vfat \ - kernel-module-ext2 \ - kernel-module-af-packet \ - openssh-sftp-server \ - " - -SEPPUKU_NEWREPORT = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202007.12&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" - -- cgit v1.2.3 From 3cd6729fe75a358488b3567623aba801a7a1c3db Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Tue, 10 Aug 2010 19:31:33 +0200 Subject: MAINTAINERS: removed openmoko distro maintainer as openmoko has been terminated Signed-off-by: Frans Meulenbroeks --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 6f0fb5c4eb..67a65c44a5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -227,7 +227,7 @@ Recipes: altboot, webcam-server Person: Michael 'Mickey' Lauer Mail: mlauer@vanille-media.de -Distros: Openmoko, Minimal +Distros: Minimal Machines: om-gta01, om-gta02, htcdream, htcraphael, palmpre, a780, a1200, a910 Interests: Core OE infrastructure, Python, EFL, Vala, Freesmartphone.org Recipes: efl1/*, busybox/*, dbus/*, dropbear/*, freesmartphone/*, gstreamer/*, *python*, vala/ -- cgit v1.2.3 From 5db1701988c2131757fbc3fd1ef3a6de20df5038 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Tue, 10 Aug 2010 19:44:35 +0200 Subject: alsa: removed old versions Signed-off-by: Frans Meulenbroeks --- recipes/alsa/alsa-lib_1.0.15.bb | 57 -------------------------------- recipes/alsa/alsa-oss_1.0.15.bb | 25 -------------- recipes/alsa/alsa-plugins_1.0.15.bb | 23 ------------- recipes/alsa/alsa-utils_1.0.11.bb | 58 -------------------------------- recipes/alsa/alsa-utils_1.0.13.bb | 66 ------------------------------------- recipes/alsa/alsa-utils_1.0.14.bb | 59 --------------------------------- recipes/alsa/alsa-utils_1.0.15.bb | 60 --------------------------------- 7 files changed, 348 deletions(-) delete mode 100644 recipes/alsa/alsa-lib_1.0.15.bb delete mode 100644 recipes/alsa/alsa-oss_1.0.15.bb delete mode 100644 recipes/alsa/alsa-plugins_1.0.15.bb delete mode 100644 recipes/alsa/alsa-utils_1.0.11.bb delete mode 100644 recipes/alsa/alsa-utils_1.0.13.bb delete mode 100644 recipes/alsa/alsa-utils_1.0.14.bb delete mode 100644 recipes/alsa/alsa-utils_1.0.15.bb diff --git a/recipes/alsa/alsa-lib_1.0.15.bb b/recipes/alsa/alsa-lib_1.0.15.bb deleted file mode 100644 index 4dcdda45cf..0000000000 --- a/recipes/alsa/alsa-lib_1.0.15.bb +++ /dev/null @@ -1,57 +0,0 @@ -DESCRIPTION = "Alsa sound library" -HOMEPAGE = "http://www.alsa-project.org" -SECTION = "libs/multimedia" -LICENSE = "LGPLv2.1" -PR = "r1" - -# configure.in sets -D__arm__ on the command line for any arm system -# (not just those with the ARM instruction set), this should be removed, -# (or replaced by a permitted #define). -#FIXME: remove the following -ARM_INSTRUCTION_SET = "arm" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ - file://fix-tstamp-declaration.patch \ - file://fix_libmath.patch \ - " - -inherit autotools pkgconfig - - -EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python" - - -require alsa-fpu.inc -EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} " - - -require alsa-versym.inc -EXTRA_OECONF += "${@get_alsa_versym_setting(bb, d)} " - - -do_stage () { - oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/alsa/sound - install -m 0644 include/*.h ${STAGING_INCDIR}/alsa/ - install -m 0644 include/sound/ainstr*.h ${STAGING_INCDIR}/alsa/sound/ - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/ -} - -PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev" -FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*" -FILES_libasound = "${libdir}/libasound.so.*" -FILES_alsa-server = "${bindir}/*" -FILES_alsa-conf = "${datadir}/alsa/" -FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*" -FILES_alsa-conf-base = "\ -${datadir}/alsa/alsa.conf \ -${datadir}/alsa/cards/aliases.conf \ -${datadir}/alsa/pcm/default.conf \ -${datadir}/alsa/pcm/dmix.conf \ -${datadir}/alsa/pcm/dsnoop.conf" - -RDEPENDS_libasound = "alsa-conf-base" - -SRC_URI[md5sum] = "94254ea0d2c966a58184b134e9da29ff" -SRC_URI[sha256sum] = "f24272f3a32262c5285fc5bae0b9aa65494e8b22ac536313dbb60b8e4231e952" diff --git a/recipes/alsa/alsa-oss_1.0.15.bb b/recipes/alsa/alsa-oss_1.0.15.bb deleted file mode 100644 index d6b09c58f7..0000000000 --- a/recipes/alsa/alsa-oss_1.0.15.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Alsa OSS Compatibility Package" -SECTION = "libs/multimedia" -LICENSE = "GPL" -DEPENDS = "alsa-lib" -PR = "r2" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ - file://libio.patch \ - " - -inherit autotools - -LEAD_SONAME = "libaoss.so.0" - -do_configure_prepend () { - touch NEWS README AUTHORS ChangeLog -} - -do_stage () { - oe_libinstall -C alsa -a -so libaoss ${STAGING_LIBDIR} - oe_libinstall -C alsa -a -so libalsatoss ${STAGING_LIBDIR} -} - -SRC_URI[md5sum] = "49fb5fbae8bf955b248e46ff9c9a2aa1" -SRC_URI[sha256sum] = "85245d7666d82cc44010dfe14f6427a8586da2c8b033fb636f0f041dd7e5168b" diff --git a/recipes/alsa/alsa-plugins_1.0.15.bb b/recipes/alsa/alsa-plugins_1.0.15.bb deleted file mode 100644 index f60ee4f858..0000000000 --- a/recipes/alsa/alsa-plugins_1.0.15.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "ALSA Plugins" -HOMEPAGE = "http://www.alsa-project.org" -SECTION = "multimedia/alsa/plugins" -LICENSE = "GPL" -DEPENDS = "alsa-lib pulseaudio" -PR = "r0" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-${PV}.tar.bz2" - -inherit autotools - -PACKAGES_DYNAMIC = "libasound-module*" - -python populate_packages_prepend() { - plugindir = bb.data.expand('${libdir}/alsa-lib/', d) - do_split_packages(d, plugindir, '^libasound_module_(.*)\.so$', 'libasound-module-%s', 'Alsa plugin for %s', extra_depends='' ) -} - -FILES_${PN}-dev += "${libdir}/alsa-lib/libasound*.a ${libdir}/alsa-lib/libasound*.la" -FILES_${PN}-dbg += "${libdir}/alsa-lib/.debug" - -SRC_URI[md5sum] = "908c2dd7ec33bc8e1fcd5e92c7e5e125" -SRC_URI[sha256sum] = "3fec2349a94254c82dd568a8f4f8b8ef9735aee7dc56a5cf93e80f5938df9e95" diff --git a/recipes/alsa/alsa-utils_1.0.11.bb b/recipes/alsa/alsa-utils_1.0.11.bb deleted file mode 100644 index b016a25369..0000000000 --- a/recipes/alsa/alsa-utils_1.0.11.bb +++ /dev/null @@ -1,58 +0,0 @@ -DESCRIPTION = "ALSA Utilities" -HOMEPAGE = "http://www.alsa-project.org" -SECTION = "console/utils" -LICENSE = "GPLv2" -DEPENDS = "alsa-lib ncurses" -PR = "r1" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2" - -inherit autotools - -# This are all packages that we need to make. Also, the now empty alsa-utils -# ipk depend on them. - -PACKAGES += "alsa-utils-alsamixer" -PACKAGES += "alsa-utils-midi" -PACKAGES += "alsa-utils-aplay" -PACKAGES += "alsa-utils-amixer" -PACKAGES += "alsa-utils-aconnect" -PACKAGES += "alsa-utils-iecset" -PACKAGES += "alsa-utils-speakertest" -PACKAGES += "alsa-utils-aseqnet" -PACKAGES += "alsa-utils-alsactl" - -# We omit alsaconf, because -# a) this is a bash script -# b) it creates config files not suitable for OE-based distros - -FILES_${PN} = "" -FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord" -FILES_alsa-utils-amixer = "${bindir}/amixer" -FILES_alsa-utils-alsamixer = "${bindir}/alsamixer" -FILES_alsa-utils-speakertest = "${bindir}/speaker-test" -FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi" -FILES_alsa-utils-aconnect = "${bindir}/aconnect" -FILES_alsa-utils-aseqnet = "${bindir}/aseqnet" -FILES_alsa-utils-iecset = "${bindir}/iecset" -FILES_alsa-utils-alsactl = "${sbindir}/alsactl" - -DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA" -DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings" -DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings" -DESCRIPTION_alsa-utils-speaker-test = "speaker test tone generator for ALSA" -DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA" -DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager" -DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer" -DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state" -DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files" - -RDEPENDS_alsa-utils-aplay += "alsa-conf" -RDEPENDS_alsa-utils-amixer += "alsa-conf" -RDEPENDS_alsa-utils-alsamixer += "alsa-conf" -RDEPENDS_alsa-utils-speaker-test += "alsa-conf" - -ALLOW_EMPTY_alsa-utils = "1" - -SRC_URI[md5sum] = "ba9b8010120701d0f6daf061d392cfa2" -SRC_URI[sha256sum] = "4b33229437ddab4196b8fd0bdfaf074314185a5afd3e24bbe28025022b42d01b" diff --git a/recipes/alsa/alsa-utils_1.0.13.bb b/recipes/alsa/alsa-utils_1.0.13.bb deleted file mode 100644 index 8e542b7ef7..0000000000 --- a/recipes/alsa/alsa-utils_1.0.13.bb +++ /dev/null @@ -1,66 +0,0 @@ -DESCRIPTION = "ALSA Utilities" -HOMEPAGE = "http://www.alsa-project.org" -SECTION = "console/utils" -LICENSE = "GPLv2" -DEPENDS = "alsa-lib ncurses" -PR = "r1" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2" - -# lazy hack. needs proper fixing in gettext.m4, see -# http://bugs.openembedded.net/show_bug.cgi?id=2348 -# please close bug and remove this comment when properly fixed -# -EXTRA_OECONF_linux-uclibc = "--disable-nls" -EXTRA_OECONF_linux-uclibceabi = "--disable-nls" - -inherit autotools - -# This are all packages that we need to make. Also, the now empty alsa-utils -# ipk depend on them. - -PACKAGES += "\ - alsa-utils-alsamixer \ - alsa-utils-midi \ - alsa-utils-aplay \ - alsa-utils-amixer \ - alsa-utils-aconnect \ - alsa-utils-iecset \ - alsa-utils-speakertest \ - alsa-utils-aseqnet \ - alsa-utils-alsactl " - -# We omit alsaconf, because -# a) this is a bash script -# b) it creates config files not suitable for OE-based distros - -FILES_${PN} = "" -FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord" -FILES_alsa-utils-amixer = "${bindir}/amixer" -FILES_alsa-utils-alsamixer = "${bindir}/alsamixer" -FILES_alsa-utils-speakertest = "${bindir}/speaker-test" -FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi" -FILES_alsa-utils-aconnect = "${bindir}/aconnect" -FILES_alsa-utils-aseqnet = "${bindir}/aseqnet" -FILES_alsa-utils-iecset = "${bindir}/iecset" -FILES_alsa-utils-alsactl = "${sbindir}/alsactl" - -DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA" -DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings" -DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings" -DESCRIPTION_alsa-utils-speakertest = "speaker test tone generator for ALSA" -DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA" -DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager" -DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer" -DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state" -DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files" - -RDEPENDS_alsa-utils-aplay += "alsa-conf" -RDEPENDS_alsa-utils-amixer += "alsa-conf" -RDEPENDS_alsa-utils-alsamixer += "alsa-conf" -RDEPENDS_alsa-utils-speakertest += "alsa-conf" - -ALLOW_EMPTY_alsa-utils = "1" - -SRC_URI[md5sum] = "dfe4bb5d3217f3ec662b172ce8397cf0" -SRC_URI[sha256sum] = "d7fe8a7995bc74331c89fbc1937a0682d239339d6659a402cd7b8e4b96c050f0" diff --git a/recipes/alsa/alsa-utils_1.0.14.bb b/recipes/alsa/alsa-utils_1.0.14.bb deleted file mode 100644 index 9bef67a3f2..0000000000 --- a/recipes/alsa/alsa-utils_1.0.14.bb +++ /dev/null @@ -1,59 +0,0 @@ -DESCRIPTION = "ALSA Utilities" -HOMEPAGE = "http://www.alsa-project.org" -SECTION = "console/utils" -LICENSE = "GPLv2" -DEPENDS = "alsa-lib ncurses" -PR = "r1" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ - file://alsa-utils-automake.patch \ - " -inherit autotools - -# This are all packages that we need to make. Also, the now empty alsa-utils -# ipk depend on them. - -PACKAGES += "\ - alsa-utils-alsamixer \ - alsa-utils-midi \ - alsa-utils-aplay \ - alsa-utils-amixer \ - alsa-utils-aconnect \ - alsa-utils-iecset \ - alsa-utils-speakertest \ - alsa-utils-aseqnet \ - alsa-utils-aseqdump \ - alsa-utils-alsaconf \ - alsa-utils-alsactl " - -# We omit alsaconf, because -# a) this is a bash script -# b) it creates config files not suitable for OE-based distros - -FILES_${PN} = "" -FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord" -FILES_alsa-utils-amixer = "${bindir}/amixer" -FILES_alsa-utils-alsamixer = "${bindir}/alsamixer" -FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/" -FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi" -FILES_alsa-utils-aconnect = "${bindir}/aconnect" -FILES_alsa-utils-aseqnet = "${bindir}/aseqnet" -FILES_alsa-utils-iecset = "${bindir}/iecset" -FILES_alsa-utils-alsactl = "${sbindir}/alsactl" -FILES_alsa-utils-aseqdump = "${bindir}/aseqdump" -FILES_alsa-utils-alsaconf = "${sbindir}/alsaconf" - -DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA" -DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings" -DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings" -DESCRIPTION_alsa-utils-speakertest = "ALSA surround speaker test utility" -DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA" -DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager" -DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer" -DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state" -DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files" - -ALLOW_EMPTY_alsa-utils = "1" - -SRC_URI[md5sum] = "6d3009c157ac6fc803696d6590a48366" -SRC_URI[sha256sum] = "307d630f0ed15e7e92fa35dc0c961737fa9aed22bd7a4a6054a72f85145fa5cb" diff --git a/recipes/alsa/alsa-utils_1.0.15.bb b/recipes/alsa/alsa-utils_1.0.15.bb deleted file mode 100644 index 5fc07b16b7..0000000000 --- a/recipes/alsa/alsa-utils_1.0.15.bb +++ /dev/null @@ -1,60 +0,0 @@ -DESCRIPTION = "ALSA Utilities" -HOMEPAGE = "http://www.alsa-project.org" -SECTION = "console/utils" -LICENSE = "GPLv2" -DEPENDS = "alsa-lib ncurses" -PR = "r1" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ - file://alsa-utils-automake.patch \ - " - -inherit autotools - -# This are all packages that we need to make. Also, the now empty alsa-utils -# ipk depend on them. - -PACKAGES += "\ - alsa-utils-alsamixer \ - alsa-utils-midi \ - alsa-utils-aplay \ - alsa-utils-amixer \ - alsa-utils-aconnect \ - alsa-utils-iecset \ - alsa-utils-speakertest \ - alsa-utils-aseqnet \ - alsa-utils-aseqdump \ - alsa-utils-alsaconf \ - alsa-utils-alsactl " - -# We omit alsaconf, because -# a) this is a bash script -# b) it creates config files not suitable for OE-based distros - -FILES_${PN} = "" -FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord" -FILES_alsa-utils-amixer = "${bindir}/amixer" -FILES_alsa-utils-alsamixer = "${bindir}/alsamixer" -FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/" -FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi" -FILES_alsa-utils-aconnect = "${bindir}/aconnect" -FILES_alsa-utils-aseqnet = "${bindir}/aseqnet" -FILES_alsa-utils-iecset = "${bindir}/iecset" -FILES_alsa-utils-alsactl = "${sbindir}/alsactl" -FILES_alsa-utils-aseqdump = "${bindir}/aseqdump" -FILES_alsa-utils-alsaconf = "${sbindir}/alsaconf" - -DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA" -DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings" -DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings" -DESCRIPTION_alsa-utils-speakertest = "ALSA surround speaker test utility" -DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA" -DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager" -DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer" -DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state" -DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files" - -ALLOW_EMPTY_alsa-utils = "1" - -SRC_URI[md5sum] = "287f46f891581c15018de4f8c0731575" -SRC_URI[sha256sum] = "3bb546e873df39159812168180eeff14b13620c653d90739ac0a0912e898aeac" -- cgit v1.2.3 From 7fcd85506e1d422776466c9994cb970dc2cc1db2 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Tue, 10 Aug 2010 19:46:10 +0200 Subject: abiword: removed 2.5.2; 3 years old and default pref -1 Signed-off-by: Frans Meulenbroeks --- recipes/abiword/abiword-embedded_2.5.2.bb | 13 --------- recipes/abiword/abiword-plugins_2.5.2.bb | 46 ------------------------------- recipes/abiword/abiword_2.5.2.bb | 10 ------- 3 files changed, 69 deletions(-) delete mode 100644 recipes/abiword/abiword-embedded_2.5.2.bb delete mode 100644 recipes/abiword/abiword-plugins_2.5.2.bb delete mode 100644 recipes/abiword/abiword_2.5.2.bb diff --git a/recipes/abiword/abiword-embedded_2.5.2.bb b/recipes/abiword/abiword-embedded_2.5.2.bb deleted file mode 100644 index 459cc277ed..0000000000 --- a/recipes/abiword/abiword-embedded_2.5.2.bb +++ /dev/null @@ -1,13 +0,0 @@ -require abiword-2.5.inc - -EXTRA_OECONF += "--enable-embedded" - -S = "${WORKDIR}/abiword-${PV}" - -RCONFLICTS_${PN} = "abiword" -RPROVIDES_${PN} += "abiword" - - - -SRC_URI[md5sum] = "bbc9c124f8072875129bd67092f0fa0b" -SRC_URI[sha256sum] = "db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f" diff --git a/recipes/abiword/abiword-plugins_2.5.2.bb b/recipes/abiword/abiword-plugins_2.5.2.bb deleted file mode 100644 index ec905f9ddc..0000000000 --- a/recipes/abiword/abiword-plugins_2.5.2.bb +++ /dev/null @@ -1,46 +0,0 @@ -DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word" -HOMEPAGE = "http://www.abiword.org" -SECTION = "x11/office" -LICENSE = "GPLv2" -DEPENDS = "boost loudmouth libwpd librsvg goffice poppler libglade" -RDEPENDS_${PN} = "abiword" - -PR = "r2" - -DEFAULT_PREFERENCE = "1" - -SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz;name=plugins \ - http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=archive \ - " - -inherit autotools - -PARALLEL_MAKE="" - -EXTRA_OECONF = " --without-libwmf \ - --without-inter7eps \ - --with-abiword=${WORKDIR}/abiword-${PV} \ - --with-boost=${STAGING_INCDIR}/../ \ - " - -PACKAGES_DYNAMIC = "abiword-plugin-*" - -python populate_packages_prepend () { - abiword_libdir = bb.data.expand('${libdir}/abiword-2.5/plugins', d) - do_split_packages(d, abiword_libdir, '^libAbi(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='') - do_split_packages(d, abiword_libdir, '^libAbi(.*)\.la$', 'abiword-plugin-%s-dev', 'Abiword plugin for %s', extra_depends='') -} - - -PACKAGES =+ "abiword-plugin-collab-glade" - -FILES_abiword-plugin-collab-glade += "${datadir}" -RDEPENDS_abiword-plugin-collab-glade = "abiword-plugin-collab" - -FILES_${PN}-dbg += "${libdir}/abiword-2.5/plugins/.debug" - - -SRC_URI[plugins.md5sum] = "0ad700d0cb6d176b39a191b16e3886c0" -SRC_URI[plugins.sha256sum] = "5714753ce1e89e72c2ba7e7d7d95546d9965a4e86bf76c060a8779b08fc2ae85" -SRC_URI[archive.md5sum] = "bbc9c124f8072875129bd67092f0fa0b" -SRC_URI[archive.sha256sum] = "db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f" diff --git a/recipes/abiword/abiword_2.5.2.bb b/recipes/abiword/abiword_2.5.2.bb deleted file mode 100644 index f4202aa4ad..0000000000 --- a/recipes/abiword/abiword_2.5.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -require abiword-2.5.inc - -DEFAULT_PREFERENCE = "-1" - -PR = "r2" - -RCONFLICTS_${PN} = "abiword-embedded" - -SRC_URI[md5sum] = "bbc9c124f8072875129bd67092f0fa0b" -SRC_URI[sha256sum] = "db34eeb5457fb7572fc76ec2a73cdb4f7a67307e7468b6c4bde820b58c598b3f" -- cgit v1.2.3 From fc3233b3a21ac14127bdd4931687ef39482cb0ec Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Tue, 10 Aug 2010 19:49:56 +0200 Subject: autoconf: remove a few old unused versions Signed-off-by: Frans Meulenbroeks --- .../autoconf/autoconf-2.57/program_prefix.patch | 19 - recipes/autoconf/autoconf-2.59/autoconf-sh.patch | 22 -- recipes/autoconf/autoconf-2.59/autoconf-x.patch | 36 -- .../autoconf259-update-configscripts.patch | 393 --------------------- .../autoheader-nonfatal-warnings.patch | 13 - .../autoconf-2.59/autoreconf-exclude.patch | 125 ------- .../autoconf-2.59/autoreconf-foreign.patch | 11 - .../autoconf-2.59/autoreconf-gnuconfigize.patch | 47 --- .../autoconf-2.59/autoreconf-include.patch | 10 - .../autoconf/autoconf-2.59/program_prefix.patch | 19 - recipes/autoconf/autoconf-2.59/sizeof_types.patch | 87 ----- recipes/autoconf/autoconf213-native_2.13.bb | 11 - recipes/autoconf/autoconf213_2.13.bb | 8 - recipes/autoconf/autoconf_2.57.bb | 5 - recipes/autoconf/autoconf_2.59.bb | 16 - 15 files changed, 822 deletions(-) delete mode 100644 recipes/autoconf/autoconf-2.57/program_prefix.patch delete mode 100644 recipes/autoconf/autoconf-2.59/autoconf-sh.patch delete mode 100644 recipes/autoconf/autoconf-2.59/autoconf-x.patch delete mode 100644 recipes/autoconf/autoconf-2.59/autoconf259-update-configscripts.patch delete mode 100644 recipes/autoconf/autoconf-2.59/autoheader-nonfatal-warnings.patch delete mode 100644 recipes/autoconf/autoconf-2.59/autoreconf-exclude.patch delete mode 100644 recipes/autoconf/autoconf-2.59/autoreconf-foreign.patch delete mode 100644 recipes/autoconf/autoconf-2.59/autoreconf-gnuconfigize.patch delete mode 100644 recipes/autoconf/autoconf-2.59/autoreconf-include.patch delete mode 100644 recipes/autoconf/autoconf-2.59/program_prefix.patch delete mode 100644 recipes/autoconf/autoconf-2.59/sizeof_types.patch delete mode 100644 recipes/autoconf/autoconf213-native_2.13.bb delete mode 100644 recipes/autoconf/autoconf213_2.13.bb delete mode 100644 recipes/autoconf/autoconf_2.57.bb delete mode 100644 recipes/autoconf/autoconf_2.59.bb diff --git a/recipes/autoconf/autoconf-2.57/program_prefix.patch b/recipes/autoconf/autoconf-2.57/program_prefix.patch deleted file mode 100644 index e6f4096a97..0000000000 --- a/recipes/autoconf/autoconf-2.57/program_prefix.patch +++ /dev/null @@ -1,19 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- autoconf-2.57/lib/autoconf/general.m4~program_prefix -+++ autoconf-2.57/lib/autoconf/general.m4 -@@ -1676,8 +1676,9 @@ - # The aliases save the names the user supplied, while $host etc. - # will get canonicalized. - test -n "$target_alias" && -- test "$program_prefix$program_suffix$program_transform_name" = \ -- NONENONEs,x,x, && -+ test "$target_alias" != "$host_alias" && -+ test "$program_prefix$program_suffix$program_transform_name" = \ -+ NONENONEs,x,x, && - program_prefix=${target_alias}-[]dnl - ])# AC_CANONICAL_TARGET - diff --git a/recipes/autoconf/autoconf-2.59/autoconf-sh.patch b/recipes/autoconf/autoconf-2.59/autoconf-sh.patch deleted file mode 100644 index 361033ba3d..0000000000 --- a/recipes/autoconf/autoconf-2.59/autoconf-sh.patch +++ /dev/null @@ -1,22 +0,0 @@ -http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/Attic/autoconf-sh.patch?rev=1.1;content-type=text%2Fplain - -Index: tests/wrapper.in -=================================================================== -RCS file: /cvsroot/autoconf/autoconf/tests/wrapper.in,v -retrieving revision 1.4 -diff -u -u -r1.4 wrapper.in ---- autoconf-2.59/tests/wrapper.in 25 Sep 2003 09:30:35 -0000 1.4 -+++ autoconf-2.59/tests/wrapper.in 19 Nov 2003 13:17:11 -0000 -@@ -13,9 +13,10 @@ - elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix - fi -+DUALCASE=1; export DUALCASE # for MKS sh - - # Support unset when possible. --if ((MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset - else - as_unset=false - diff --git a/recipes/autoconf/autoconf-2.59/autoconf-x.patch b/recipes/autoconf/autoconf-2.59/autoconf-x.patch deleted file mode 100644 index 596535b7d6..0000000000 --- a/recipes/autoconf/autoconf-2.59/autoconf-x.patch +++ /dev/null @@ -1,36 +0,0 @@ -Index: lib/autoconf/libs.m4 -=================================================================== -RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/libs.m4,v -retrieving revision 1.13 -diff -p -u -r1.13 libs.m4 ---- autoconf-2.59/lib/autoconf/libs.m4 6 Sep 2005 15:34:06 -0000 1.13 -+++ autoconf-2.59/lib/autoconf/libs.m4 18 Sep 2005 17:09:58 -0000 -@@ -265,13 +265,13 @@ ac_x_header_dirs=' - /usr/openwin/share/include' - - if test "$ac_x_includes" = no; then -- # Guess where to find include files, by looking for Intrinsic.h. -+ # Guess where to find include files, by looking for Xlib.h. - # First, try using that file with no special directory specified. -- AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include ])], -+ AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include ])], - [# We can compile using X headers with no special include directory. - ac_x_includes=], - [for ac_dir in $ac_x_header_dirs; do -- if test -r "$ac_dir/X11/Intrinsic.h"; then -+ if test -r "$ac_dir/X11/Xlib.h"; then - ac_x_includes=$ac_dir - break - fi -@@ -284,9 +284,9 @@ if test "$ac_x_libraries" = no; then - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS -- LIBS="-lXt $LIBS" -- AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include ], -- [XtMalloc (0)])], -+ LIBS="-lX11 $LIBS" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include ], -+ [XrmInitialize ()])], - [LIBS=$ac_save_LIBS - # We can link X programs with no special library path. - ac_x_libraries=], diff --git a/recipes/autoconf/autoconf-2.59/autoconf259-update-configscripts.patch b/recipes/autoconf/autoconf-2.59/autoconf259-update-configscripts.patch deleted file mode 100644 index 77be3c647c..0000000000 --- a/recipes/autoconf/autoconf-2.59/autoconf259-update-configscripts.patch +++ /dev/null @@ -1,393 +0,0 @@ ---- autoconf-2.59/config/config.guess.old 2003-10-23 10:28:51.000000000 -0400 -+++ autoconf-2.59/config/config.guess 2004-04-24 22:36:28.000000000 -0400 -@@ -3,7 +3,7 @@ - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. - --timestamp='2003-10-03' -+timestamp='2004-03-12' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -197,12 +197,18 @@ - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit 0 ;; -+ amd64:OpenBSD:*:*) -+ echo x86_64-unknown-openbsd${UNAME_RELEASE} -+ exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; -+ cats:OpenBSD:*:*) -+ echo arm-unknown-openbsd${UNAME_RELEASE} -+ exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; -@@ -221,6 +227,9 @@ - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; -+ pegasos:OpenBSD:*:*) -+ echo powerpc-unknown-openbsd${UNAME_RELEASE} -+ exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; -@@ -236,10 +245,24 @@ - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; -+ *:ekkoBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} -+ exit 0 ;; -+ macppc:MirBSD:*:*) -+ echo powerppc-unknown-mirbsd${UNAME_RELEASE} -+ exit 0 ;; -+ *:MirBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} -+ exit 0 ;; - alpha:OSF1:*:*) -- if test $UNAME_RELEASE = "V4.0"; then -+ case $UNAME_RELEASE in -+ *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` -- fi -+ ;; -+ *5.*) -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ ;; -+ esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU -@@ -277,11 +300,12 @@ - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac -+ # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. -- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; - Alpha*:OpenVMS:*:*) - echo alpha-hp-vms -@@ -307,6 +331,9 @@ - *:OS/390:*:*) - echo i370-ibm-openedition - exit 0 ;; -+ *:OS400:*:*) -+ echo powerpc-ibm-os400 -+ exit 0 ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; -@@ -399,6 +426,9 @@ - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; -+ m68k:machten:*:*) -+ echo m68k-apple-machten${UNAME_RELEASE} -+ exit 0 ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; -@@ -742,6 +772,11 @@ - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; -+ 5000:UNIX_System_V:4.*:*) -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit 0 ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; -@@ -751,7 +786,7 @@ - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; -- *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) -+ *:FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -763,7 +798,7 @@ - #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -- # GNU/FreeBSD systems have a "k" prefix to indicate we are using -+ # GNU/KFreeBSD systems have a "k" prefix to indicate we are using - # FreeBSD's kernel, but not the complete OS. - case ${LIBC} in gnu) kernel_only='k' ;; esac - echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} -@@ -799,8 +834,13 @@ - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - *:GNU:*:*) -+ # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; -+ *:GNU/*:*:*) -+ # other systems with GNU libc and userland -+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu -+ exit 0 ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; -@@ -813,6 +853,9 @@ - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; -+ m32r*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit 0 ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; -@@ -981,6 +1024,9 @@ - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; -+ i*86:syllable:*:*) -+ echo ${UNAME_MACHINE}-pc-syllable -+ exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; -@@ -1052,7 +1098,7 @@ - exit 0 ;; - M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; -- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) -+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` -@@ -1167,7 +1213,7 @@ - *:QNX:*:4*) - echo i386-pc-qnx - exit 0 ;; -- NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*) -+ NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; - *:NonStop-UX:*:*) -@@ -1211,6 +1257,9 @@ - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; -+ *:DragonFly:*:*) -+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -+ exit 0 ;; - esac - - #echo '(No uname command or uname output not recognized.)' 1>&2 ---- autoconf-2.59/config/config.sub.old 2003-10-23 10:28:51.000000000 -0400 -+++ autoconf-2.59/config/config.sub 2004-04-24 22:36:28.000000000 -0400 -@@ -3,7 +3,7 @@ - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. - --timestamp='2003-08-18' -+timestamp='2004-03-12' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -118,7 +118,8 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) -+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ -+ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -@@ -236,7 +237,7 @@ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -- | m32r | m68000 | m68k | m88k | mcore \ -+ | m32r | m32rle | m68000 | m68k | m88k | mcore \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -@@ -261,7 +262,7 @@ - | pyramid \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ -- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ -+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ -@@ -307,7 +308,7 @@ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ -- | m32r-* \ -+ | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ -@@ -335,7 +336,7 @@ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ -- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tron-* \ -@@ -362,6 +363,9 @@ - basic_machine=a29k-amd - os=-udi - ;; -+ abacus) -+ basic_machine=abacus-unknown -+ ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout -@@ -379,6 +383,9 @@ - amd64) - basic_machine=x86_64-pc - ;; -+ amd64-*) -+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - amdahl) - basic_machine=580-amdahl - os=-sysv -@@ -438,12 +445,20 @@ - basic_machine=j90-cray - os=-unicos - ;; -+ cr16c) -+ basic_machine=cr16c-unknown -+ os=-elf -+ ;; - crds | unos) - basic_machine=m68k-crds - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; -+ crx) -+ basic_machine=crx-unknown -+ os=-elf -+ ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; -@@ -743,6 +758,10 @@ - basic_machine=or32-unknown - os=-coff - ;; -+ os400) -+ basic_machine=powerpc-ibm -+ os=-os400 -+ ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose -@@ -963,6 +982,10 @@ - tower | tower-32) - basic_machine=m68k-ncr - ;; -+ tpf) -+ basic_machine=s390x-ibm -+ os=-tpf -+ ;; - udi29k) - basic_machine=a29k-amd - os=-udi -@@ -1058,7 +1081,7 @@ - sh64) - basic_machine=sh64-unknown - ;; -- sparc | sparcv9 | sparcv9b) -+ sparc | sparcv8 | sparcv9 | sparcv9b) - basic_machine=sparc-sun - ;; - cydra) -@@ -1131,19 +1154,20 @@ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ -- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ -- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ -+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ -+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ -+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ -+ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ -- | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) -+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1182,6 +1206,9 @@ - -opened*) - os=-openedition - ;; -+ -os400*) -+ os=-os400 -+ ;; - -wince*) - os=-wince - ;; -@@ -1203,6 +1230,9 @@ - -atheos*) - os=-atheos - ;; -+ -syllable*) -+ os=-syllable -+ ;; - -386bsd) - os=-bsd - ;; -@@ -1225,6 +1255,9 @@ - -sinix*) - os=-sysv4 - ;; -+ -tpf*) -+ os=-tpf -+ ;; - -triton*) - os=-sysv3 - ;; -@@ -1473,9 +1506,15 @@ - -mvs* | -opened*) - vendor=ibm - ;; -+ -os400*) -+ vendor=ibm -+ ;; - -ptx*) - vendor=sequent - ;; -+ -tpf*) -+ vendor=ibm -+ ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; diff --git a/recipes/autoconf/autoconf-2.59/autoheader-nonfatal-warnings.patch b/recipes/autoconf/autoconf-2.59/autoheader-nonfatal-warnings.patch deleted file mode 100644 index 1f18e04bba..0000000000 --- a/recipes/autoconf/autoconf-2.59/autoheader-nonfatal-warnings.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- autoconf-2.59/bin/autoheader.in~ 2003-10-10 14:52:56.000000000 +0100 -+++ autoconf-2.59/bin/autoheader.in 2004-05-03 01:36:45.000000000 +0100 -@@ -272,8 +272,8 @@ - } - - } -- exit 1 -- if keys %symbol; -+# exit 1 -+# if keys %symbol; - } - - update_file ("$tmp/config.hin", "$config_h_in"); diff --git a/recipes/autoconf/autoconf-2.59/autoreconf-exclude.patch b/recipes/autoconf/autoconf-2.59/autoreconf-exclude.patch deleted file mode 100644 index 7644955519..0000000000 --- a/recipes/autoconf/autoconf-2.59/autoreconf-exclude.patch +++ /dev/null @@ -1,125 +0,0 @@ ---- autoconf-2.59/bin/autoreconf.in 2004-05-06 00:27:34.000000000 -0400 -+++ autoconf-2.59.new/bin/autoreconf.in 2004-05-06 00:27:46.000000000 -0400 -@@ -75,6 +75,7 @@ - -f, --force consider all files obsolete - -i, --install copy missing auxiliary files - -s, --symlink with -i, install symbolic links instead of copies -+ -x, --exclude=STEPS steps we should not run - -m, --make when applicable, re-run ./configure && make - -W, --warnings=CATEGORY report the warnings falling in CATEGORY [syntax] - -@@ -127,6 +128,13 @@ - # Rerun `./configure && make'? - my $make = 0; - -+# Steps to exclude -+my @exclude; -+my @ex; -+ -+my $uses_gettext; -+my $configure_ac; -+ - ## ---------- ## - ## Routines. ## - ## ---------- ## -@@ -144,6 +152,7 @@ - 'B|prepend-include=s' => \@prepend_include, - 'i|install' => \$install, - 's|symlink' => \$symlink, -+ 'x|exclude=s' => \@exclude, - 'm|make' => \$make); - - # Split the warnings as a list of elements instead of a list of -@@ -152,6 +161,8 @@ - parse_WARNINGS; - parse_warnings '--warnings', @warning; - -+ @exclude = map { split /,/ } @exclude; -+ - # Even if the user specified a configure.ac, trim to get the - # directory, and look for configure.ac again. Because (i) the code - # is simpler, and (ii) we are still able to diagnose simultaneous -@@ -237,6 +249,11 @@ - { - my ($aclocal, $flags) = @_; - -+ @ex = grep (/^aclocal$/, @exclude); -+ if ($#ex != -1) { -+ return; -+ } -+ - # aclocal 1.8+ does all this for free. It can be recognized by its - # --force support. - if ($aclocal_supports_force) -@@ -348,7 +365,10 @@ - } - else - { -- xsystem "$autopoint"; -+ @ex = grep (/^autopoint$/, @exclude); -+ if ($#ex == -1) { -+ xsystem ("$autopoint"); -+ } - } - - -@@ -501,7 +521,10 @@ - } - elsif ($install) - { -- xsystem ($libtoolize); -+ @ex = grep (/^libtoolize$/, @exclude); -+ if ($#ex == -1) { -+ xsystem ("$libtoolize"); -+ } - $rerun_aclocal = 1; - } - else -@@ -541,7 +564,10 @@ - # latter runs the former, and (ii) autoconf is stricter than - # autoheader. So all in all, autoconf should give better error - # messages. -- xsystem ($autoconf); -+ @ex = grep (/^autoconf$/, @exclude); -+ if ($#ex == -1) { -+ xsystem ("$autoconf"); -+ } - - - # -------------------- # -@@ -562,7 +588,10 @@ - } - else - { -- xsystem ($autoheader); -+ @ex = grep (/^autoheader$/, @exclude); -+ if ($#ex == -1) { -+ xsystem ("$autoheader"); -+ } - } - - -@@ -580,7 +609,10 @@ - # We should always run automake, and let it decide whether it shall - # update the file or not. In fact, the effect of `$force' is already - # included in `$automake' via `--no-force'. -- xsystem ($automake); -+ @ex = grep (/^automake$/, @exclude); -+ if ($#ex == -1) { -+ xsystem ("$automake"); -+ } - } - - -@@ -604,7 +636,10 @@ - } - else - { -- xsystem ("make"); -+ @ex = grep (/^make$/, @exclude); -+ if ($#ex == -1) { -+ xsystem ("make"); -+ } - } - } - } diff --git a/recipes/autoconf/autoconf-2.59/autoreconf-foreign.patch b/recipes/autoconf/autoconf-2.59/autoreconf-foreign.patch deleted file mode 100644 index 587a823826..0000000000 --- a/recipes/autoconf/autoconf-2.59/autoreconf-foreign.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- autoconf-2.59/bin/autoreconf.in~autoreconf-foreign 2004-05-09 20:55:06.000000000 -0400 -+++ autoconf-2.59/bin/autoreconf.in 2004-05-09 20:55:55.000000000 -0400 -@@ -184,6 +184,8 @@ - - $aclocal_supports_force = `$aclocal --help` =~ /--force/; - -+ $automake .= ' --foreign'; -+ - # Dispatch autoreconf's option to the tools. - # --include; - $autoconf .= join (' --include=', '', @include); diff --git a/recipes/autoconf/autoconf-2.59/autoreconf-gnuconfigize.patch b/recipes/autoconf/autoconf-2.59/autoreconf-gnuconfigize.patch deleted file mode 100644 index 44709d550a..0000000000 --- a/recipes/autoconf/autoconf-2.59/autoreconf-gnuconfigize.patch +++ /dev/null @@ -1,47 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- autoconf-2.59/bin/autoreconf.in~autoreconf-gnuconfigize 2004-05-14 19:04:35.000000000 -0500 -+++ autoconf-2.59/bin/autoreconf.in 2004-05-14 19:07:34.000000000 -0500 -@@ -58,7 +58,7 @@ - $help = "Usage: $0 [OPTION] ... [CONFIGURE-AC or DIRECTORY] ... - - Run `autoconf' (and `autoheader', `aclocal', `automake', `autopoint' --(formerly `gettextize'), and `libtoolize' where appropriate) -+(formerly `gettextize'), `libtoolize', and `gnu-configize' where appropriate) - repeatedly to remake the GNU Build System files in the DIRECTORIES or - the directory trees driven by CONFIGURE-AC (defaulting to `.'). - -@@ -105,12 +105,13 @@ - "; - - # Lib files. --my $autoconf = $ENV{'AUTOCONF'} || '@bindir@/@autoconf-name@'; --my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@'; --my $automake = $ENV{'AUTOMAKE'} || 'automake'; --my $aclocal = $ENV{'ACLOCAL'} || 'aclocal'; --my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; --my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; -+my $autoconf = $ENV{'AUTOCONF'} || '@bindir@/@autoconf-name@'; -+my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@'; -+my $automake = $ENV{'AUTOMAKE'} || 'automake'; -+my $aclocal = $ENV{'ACLOCAL'} || 'aclocal'; -+my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; -+my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; -+my $gnuconfigize = $ENV{'GNUCONFIGIZE'} || 'gnu-configize'; - - # --install -- as --add-missing in other tools. - my $install = 0; -@@ -617,6 +618,10 @@ - } - } - -+ @ex = grep (/^gnu-configize$/, @exclude); -+ if ($#ex == -1) { -+ xsystem ("$gnuconfigize"); -+ } - - # -------------- # - # Running make. # diff --git a/recipes/autoconf/autoconf-2.59/autoreconf-include.patch b/recipes/autoconf/autoconf-2.59/autoreconf-include.patch deleted file mode 100644 index 5a7604b0fd..0000000000 --- a/recipes/autoconf/autoconf-2.59/autoreconf-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- autoconf/bin/autoreconf.in~ 2004-04-06 23:36:10.000000000 +0100 -+++ autoconf/bin/autoreconf.in 2004-04-08 20:51:57.000000000 +0100 -@@ -179,6 +179,7 @@ - $autoconf .= join (' --prepend-include=', '', @prepend_include); - $autoheader .= join (' --include=', '', @include); - $autoheader .= join (' --prepend-include=', '', @prepend_include); -+ $aclocal .= join (' -I ', '', @include); - - # --install and --symlink; - if ($install) diff --git a/recipes/autoconf/autoconf-2.59/program_prefix.patch b/recipes/autoconf/autoconf-2.59/program_prefix.patch deleted file mode 100644 index e6f4096a97..0000000000 --- a/recipes/autoconf/autoconf-2.59/program_prefix.patch +++ /dev/null @@ -1,19 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- autoconf-2.57/lib/autoconf/general.m4~program_prefix -+++ autoconf-2.57/lib/autoconf/general.m4 -@@ -1676,8 +1676,9 @@ - # The aliases save the names the user supplied, while $host etc. - # will get canonicalized. - test -n "$target_alias" && -- test "$program_prefix$program_suffix$program_transform_name" = \ -- NONENONEs,x,x, && -+ test "$target_alias" != "$host_alias" && -+ test "$program_prefix$program_suffix$program_transform_name" = \ -+ NONENONEs,x,x, && - program_prefix=${target_alias}-[]dnl - ])# AC_CANONICAL_TARGET - diff --git a/recipes/autoconf/autoconf-2.59/sizeof_types.patch b/recipes/autoconf/autoconf-2.59/sizeof_types.patch deleted file mode 100644 index 30fd5c1926..0000000000 --- a/recipes/autoconf/autoconf-2.59/sizeof_types.patch +++ /dev/null @@ -1,87 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - -Index: autoconf-2.59/lib/autoconf/types.m4 -=================================================================== ---- autoconf-2.59.orig/lib/autoconf/types.m4 2003-05-22 14:05:14.000000000 +0200 -+++ autoconf-2.59/lib/autoconf/types.m4 2006-08-06 02:05:02.000000000 +0200 -@@ -380,26 +380,66 @@ - # Generic checks. # - # ---------------- # - -+# Backport of AC_CHECK_TARGET_TOOL from autoconf 2.60 -+# AC_CHECK_TARGET_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH ) -+# ------------------------------------------------------------------------ -+# (Use different variables $1 and ac_ct_$1 so that cache vars don't conflict.) -+AC_DEFUN([AC_CHECK_TARGET_TOOL], -+[AC_BEFORE([$0], [AC_CANONICAL_TARGET])dnl -+AC_CHECK_PROG([$1], [$target_alias-$2], [$target_alias-$2], , [$4]) -+if test -z "$ac_cv_prog_$1"; then -+ if test "$build" = "$target"; then -+ ac_ct_$1=$$1 -+ AC_CHECK_PROG([ac_ct_$1], [$2], [$2], [$3], [$4]) -+ $1=ac_ct_$1 -+ else -+ $1="$3" -+ fi -+else -+ $1="$ac_cv_prog_$1" -+fi -+])# AC_CHECK_TARGET_TOOL -+ -+ -+AC_DEFUN([AC_PROG_SIZE], -+[ -+ AC_CHECK_TARGET_TOOL([SIZE], [size], [size], [$PATH]) -+]) - - # AC_CHECK_SIZEOF(TYPE, [IGNORED], [INCLUDES = DEFAULT-INCLUDES]) - # --------------------------------------------------------------- - AC_DEFUN([AC_CHECK_SIZEOF], --[AS_LITERAL_IF([$1], [], -+[AC_REQUIRE([AC_PROG_SIZE]) -+AC_REQUIRE([AC_PROG_AWK]) -+ AS_LITERAL_IF([$1], [], - [AC_FATAL([$0: requires literal arguments])])dnl - AC_CHECK_TYPE([$1], [], [], [$3]) - AC_CACHE_CHECK([size of $1], AS_TR_SH([ac_cv_sizeof_$1]), --[if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then -- # The cast to unsigned long works around a bug in the HP C Compiler -- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -- # This bug is HP SR number 8606223364. -- _AC_COMPUTE_INT([(long) (sizeof ($1))], -- [AS_TR_SH([ac_cv_sizeof_$1])], -- [AC_INCLUDES_DEFAULT([$3])], -- [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])]) -+[ -+if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then -+ if test "$cross_compiling" = yes; then -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])], -+ [extern void dummy($1); static const $1 x[[256]]; dummy(x);])], -+ [ -+ AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'` -+ ], -+ [ -+ AS_TR_SH([ac_cv_sizeof_$1])=0 -+ ]) -+ else -+ # The cast to unsigned long works around a bug in the HP C Compiler -+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+ # This bug is HP SR number 8606223364. -+ _AC_COMPUTE_INT([(long) (sizeof ($1))], -+ [AS_TR_SH([ac_cv_sizeof_$1])], -+ [AC_INCLUDES_DEFAULT([$3])], -+ [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])]) -+ fi - else - AS_TR_SH([ac_cv_sizeof_$1])=0 --fi])dnl -+fi -+])dnl - AC_DEFINE_UNQUOTED(AS_TR_CPP(sizeof_$1), $AS_TR_SH([ac_cv_sizeof_$1]), - [The size of a `$1', as computed by sizeof.]) - ])# AC_CHECK_SIZEOF diff --git a/recipes/autoconf/autoconf213-native_2.13.bb b/recipes/autoconf/autoconf213-native_2.13.bb deleted file mode 100644 index 97d441397e..0000000000 --- a/recipes/autoconf/autoconf213-native_2.13.bb +++ /dev/null @@ -1,11 +0,0 @@ -require autoconf213_${PV}.bb - -DEPENDS = "m4-native gnu-config-native" -RDEPENDS_${PN} = "m4-native gnu-config-native" - -S = "${WORKDIR}/autoconf-${PV}" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/autoconf-${PV}" - -inherit native -PR = "${INC_PR}.0" - diff --git a/recipes/autoconf/autoconf213_2.13.bb b/recipes/autoconf/autoconf213_2.13.bb deleted file mode 100644 index 98f629fcf1..0000000000 --- a/recipes/autoconf/autoconf213_2.13.bb +++ /dev/null @@ -1,8 +0,0 @@ -require autoconf.inc -SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz" -EXTRA_OECONF = "--program-transform-name=s/\$/2.13/" -EXTRA_OEMAKE = 'acdatadir="${datadir}/autoconf-${PV}" infodir="${datadir}/autoconf-${PV}/info"' -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "9de56d4a161a723228220b0f425dc711" -SRC_URI[sha256sum] = "f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e" diff --git a/recipes/autoconf/autoconf_2.57.bb b/recipes/autoconf/autoconf_2.57.bb deleted file mode 100644 index e3fa6febc9..0000000000 --- a/recipes/autoconf/autoconf_2.57.bb +++ /dev/null @@ -1,5 +0,0 @@ -require autoconf.inc -PR = "${INC_PR}.0" - -SRC_URI[autoconf.md5sum] = "407ea53787ce13f5ca427e9a51e05bc2" -SRC_URI[autoconf.sha256sum] = "e1035aa2c21fae2a934d1ab56c774ce9d22717881dab8a1a5b16d294fb793489" diff --git a/recipes/autoconf/autoconf_2.59.bb b/recipes/autoconf/autoconf_2.59.bb deleted file mode 100644 index 13a2f1deef..0000000000 --- a/recipes/autoconf/autoconf_2.59.bb +++ /dev/null @@ -1,16 +0,0 @@ -require autoconf.inc - -PR = "${INC_PR}.0" - -SRC_URI += "file://autoreconf-include.patch \ - file://autoreconf-exclude.patch \ - file://autoreconf-foreign.patch \ - file://autoreconf-gnuconfigize.patch \ - file://autoconf259-update-configscripts.patch \ - file://autoheader-nonfatal-warnings.patch \ - file://sizeof_types.patch \ - file://autoconf-x.patch \ - file://autoconf-sh.patch" - -SRC_URI[autoconf.md5sum] = "1ee40f7a676b3cfdc0e3f7cd81551b5f" -SRC_URI[autoconf.sha256sum] = "f0cde70a8f135098a6a3e85869f2e1cc3f141beea766fa3d6636e086cd8b90a7" -- cgit v1.2.3 From b48cd835b4cf09ade37170eca3923317c37adc11 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Tue, 10 Aug 2010 19:53:56 +0200 Subject: zziplib: remove old versions Signed-off-by: Frans Meulenbroeks --- recipes/zziplib/zziplib_0.10.82.bb | 8 -------- recipes/zziplib/zziplib_0.12.83.bb | 7 ------- 2 files changed, 15 deletions(-) delete mode 100644 recipes/zziplib/zziplib_0.10.82.bb delete mode 100644 recipes/zziplib/zziplib_0.12.83.bb diff --git a/recipes/zziplib/zziplib_0.10.82.bb b/recipes/zziplib/zziplib_0.10.82.bb deleted file mode 100644 index 12b6b2f516..0000000000 --- a/recipes/zziplib/zziplib_0.10.82.bb +++ /dev/null @@ -1,8 +0,0 @@ -require zziplib.inc - -SRC_URI += "file://zziplib-0.10-disable-test.patch" - -PR = "r1" - -SRC_URI[md5sum] = "a6538f6c44ceeed0ed7e8e356f444168" -SRC_URI[sha256sum] = "f684397ce39ec400ba3369521892b7c3a8711d3ef1be59115db9f8d57707bbb8" diff --git a/recipes/zziplib/zziplib_0.12.83.bb b/recipes/zziplib/zziplib_0.12.83.bb deleted file mode 100644 index 7cb4c48cc8..0000000000 --- a/recipes/zziplib/zziplib_0.12.83.bb +++ /dev/null @@ -1,7 +0,0 @@ -require zziplib.inc - -SRC_URI += "file://zziplib-buildfix.patch" - - -SRC_URI[md5sum] = "4943ab7aa141af2c339266cd66b05c74" -SRC_URI[sha256sum] = "5cc1a53bb909922596bdd0fa967b654fe1bfbe0dcf1d34608f0b7c90e0c27867" -- cgit v1.2.3 From cdf13c967f6d86325ca577c0faa44dd593d7463e Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 10 Aug 2010 18:34:52 +0000 Subject: initscripts: Fixed empty machine_id returned on some devices. Signed-off-by: Stanislav Brabec --- recipes/initscripts/files/functions | 2 +- recipes/initscripts/initscripts_1.0.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/initscripts/files/functions b/recipes/initscripts/files/functions index 51c1f13261..b9dca1f96b 100644 --- a/recipes/initscripts/files/functions +++ b/recipes/initscripts/files/functions @@ -6,7 +6,7 @@ machine_id() { # return the machine ID id=`awk 'BEGIN { FS=": " } /Hardware/ { gsub(" ", "_", $2); print tolower($2) } ' Date: Sat, 7 Aug 2010 10:02:59 +0000 Subject: advancedcaching: new version 0.6.1.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian Rüb Signed-off-by: Martin Jansa --- recipes/openmoko-3rdparty/advancedcaching_git.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/recipes/openmoko-3rdparty/advancedcaching_git.bb b/recipes/openmoko-3rdparty/advancedcaching_git.bb index fda99b95fe..8301eb73ef 100644 --- a/recipes/openmoko-3rdparty/advancedcaching_git.bb +++ b/recipes/openmoko-3rdparty/advancedcaching_git.bb @@ -2,11 +2,12 @@ DESCRIPTION = "Advanced Geocaching Tool for Linux - Towards paperless geocaching SECTION = "devel/python" PRIORITY = "optional" LICENSE = "GPL" -HOMEPAGE = "http://www.opkg.org/package_268.html" +AUTHOR = "Daniel Fett" +HOMEPAGE = "http://www.danielfett.de/internet-und-opensource,software,agtl" RDEPENDS_${PN} = "python-pygtk python-html python-image python-netclient python-misc python-sqlite3 python-mime python-json" -SRCREV = "9c3661f5573d2dd712437f1590070153d12e4c02" -PV = "0.1.2+gitr${SRCPV}" -PR = "r1" +SRCREV = "45a42994753fb396840890dd756b118790b8989e" +PV = "0.6.1.5+gitr${SRCPV}" +PR = "r2" SRC_URI = "git://github.com/webhamster/advancedcaching.git;protocol=git;branch=master" -- cgit v1.2.3 From 75cbe0974c9d7bc7fe9ad1312be2b768d870bb54 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 10 Aug 2010 20:35:01 +0200 Subject: elementary-theme-gry: bump SRCREV Signed-off-by: Martin Jansa --- recipes/shr/elementary-theme-gry_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/shr/elementary-theme-gry_git.bb b/recipes/shr/elementary-theme-gry_git.bb index ff9d0f5b95..fe1e733d7f 100644 --- a/recipes/shr/elementary-theme-gry_git.bb +++ b/recipes/shr/elementary-theme-gry_git.bb @@ -6,7 +6,7 @@ DEPENDS = "edje-native" RRECOMMENDS_${PN} = "e-wm-theme-illume-gry" LICENSE = "unknown" -SRCREV = "722b0dcc2b1bf79515eaaddd9ebc7819c7f923d0" +SRCREV = "7218f7db425111ef32624565c18d6406119e6c6d" PV = "0.8-${EFL_SRCREV}+gitr${SRCPV}" PR = "r2" -- cgit v1.2.3 From b1fbc3fd45c4ec04d6364bd61e758d821421fb11 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Tue, 10 Aug 2010 19:55:31 +0200 Subject: zeroconf 0.6.1: removed (5 years old) Signed-off-by: Frans Meulenbroeks --- recipes/zeroconf/zeroconf-0.6.1/busybox.patch | 13 ---------- .../zeroconf/zeroconf-0.6.1/debian-zeroconf.patch | 28 ---------------------- recipes/zeroconf/zeroconf_0.6.1.bb | 25 ------------------- 3 files changed, 66 deletions(-) delete mode 100644 recipes/zeroconf/zeroconf-0.6.1/busybox.patch delete mode 100644 recipes/zeroconf/zeroconf-0.6.1/debian-zeroconf.patch delete mode 100644 recipes/zeroconf/zeroconf_0.6.1.bb diff --git a/recipes/zeroconf/zeroconf-0.6.1/busybox.patch b/recipes/zeroconf/zeroconf-0.6.1/busybox.patch deleted file mode 100644 index 1c695612ad..0000000000 --- a/recipes/zeroconf/zeroconf-0.6.1/busybox.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- zeroconf-0.6.1/zeroconf.sh.orig 2005-08-27 21:25:07 +0200 -+++ zeroconf-0.6.1/zeroconf.sh 2005-08-27 21:26:21 +0200 -@@ -30,7 +30,9 @@ - - remove_linklocal_addrs() - { -- ip addr show $IFACE | grep "inet.*169.254" | cut -d" " -f6 | xargs --replace -n 1 ip addr del {} dev $IFACE -+ for IP in `ip addr show $IFACE | grep "inet.*169.254" | cut -d" " -f6`; do -+ ip addr delete $IP dev $IFACE -+ done - } - - case $PHASE in diff --git a/recipes/zeroconf/zeroconf-0.6.1/debian-zeroconf.patch b/recipes/zeroconf/zeroconf-0.6.1/debian-zeroconf.patch deleted file mode 100644 index 6c4008bc56..0000000000 --- a/recipes/zeroconf/zeroconf-0.6.1/debian-zeroconf.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- zeroconf-0.6.1.orig/debian-zeroconf -+++ zeroconf-0.6.1/debian-zeroconf -@@ -19,6 +19,8 @@ - [ -f /etc/default/zeroconf ] && - . /etc/default/zeroconf - -+[ -n "$DISABLE" ] && exit 0 -+ - for BLACK in $IFBLACKLIST; do - case $IFACE in - $BLACK) -@@ -31,7 +33,6 @@ - if [ -n "$FALLBACK" ]; then - /bin/ip addr show $IFACE scope global | grep -q "inet" - IP=$? -- [ $IP -eq 0 ] && exit 0 - if [ $IP -eq 0 ]; then - /bin/ip route add 169.254.0.0/16 dev $IFACE - exit 0 -@@ -39,6 +40,6 @@ - fi - - # otherwise, we are good to go --/usr/local/sbin/zeroconf -i $IFACE -+/usr/sbin/zeroconf -i $IFACE - - exit 0 - diff --git a/recipes/zeroconf/zeroconf_0.6.1.bb b/recipes/zeroconf/zeroconf_0.6.1.bb deleted file mode 100644 index 093cf3067e..0000000000 --- a/recipes/zeroconf/zeroconf_0.6.1.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "IPv4 link-local address allocator" -HOMEPAGE = "http://www.progsoc.org/~wildfire/zeroconf/" -LICENSE = "GPL" -SECTION = "net" -PRIORITY = "optional" - -PR = "r0" - -SRC_URI = "http://www.progsoc.org/~wildfire/zeroconf/download/${PN}-${PV}.tar.gz \ - file://debian-zeroconf.patch \ - file://busybox.patch \ - file://zeroconf-default" - -do_install () { - install -d ${D}${sbindir} - install -d ${D}${sysconfdir}/network/if-up.d - install -d ${D}${sysconfdir}/default - install -c -m 755 ${S}/zeroconf ${D}${sbindir}/zeroconf - install -c -m 755 ${S}/zeroconf.sh ${D}${sysconfdir}/zeroconf - install -c -m 755 ${S}/debian-zeroconf ${D}${sysconfdir}/network/if-up.d/zeroconf - install -c ${WORKDIR}/zeroconf-default ${D}${sysconfdir}/default/zeroconf -} - -SRC_URI[md5sum] = "31ac40fdaf24b3e666ed83c1320dd7a5" -SRC_URI[sha256sum] = "3e93416ad44202c2952a1342dad12f2ad0e61dd3f1c59110d9ad8cb1d4c639e5" -- cgit v1.2.3 From 6c51e308c76296bb4cfee4b64897d2f29ddb989c Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Tue, 10 Aug 2010 20:48:50 +0200 Subject: zeroconf: renamed files to zeroconf-0.9 Signed-off-by: Frans Meulenbroeks --- recipes/zeroconf/files/debian-zeroconf | 51 ---------------------- recipes/zeroconf/files/zeroconf-default | 17 -------- recipes/zeroconf/files/zeroconf-ldflags.patch | 12 ----- recipes/zeroconf/files/zeroconf-limits.h.patch | 21 --------- recipes/zeroconf/zeroconf-0.9/debian-zeroconf | 51 ++++++++++++++++++++++ recipes/zeroconf/zeroconf-0.9/zeroconf-default | 17 ++++++++ .../zeroconf/zeroconf-0.9/zeroconf-ldflags.patch | 12 +++++ .../zeroconf/zeroconf-0.9/zeroconf-limits.h.patch | 21 +++++++++ 8 files changed, 101 insertions(+), 101 deletions(-) delete mode 100644 recipes/zeroconf/files/debian-zeroconf delete mode 100644 recipes/zeroconf/files/zeroconf-default delete mode 100644 recipes/zeroconf/files/zeroconf-ldflags.patch delete mode 100644 recipes/zeroconf/files/zeroconf-limits.h.patch create mode 100644 recipes/zeroconf/zeroconf-0.9/debian-zeroconf create mode 100644 recipes/zeroconf/zeroconf-0.9/zeroconf-default create mode 100644 recipes/zeroconf/zeroconf-0.9/zeroconf-ldflags.patch create mode 100644 recipes/zeroconf/zeroconf-0.9/zeroconf-limits.h.patch diff --git a/recipes/zeroconf/files/debian-zeroconf b/recipes/zeroconf/files/debian-zeroconf deleted file mode 100644 index c3705d2788..0000000000 --- a/recipes/zeroconf/files/debian-zeroconf +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh - -if [ ! -x /usr/sbin/zeroconf ]; then - exit 0 -fi - -# IPv4 link-local addresses (zeroconf) are -# only applicable on the 'inet' address family -[ "X$ADDRFAM" != "Xinet" ] && exit 0 - -# However there are some methods where it doesn't -# make any sense to configure an IPv4LL address - -# not on loopback -[ "X$METHOD" = "Xloopback" ] && exit 0 - -# not on ppp or wvdial either -[ "X$METHOD" = "Xppp" ] && exit 0 -[ "X$METHOD" = "Xwvdial" ] && exit 0 - -# The administrator may have blacklisted interfaces -# or only want zeroconf in a fallback situation -[ -f /etc/default/zeroconf ] && - . /etc/default/zeroconf - -[ -n "$DISABLE" ] && exit 0 - -for BLACK in $IFBLACKLIST; do - case $IFACE in - $BLACK) - exit 0 - ;; - esac -done - -# should we only allocate an address if we do not already have one? -if [ -n "$FALLBACK" ]; then - /bin/ip addr show $IFACE scope global | grep -q "inet" - IP=$? - if [ $IP -eq 0 ]; then - /bin/ip route add 169.254.0.0/16 dev $IFACE - exit 0 - fi -fi - -# otherwise, run if we aren't already going -if [ ! -r /var/run/zeroconf.$IFACE.pid ]; then - /usr/sbin/zeroconf -i $IFACE -fi - -exit 0 diff --git a/recipes/zeroconf/files/zeroconf-default b/recipes/zeroconf/files/zeroconf-default deleted file mode 100644 index cc07b275f1..0000000000 --- a/recipes/zeroconf/files/zeroconf-default +++ /dev/null @@ -1,17 +0,0 @@ -# Default for zeroconf - -# disable zeroconf -# If you want to disable zeroconf completely, uncomment the following line -# this may be useful if you are debugging zeroconf or starting it manually -#DISABLE=yes - -# black-listed interfaces -# Interfaces which you never wish to have zeroconf run on should -# be listed here. e.g. "eth2 wlan1" in a space seperated string -IFBLACKLIST="" - -# fallback only -# If you would only like a link-local address if you were unable to -# obtain an address via DHCP then uncomment the following line -#FALLBACK=yes - diff --git a/recipes/zeroconf/files/zeroconf-ldflags.patch b/recipes/zeroconf/files/zeroconf-ldflags.patch deleted file mode 100644 index ba6056953e..0000000000 --- a/recipes/zeroconf/files/zeroconf-ldflags.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN zeroconf-0.9.orig/Makefile zeroconf-0.9/Makefile ---- zeroconf-0.9.orig/Makefile 2006-04-29 10:41:15.000000000 +0000 -+++ zeroconf-0.9/Makefile 2009-04-02 09:27:38.000000000 +0000 -@@ -18,7 +18,7 @@ - - zeroconf: zeroconf.o delay.o - $(Q)echo "Creating $@" -- $(Q)$(CC) $(CFLAGS) -o $@ $^ $(LIBS) -+ $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) - - - # Automatic dependency generation diff --git a/recipes/zeroconf/files/zeroconf-limits.h.patch b/recipes/zeroconf/files/zeroconf-limits.h.patch deleted file mode 100644 index 46ba208fa5..0000000000 --- a/recipes/zeroconf/files/zeroconf-limits.h.patch +++ /dev/null @@ -1,21 +0,0 @@ -In newer glibc after this commit. - -http://sourceware.org/cgi-bin/cvsweb.cgi/libc/sysdeps/unix/sysv/linux/bits/socket.h.diff?r1=1.60&r2=1.61&cvsroot=glibc - - -do not include limits.h indirectly through sockets.h so we would need to include limits.h explicitely. - --Khem - -Index: zeroconf-0.9/zeroconf.c -=================================================================== ---- zeroconf-0.9.orig/zeroconf.c 2008-05-27 16:56:05.000000000 -0700 -+++ zeroconf-0.9/zeroconf.c 2008-05-27 16:56:20.000000000 -0700 -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - #include "delay.h" - diff --git a/recipes/zeroconf/zeroconf-0.9/debian-zeroconf b/recipes/zeroconf/zeroconf-0.9/debian-zeroconf new file mode 100644 index 0000000000..c3705d2788 --- /dev/null +++ b/recipes/zeroconf/zeroconf-0.9/debian-zeroconf @@ -0,0 +1,51 @@ +#!/bin/sh + +if [ ! -x /usr/sbin/zeroconf ]; then + exit 0 +fi + +# IPv4 link-local addresses (zeroconf) are +# only applicable on the 'inet' address family +[ "X$ADDRFAM" != "Xinet" ] && exit 0 + +# However there are some methods where it doesn't +# make any sense to configure an IPv4LL address + +# not on loopback +[ "X$METHOD" = "Xloopback" ] && exit 0 + +# not on ppp or wvdial either +[ "X$METHOD" = "Xppp" ] && exit 0 +[ "X$METHOD" = "Xwvdial" ] && exit 0 + +# The administrator may have blacklisted interfaces +# or only want zeroconf in a fallback situation +[ -f /etc/default/zeroconf ] && + . /etc/default/zeroconf + +[ -n "$DISABLE" ] && exit 0 + +for BLACK in $IFBLACKLIST; do + case $IFACE in + $BLACK) + exit 0 + ;; + esac +done + +# should we only allocate an address if we do not already have one? +if [ -n "$FALLBACK" ]; then + /bin/ip addr show $IFACE scope global | grep -q "inet" + IP=$? + if [ $IP -eq 0 ]; then + /bin/ip route add 169.254.0.0/16 dev $IFACE + exit 0 + fi +fi + +# otherwise, run if we aren't already going +if [ ! -r /var/run/zeroconf.$IFACE.pid ]; then + /usr/sbin/zeroconf -i $IFACE +fi + +exit 0 diff --git a/recipes/zeroconf/zeroconf-0.9/zeroconf-default b/recipes/zeroconf/zeroconf-0.9/zeroconf-default new file mode 100644 index 0000000000..cc07b275f1 --- /dev/null +++ b/recipes/zeroconf/zeroconf-0.9/zeroconf-default @@ -0,0 +1,17 @@ +# Default for zeroconf + +# disable zeroconf +# If you want to disable zeroconf completely, uncomment the following line +# this may be useful if you are debugging zeroconf or starting it manually +#DISABLE=yes + +# black-listed interfaces +# Interfaces which you never wish to have zeroconf run on should +# be listed here. e.g. "eth2 wlan1" in a space seperated string +IFBLACKLIST="" + +# fallback only +# If you would only like a link-local address if you were unable to +# obtain an address via DHCP then uncomment the following line +#FALLBACK=yes + diff --git a/recipes/zeroconf/zeroconf-0.9/zeroconf-ldflags.patch b/recipes/zeroconf/zeroconf-0.9/zeroconf-ldflags.patch new file mode 100644 index 0000000000..ba6056953e --- /dev/null +++ b/recipes/zeroconf/zeroconf-0.9/zeroconf-ldflags.patch @@ -0,0 +1,12 @@ +diff -urN zeroconf-0.9.orig/Makefile zeroconf-0.9/Makefile +--- zeroconf-0.9.orig/Makefile 2006-04-29 10:41:15.000000000 +0000 ++++ zeroconf-0.9/Makefile 2009-04-02 09:27:38.000000000 +0000 +@@ -18,7 +18,7 @@ + + zeroconf: zeroconf.o delay.o + $(Q)echo "Creating $@" +- $(Q)$(CC) $(CFLAGS) -o $@ $^ $(LIBS) ++ $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) + + + # Automatic dependency generation diff --git a/recipes/zeroconf/zeroconf-0.9/zeroconf-limits.h.patch b/recipes/zeroconf/zeroconf-0.9/zeroconf-limits.h.patch new file mode 100644 index 0000000000..46ba208fa5 --- /dev/null +++ b/recipes/zeroconf/zeroconf-0.9/zeroconf-limits.h.patch @@ -0,0 +1,21 @@ +In newer glibc after this commit. + +http://sourceware.org/cgi-bin/cvsweb.cgi/libc/sysdeps/unix/sysv/linux/bits/socket.h.diff?r1=1.60&r2=1.61&cvsroot=glibc + + +do not include limits.h indirectly through sockets.h so we would need to include limits.h explicitely. + +-Khem + +Index: zeroconf-0.9/zeroconf.c +=================================================================== +--- zeroconf-0.9.orig/zeroconf.c 2008-05-27 16:56:05.000000000 -0700 ++++ zeroconf-0.9/zeroconf.c 2008-05-27 16:56:20.000000000 -0700 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #include "delay.h" + -- cgit v1.2.3 From 3ebb92b7f1adc12d973909d85b88809a46053c9f Mon Sep 17 00:00:00 2001 From: Jason Kridner Date: Mon, 9 Aug 2010 13:58:56 +0000 Subject: beagleboard-test-scripts: updated to latest Signed-off-by: Jason Kridner Acked-by: Paul Menzel Signed-off-by: Denys Dmytriyenko --- recipes/beagleboard/beagleboard-test-scripts_git.bb | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/recipes/beagleboard/beagleboard-test-scripts_git.bb b/recipes/beagleboard/beagleboard-test-scripts_git.bb index d3d5fde9a0..ea3cafed0b 100644 --- a/recipes/beagleboard/beagleboard-test-scripts_git.bb +++ b/recipes/beagleboard/beagleboard-test-scripts_git.bb @@ -1,24 +1,28 @@ +## Reminder: The correct spacing for a variable is FOO = "BAR" in : PR="r1" DESCRIPTION = "BeagleBoard test scripts" HOMEPAGE = "http://beagleboad.org/support" +PR = "r1" SRC_URI = "git://gitorious.org/beagleboard-validation/scripts.git;protocol=git \ " -SRCREV = "4f4578e7423c5fb1f3364e1056d53dd3b792dc2a" +SRCREV = "f009c731df5c410eb819fa90f199713ea60cea6a" S = "${WORKDIR}/git" do_install() { TEST_FILES=" \ - testled \ - testuserbtn \ testaudio \ + testcamera \ + testedid \ + testled \ testsvideo \ - readgpio \ + testuserbtn \ editbootscr \ + edituserscr \ + readgpio \ " install -d ${D}/${bindir} for i in ${TEST_FILES}; do install -m 0755 ${S}/${i} ${D}/${bindir} done } - -- cgit v1.2.3 From 7ac33686b56eac7bd5aeb072ccba4c76253a24ef Mon Sep 17 00:00:00 2001 From: Jason Kridner Date: Mon, 9 Aug 2010 18:57:46 +0000 Subject: beagleboard-test-scripts: added new scripts testneon: runs burn-neon for 10 seconds testdsp: runs loopgpp dsplink example testmem: runs memtester Signed-off-by: Jason Kridner Signed-off-by: Denys Dmytriyenko --- recipes/beagleboard/beagleboard-test-scripts_git.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes/beagleboard/beagleboard-test-scripts_git.bb b/recipes/beagleboard/beagleboard-test-scripts_git.bb index ea3cafed0b..be0d059c98 100644 --- a/recipes/beagleboard/beagleboard-test-scripts_git.bb +++ b/recipes/beagleboard/beagleboard-test-scripts_git.bb @@ -1,20 +1,23 @@ ## Reminder: The correct spacing for a variable is FOO = "BAR" in : PR="r1" DESCRIPTION = "BeagleBoard test scripts" HOMEPAGE = "http://beagleboad.org/support" -PR = "r1" +PR = "r2" SRC_URI = "git://gitorious.org/beagleboard-validation/scripts.git;protocol=git \ " -SRCREV = "f009c731df5c410eb819fa90f199713ea60cea6a" +SRCREV = "473dd2ab20d866be6168c9f992c2c9e74e485c9d" S = "${WORKDIR}/git" do_install() { TEST_FILES=" \ testaudio \ testcamera \ + testdsp \ testedid \ testled \ + testmem \ + testneon \ testsvideo \ testuserbtn \ editbootscr \ -- cgit v1.2.3 From 7f1a5e873d4fe00128a176b40ad849cbee7d60f9 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Tue, 10 Aug 2010 21:17:36 +0200 Subject: cdparanoia_9.8alpha.bb: removed old version Signed-off-by: Frans Meulenbroeks --- recipes/cdparanoia/cdparanoia_9.8alpha.bb | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 recipes/cdparanoia/cdparanoia_9.8alpha.bb diff --git a/recipes/cdparanoia/cdparanoia_9.8alpha.bb b/recipes/cdparanoia/cdparanoia_9.8alpha.bb deleted file mode 100644 index 44c4c5ee63..0000000000 --- a/recipes/cdparanoia/cdparanoia_9.8alpha.bb +++ /dev/null @@ -1,22 +0,0 @@ -# cdparanoia OE build file -# Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) -LICENSE = "GPL" -PR = "r3" - -SRC_URI = "http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz \ - file://fixes.patch \ - file://Makefile.patch" -SRC_URI[md5sum] = "7218e778b5970a86c958e597f952f193" -SRC_URI[sha256sum] = "1b79fae1aedc692f87d1344410f5c6b666961afccdc78bc5c4c257c450dfa008" - -S = "${WORKDIR}/cdparanoia-III-alpha9.8" - -inherit autotools - -do_install() { - oe_runmake BINDIR="${D}/usr/bin" MANDIR="${D}/usr/share/man/" \ - INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install -} - -PARALLEL_MAKE = "" -- cgit v1.2.3 From ac61355f7067439c91946332124c2a5a886c9e8e Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Tue, 10 Aug 2010 08:48:50 +0000 Subject: tzcode-native: bump version to 2010k Signed-off-by: Simon Busch Signed-off-by: Roman I Khimov --- recipes/tzcode/tzcode-native_2010j.bb | 16 ---------------- recipes/tzcode/tzcode-native_2010k.bb | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 recipes/tzcode/tzcode-native_2010j.bb create mode 100644 recipes/tzcode/tzcode-native_2010k.bb diff --git a/recipes/tzcode/tzcode-native_2010j.bb b/recipes/tzcode/tzcode-native_2010j.bb deleted file mode 100644 index 7e1ae7786c..0000000000 --- a/recipes/tzcode/tzcode-native_2010j.bb +++ /dev/null @@ -1,16 +0,0 @@ -require tzcode-native.inc - -# Note that elsie.nci.nih.gov removes old versions when new is coming out -# So if this doesn't build for you because of missing source file, just -# bump it to the latest available version, removing old one -# Also, tzdata (and it is needed to build tzcode) version can differ from -# tzcode version, thus this variable - -TZDATA_PV = "2010j" - -SRC_URI[tzcode-2010j.md5sum] = "5ba8345720296d3a659b349b2052d139" -SRC_URI[tzcode-2010j.sha256sum] = "f32b46405190e3a5f1ee4db9fb50aaf1379e6af4e5493402ebfc8ee757058e97" -SRC_URI[tzdata-2010j.md5sum] = "f668f66b260e14b477eac3f48bcfb5f4" -SRC_URI[tzdata-2010j.sha256sum] = "dcf2101d0c5bb20a7f182866ea3e52b54c8f4d129c025a96c9a31377676f554b" - -PR = "${INC_PR}.0" diff --git a/recipes/tzcode/tzcode-native_2010k.bb b/recipes/tzcode/tzcode-native_2010k.bb new file mode 100644 index 0000000000..21796d6f66 --- /dev/null +++ b/recipes/tzcode/tzcode-native_2010k.bb @@ -0,0 +1,16 @@ +require tzcode-native.inc + +# Note that elsie.nci.nih.gov removes old versions when new is coming out +# So if this doesn't build for you because of missing source file, just +# bump it to the latest available version, removing old one +# Also, tzdata (and it is needed to build tzcode) version can differ from +# tzcode version, thus this variable + +TZDATA_PV = "2010k" + +SRC_URI[tzcode-2010k.md5sum] = "63cd2199679c91bed972a0248d6916af" +SRC_URI[tzcode-2010k.sha256sum] = "96671eac3a98d0c974833c8bfa7ea9b537cc9d32573e902103846b90f6dccdbd" +SRC_URI[tzdata-2010k.md5sum] = "5e2086249d6a6bb116534d358661ad3f" +SRC_URI[tzdata-2010k.sha256sum] = "ef69c99504c0fd9864ba8ef1daae5f2d4df097cf7dc350f09b8f70386272408d" + +PR = "${INC_PR}.0" -- cgit v1.2.3 From e9fdbfcbba3534f5a25e625f77d11eb459340f4e Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Mon, 9 Aug 2010 20:01:32 +0000 Subject: tzdata: bump version to 2010k Signed-off-by: Simon Busch Signed-off-by: Roman I Khimov --- recipes/tzdata/tzdata_2010j.bb | 10 ---------- recipes/tzdata/tzdata_2010k.bb | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 recipes/tzdata/tzdata_2010j.bb create mode 100644 recipes/tzdata/tzdata_2010k.bb diff --git a/recipes/tzdata/tzdata_2010j.bb b/recipes/tzdata/tzdata_2010j.bb deleted file mode 100644 index 79b776978b..0000000000 --- a/recipes/tzdata/tzdata_2010j.bb +++ /dev/null @@ -1,10 +0,0 @@ -require tzdata.inc - -# Note that elsie.nci.nih.gov removes old archives when new is being -# released. So if this doesn't build for you because of missing source file -# just bump it to the latest available version, removing old one - -PR = "${INC_PR}.0" - -SRC_URI[tar.md5sum] = "f668f66b260e14b477eac3f48bcfb5f4" -SRC_URI[tar.sha256sum] = "dcf2101d0c5bb20a7f182866ea3e52b54c8f4d129c025a96c9a31377676f554b" diff --git a/recipes/tzdata/tzdata_2010k.bb b/recipes/tzdata/tzdata_2010k.bb new file mode 100644 index 0000000000..216ae75d2d --- /dev/null +++ b/recipes/tzdata/tzdata_2010k.bb @@ -0,0 +1,10 @@ +require tzdata.inc + +# Note that elsie.nci.nih.gov removes old archives when new is being +# released. So if this doesn't build for you because of missing source file +# just bump it to the latest available version, removing old one + +PR = "${INC_PR}.0" + +SRC_URI[tar.md5sum] = "5e2086249d6a6bb116534d358661ad3f" +SRC_URI[tar.sha256sum] = "ef69c99504c0fd9864ba8ef1daae5f2d4df097cf7dc350f09b8f70386272408d" -- cgit v1.2.3 From e69f2119288973781447163737e5aa85c846d25d Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Tue, 10 Aug 2010 22:20:43 +0200 Subject: dpkg: remove old unpinned versions Signed-off-by: Frans Meulenbroeks --- .../dpkg/dpkg-1.14.19/ignore_extra_fields.patch | 26 ---------------------- recipes/dpkg/dpkg-native_1.13.22.bb | 6 ----- recipes/dpkg/dpkg-native_1.13.25.bb | 6 ----- recipes/dpkg/dpkg-native_1.14.19.bb | 6 ----- recipes/dpkg/dpkg_1.13.22.bb | 15 ------------- recipes/dpkg/dpkg_1.13.25.bb | 15 ------------- recipes/dpkg/dpkg_1.14.19.bb | 15 ------------- 7 files changed, 89 deletions(-) delete mode 100644 recipes/dpkg/dpkg-1.14.19/ignore_extra_fields.patch delete mode 100644 recipes/dpkg/dpkg-native_1.13.22.bb delete mode 100644 recipes/dpkg/dpkg-native_1.13.25.bb delete mode 100644 recipes/dpkg/dpkg-native_1.14.19.bb delete mode 100644 recipes/dpkg/dpkg_1.13.22.bb delete mode 100644 recipes/dpkg/dpkg_1.13.25.bb delete mode 100644 recipes/dpkg/dpkg_1.14.19.bb diff --git a/recipes/dpkg/dpkg-1.14.19/ignore_extra_fields.patch b/recipes/dpkg/dpkg-1.14.19/ignore_extra_fields.patch deleted file mode 100644 index d09343c6e5..0000000000 --- a/recipes/dpkg/dpkg-1.14.19/ignore_extra_fields.patch +++ /dev/null @@ -1,26 +0,0 @@ - dpkg-deb/build.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- dpkg-1.14.19.orig/dpkg-deb/build.c -+++ dpkg-1.14.19/dpkg-deb/build.c -@@ -241,18 +241,18 @@ void do_build(const char *const *argv) { - if (checkedinfo->priority == pri_other) { - fprintf(stderr, _("warning, `%s' contains user-defined Priority value `%s'\n"), - controlfile, checkedinfo->otherpriority); - warns++; - } -- for (field= checkedinfo->available.arbs; field; field= field->next) { -+ /*for (field= checkedinfo->available.arbs; field; field= field->next) { - if (known_arbitrary_field(field)) - continue; - - fprintf(stderr, _("warning, `%s' contains user-defined field `%s'\n"), - controlfile, field->name); - warns++; -- } -+ }*/ - checkversion(checkedinfo->available.version.version,"(upstream) version",&errs); - checkversion(checkedinfo->available.version.revision,"Debian revision",&errs); - if (errs) ohshit(_("%d errors in control file"),errs); - - if (subdir) { diff --git a/recipes/dpkg/dpkg-native_1.13.22.bb b/recipes/dpkg/dpkg-native_1.13.22.bb deleted file mode 100644 index c33b38978f..0000000000 --- a/recipes/dpkg/dpkg-native_1.13.22.bb +++ /dev/null @@ -1,6 +0,0 @@ -require dpkg-native.inc - -PR = "r5" - -SRC_URI[md5sum] = "0fc9fffc2c2cfa7107d8f422815078c1" -SRC_URI[sha256sum] = "c33aeb300d93eaeac55927ce81dc6f3a1cf74b3b759b65182c9bfca31b75b98f" diff --git a/recipes/dpkg/dpkg-native_1.13.25.bb b/recipes/dpkg/dpkg-native_1.13.25.bb deleted file mode 100644 index 98369817bd..0000000000 --- a/recipes/dpkg/dpkg-native_1.13.25.bb +++ /dev/null @@ -1,6 +0,0 @@ -require dpkg-native.inc - -PR = "r1" - -SRC_URI[md5sum] = "88effb358aa04d25036b662d588433a6" -SRC_URI[sha256sum] = "a525f321e875a8c16f5b6942bc02ac66b0d284cc6c61704f93e74789ef89d817" diff --git a/recipes/dpkg/dpkg-native_1.14.19.bb b/recipes/dpkg/dpkg-native_1.14.19.bb deleted file mode 100644 index c3fd833cde..0000000000 --- a/recipes/dpkg/dpkg-native_1.14.19.bb +++ /dev/null @@ -1,6 +0,0 @@ -require dpkg-native.inc - -PR = "r1" - -SRC_URI[md5sum] = "dad1a4a08c475b31a6b62e7dc92fe9d2" -SRC_URI[sha256sum] = "5287e943265b9efe5bd59cd1f3145d3fbf9e266df28938ad78e2107fde3c1587" diff --git a/recipes/dpkg/dpkg_1.13.22.bb b/recipes/dpkg/dpkg_1.13.22.bb deleted file mode 100644 index 9d2771de6a..0000000000 --- a/recipes/dpkg/dpkg_1.13.22.bb +++ /dev/null @@ -1,15 +0,0 @@ -require dpkg.inc -PR = "r6" -DEPENDS += "zlib bzip2" -SRC_URI += "file://noman.patch" - -EXTRA_OECONF = "--without-static-progs \ - --without-dselect \ - --with-start-stop-daemon \ - --with-zlib \ - --with-bz2lib \ - --without-sgml-doc \ - PERL=/usr/bin/perl" - -SRC_URI[md5sum] = "0fc9fffc2c2cfa7107d8f422815078c1" -SRC_URI[sha256sum] = "c33aeb300d93eaeac55927ce81dc6f3a1cf74b3b759b65182c9bfca31b75b98f" diff --git a/recipes/dpkg/dpkg_1.13.25.bb b/recipes/dpkg/dpkg_1.13.25.bb deleted file mode 100644 index 0fa48e664d..0000000000 --- a/recipes/dpkg/dpkg_1.13.25.bb +++ /dev/null @@ -1,15 +0,0 @@ -require dpkg.inc -PR = "r2" -DEPENDS += "zlib bzip2" -SRC_URI += "file://noman.patch" - -EXTRA_OECONF = "--without-static-progs \ - --without-dselect \ - --with-start-stop-daemon \ - --with-zlib \ - --with-bz2lib \ - --without-sgml-doc \ - PERL=/usr/bin/perl" - -SRC_URI[md5sum] = "88effb358aa04d25036b662d588433a6" -SRC_URI[sha256sum] = "a525f321e875a8c16f5b6942bc02ac66b0d284cc6c61704f93e74789ef89d817" diff --git a/recipes/dpkg/dpkg_1.14.19.bb b/recipes/dpkg/dpkg_1.14.19.bb deleted file mode 100644 index 556d317a28..0000000000 --- a/recipes/dpkg/dpkg_1.14.19.bb +++ /dev/null @@ -1,15 +0,0 @@ -require dpkg.inc -PR = "r2" -DEPENDS += "zlib bzip2" -#RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}" -SRC_URI += "file://noman.patch" - -EXTRA_OECONF = "--without-static-progs \ - --without-dselect \ - --with-start-stop-daemon \ - --with-zlib \ - --with-bz2lib \ - --without-sgml-doc" - -SRC_URI[md5sum] = "dad1a4a08c475b31a6b62e7dc92fe9d2" -SRC_URI[sha256sum] = "5287e943265b9efe5bd59cd1f3145d3fbf9e266df28938ad78e2107fde3c1587" -- cgit v1.2.3 From cafabdb4f7aa81d440f2a60d16ba1ebab16cf978 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 10 Aug 2010 22:47:05 +0200 Subject: Revert "angstrom: jpeg 8b doesn't build, prefer 6b for the time being" it seems to build again and Martin has sorted out the upgrade path issues on other commits This reverts commit 6b099fc3110b76c260c3adafe6f8960e27e42d8b. --- conf/distro/include/angstrom-2008-preferred-versions.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index b97049a7e6..93678f3811 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -20,7 +20,6 @@ PREFERRED_VERSION_gtk+ = "2.20.1" PREFERRED_VERSION_gtk+-native = "2.20.1" PREFERRED_VERSION_gtkmm = "2.20.0" PREFERRED_VERSION_hal = "0.5.14" -PREFERRED_VERSION_jpeg = "6b" PREFERRED_VERSION_libgemwidget = "1.0" PREFERRED_VERSION_libgpephone = "0.4" PREFERRED_VERSION_libsdl-x11 = "1.2.14" -- cgit v1.2.3 From 15ce294f131edd4c503547f07e7602732505bf1d Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 10 Aug 2010 19:07:44 -0700 Subject: gcc-configure-cross.inc: Drop --with-local-prefix and --with-gxx-include-dir We don't need these paths to be set and they further break things if we use --sysroot rather than -isystem Signed-off-by: Tom Rini --- recipes/gcc/gcc-3.3.4.inc | 2 +- recipes/gcc/gcc-3.4.3.inc | 2 +- recipes/gcc/gcc-3.4.4.inc | 2 +- recipes/gcc/gcc-4.1.0.inc | 2 +- recipes/gcc/gcc-4.1.1.inc | 2 +- recipes/gcc/gcc-4.1.2.inc | 2 +- recipes/gcc/gcc-4.2.2.inc | 2 +- recipes/gcc/gcc-4.2.3.inc | 2 +- recipes/gcc/gcc-4.2.4.inc | 2 +- recipes/gcc/gcc-4.3.1.inc | 2 +- recipes/gcc/gcc-4.3.2.inc | 2 +- recipes/gcc/gcc-4.3.3.inc | 2 +- recipes/gcc/gcc-4.3.4.inc | 2 +- recipes/gcc/gcc-4.4.1.inc | 2 +- recipes/gcc/gcc-4.4.2.inc | 2 +- recipes/gcc/gcc-4.4.4.inc | 2 +- recipes/gcc/gcc-4.5.inc | 2 +- recipes/gcc/gcc-configure-cross.inc | 4 +--- 18 files changed, 18 insertions(+), 20 deletions(-) diff --git a/recipes/gcc/gcc-3.3.4.inc b/recipes/gcc/gcc-3.3.4.inc index 8ec9dc09a6..1185c65a32 100644 --- a/recipes/gcc/gcc-3.3.4.inc +++ b/recipes/gcc/gcc-3.3.4.inc @@ -1,6 +1,6 @@ require gcc-common.inc -INC_PR = "r11" +INC_PR = "r12" SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://arm-gotoff.dpatch;apply=yes;striplevel=0 \ diff --git a/recipes/gcc/gcc-3.4.3.inc b/recipes/gcc/gcc-3.4.3.inc index d3823b3a94..cfee4d11cd 100644 --- a/recipes/gcc/gcc-3.4.3.inc +++ b/recipes/gcc/gcc-3.4.3.inc @@ -1,6 +1,6 @@ require gcc-common.inc -INC_PR = "r19" +INC_PR = "r20" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://gcc34-reverse-compare.patch \ diff --git a/recipes/gcc/gcc-3.4.4.inc b/recipes/gcc/gcc-3.4.4.inc index b63f59e2b0..6d4d266a73 100644 --- a/recipes/gcc/gcc-3.4.4.inc +++ b/recipes/gcc/gcc-3.4.4.inc @@ -1,6 +1,6 @@ require gcc-common.inc -INC_PR = "r15" +INC_PR = "r16" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://gcc34-reverse-compare.patch \ diff --git a/recipes/gcc/gcc-4.1.0.inc b/recipes/gcc/gcc-4.1.0.inc index ef62c8f45a..d3c5079bc4 100644 --- a/recipes/gcc/gcc-4.1.0.inc +++ b/recipes/gcc/gcc-4.1.0.inc @@ -1,6 +1,6 @@ require gcc-common.inc -INC_PR = "r11" +INC_PR = "r12" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gcc/gcc-4.1.1.inc b/recipes/gcc/gcc-4.1.1.inc index 951dd91247..88c9d7e69b 100644 --- a/recipes/gcc/gcc-4.1.1.inc +++ b/recipes/gcc/gcc-4.1.1.inc @@ -3,7 +3,7 @@ require gcc-common.inc DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r2" +INC_PR = "r3" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://100-uclibc-conf.patch \ diff --git a/recipes/gcc/gcc-4.1.2.inc b/recipes/gcc/gcc-4.1.2.inc index 000767a417..c102b055f7 100644 --- a/recipes/gcc/gcc-4.1.2.inc +++ b/recipes/gcc/gcc-4.1.2.inc @@ -5,7 +5,7 @@ NATIVEDEPS = "mpfr-native gmp-native" COMPATIBLE_TARGET_SYS = "." -INC_PR = "r23" +INC_PR = "r24" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://100-uclibc-conf.patch \ diff --git a/recipes/gcc/gcc-4.2.2.inc b/recipes/gcc/gcc-4.2.2.inc index 2a5334a30a..39583c484d 100644 --- a/recipes/gcc/gcc-4.2.2.inc +++ b/recipes/gcc/gcc-4.2.2.inc @@ -4,7 +4,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r16" +INC_PR = "r17" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://100-uclibc-conf.patch \ diff --git a/recipes/gcc/gcc-4.2.3.inc b/recipes/gcc/gcc-4.2.3.inc index e947cba3b7..a21d1944e7 100644 --- a/recipes/gcc/gcc-4.2.3.inc +++ b/recipes/gcc/gcc-4.2.3.inc @@ -4,7 +4,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r17" +INC_PR = "r18" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://100-uclibc-conf.patch \ diff --git a/recipes/gcc/gcc-4.2.4.inc b/recipes/gcc/gcc-4.2.4.inc index e072731f7e..d586e75065 100644 --- a/recipes/gcc/gcc-4.2.4.inc +++ b/recipes/gcc/gcc-4.2.4.inc @@ -4,7 +4,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r11" +INC_PR = "r12" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://100-uclibc-conf.patch \ diff --git a/recipes/gcc/gcc-4.3.1.inc b/recipes/gcc/gcc-4.3.1.inc index 0f93d37ff4..c7feee00d0 100644 --- a/recipes/gcc/gcc-4.3.1.inc +++ b/recipes/gcc/gcc-4.3.1.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r21" +INC_PR = "r22" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \ diff --git a/recipes/gcc/gcc-4.3.2.inc b/recipes/gcc/gcc-4.3.2.inc index 5eebf0beb7..04e3dd7367 100644 --- a/recipes/gcc/gcc-4.3.2.inc +++ b/recipes/gcc/gcc-4.3.2.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r11" +INC_PR = "r12" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \ diff --git a/recipes/gcc/gcc-4.3.3.inc b/recipes/gcc/gcc-4.3.3.inc index aa16643313..c1355e14a1 100644 --- a/recipes/gcc/gcc-4.3.3.inc +++ b/recipes/gcc/gcc-4.3.3.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r14" +INC_PR = "r15" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \ diff --git a/recipes/gcc/gcc-4.3.4.inc b/recipes/gcc/gcc-4.3.4.inc index 8fd607afab..b0954c420d 100644 --- a/recipes/gcc/gcc-4.3.4.inc +++ b/recipes/gcc/gcc-4.3.4.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r9" +INC_PR = "r10" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ file://fedora/gcc43-c++-builtin-redecl.patch;striplevel=0 \ diff --git a/recipes/gcc/gcc-4.4.1.inc b/recipes/gcc/gcc-4.4.1.inc index c4138b84b5..3b429afa42 100644 --- a/recipes/gcc/gcc-4.4.1.inc +++ b/recipes/gcc/gcc-4.4.1.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r8" +INC_PR = "r9" FILESPATHPKG .= ":gcc-$PV" diff --git a/recipes/gcc/gcc-4.4.2.inc b/recipes/gcc/gcc-4.4.2.inc index 0ad3fe51c9..360ea0134c 100644 --- a/recipes/gcc/gcc-4.4.2.inc +++ b/recipes/gcc/gcc-4.4.2.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r2" +INC_PR = "r3" FILESPATHPKG .= ":gcc-$PV" diff --git a/recipes/gcc/gcc-4.4.4.inc b/recipes/gcc/gcc-4.4.4.inc index 37c8cd0001..fb4727795b 100644 --- a/recipes/gcc/gcc-4.4.4.inc +++ b/recipes/gcc/gcc-4.4.4.inc @@ -8,7 +8,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" NATIVEDEPS = "mpfr-native gmp-native" -INC_PR = "r2" +INC_PR = "r3" FILESPATHPKG .= ":gcc-$PV" diff --git a/recipes/gcc/gcc-4.5.inc b/recipes/gcc/gcc-4.5.inc index 8bc99a4832..3e3b3437cf 100644 --- a/recipes/gcc/gcc-4.5.inc +++ b/recipes/gcc/gcc-4.5.inc @@ -8,7 +8,7 @@ DEPENDS = "mpfr gmp libmpc libelf" NATIVEDEPS = "mpfr-native gmp-native libmpc-native" -INC_PR = "r6" +INC_PR = "r7" SRCREV = "162808" PV = "4.5" diff --git a/recipes/gcc/gcc-configure-cross.inc b/recipes/gcc/gcc-configure-cross.inc index b6b2f3185c..c3c2b665e4 100644 --- a/recipes/gcc/gcc-configure-cross.inc +++ b/recipes/gcc/gcc-configure-cross.inc @@ -2,9 +2,7 @@ require gcc-configure-common.inc USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' -EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ - --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++ \ - --with-sysroot=${STAGING_DIR_TARGET} \ +EXTRA_OECONF_PATHS = "--with-sysroot=${STAGING_DIR_TARGET} \ --with-build-sysroot=${STAGING_DIR_TARGET} \ --with-build-time-tools=${STAGING_BINDIR_CROSS}" -- cgit v1.2.3 From a4c72e350c199adbd02fc526c5ca07ff44976749 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 11 Aug 2010 08:43:34 +0200 Subject: linux(-kexecboot)-2.6.35: upgrade to latest stablepatch 2.6.35.1 Signed-off-by: Martin Jansa --- recipes/kexecboot/linux-kexecboot_2.6.35.bb | 9 ++++++--- recipes/linux/linux_2.6.35.bb | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/recipes/kexecboot/linux-kexecboot_2.6.35.bb b/recipes/kexecboot/linux-kexecboot_2.6.35.bb index c5be10e8d5..3b36cf817b 100644 --- a/recipes/kexecboot/linux-kexecboot_2.6.35.bb +++ b/recipes/kexecboot/linux-kexecboot_2.6.35.bb @@ -1,6 +1,6 @@ require linux-kexecboot.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" S = "${WORKDIR}/linux-${PV}" @@ -8,8 +8,11 @@ S = "${WORKDIR}/linux-${PV}" DEFAULT_PREFERENCE = "-1" SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \ - file://fix.module.loading.16310.patch \ - file://defconfig" + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.1.bz2;apply=yes;name=stablepatch \ + file://fix.module.loading.16310.patch \ + file://defconfig" SRC_URI[kernel.md5sum] = "091abeb4684ce03d1d936851618687b6" SRC_URI[kernel.sha256sum] = "18b2e2c336032e366c942622b77302cb05fc034fb19018f086a4ebc9ed41bfcf" +SRC_URI[stablepatch.md5sum] = "3b9d79bebb2e022c0906ca1cd54bd970" +SRC_URI[stablepatch.sha256sum] = "921ddd008bfa81830e54c9a6d142848b91dbfff9b98ad5ce78282f78b76c9671" diff --git a/recipes/linux/linux_2.6.35.bb b/recipes/linux/linux_2.6.35.bb index 68c0cbbbef..fa22b5690d 100644 --- a/recipes/linux/linux_2.6.35.bb +++ b/recipes/linux/linux_2.6.35.bb @@ -1,11 +1,16 @@ require linux.inc +PR = "r1" + # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/${P}.tar.bz2;name=kernel \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.1.bz2;apply=yes;name=stablepatch \ file://fix.module.loading.16310.patch \ file://defconfig" SRC_URI[kernel.md5sum] = "091abeb4684ce03d1d936851618687b6" SRC_URI[kernel.sha256sum] = "18b2e2c336032e366c942622b77302cb05fc034fb19018f086a4ebc9ed41bfcf" +SRC_URI[stablepatch.md5sum] = "3b9d79bebb2e022c0906ca1cd54bd970" +SRC_URI[stablepatch.sha256sum] = "921ddd008bfa81830e54c9a6d142848b91dbfff9b98ad5ce78282f78b76c9671" -- cgit v1.2.3 From 8d5d9701a13371da6718b09290d03773189ed865 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 11 Aug 2010 09:31:09 +0200 Subject: xfsprogs: stage dev headers, used later by xfsdump Signed-off-by: Martin Jansa --- recipes/xfsprogs/xfsprogs_3.1.2.bb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/recipes/xfsprogs/xfsprogs_3.1.2.bb b/recipes/xfsprogs/xfsprogs_3.1.2.bb index 736d458ec5..832d5ab727 100644 --- a/recipes/xfsprogs/xfsprogs_3.1.2.bb +++ b/recipes/xfsprogs/xfsprogs_3.1.2.bb @@ -3,6 +3,7 @@ HOMEPAGE = "http://oss.sgi.com/projects/xfs" LICENSE = "GPL" SECTION = "base" DEPENDS = "util-linux-ng" +PR = "r1" SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz" SRC_URI[md5sum] = "86d10178ee6897cb099c97303e6d9da0" @@ -13,6 +14,8 @@ inherit autotools EXTRA_OECONF = "--enable-gettext=no" TARGET_CC_ARCH += "${LDFLAGS}" +FILES_${PN}-dev += "${base_libdir}/libhandle.la \ + ${base_libdir}/libhandle.so" do_configure () { export LIBTOOL="${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool" @@ -23,5 +26,16 @@ do_configure () { do_install () { export DIST_ROOT=${D} oe_runmake install + # needed for xfsdump + oe_runmake install-dev + # replace extra links to /usr/lib with relative links (otherwise autotools_prepackage_lamangler fails to read nonexistent link) + rm -f ${D}/${base_libdir}/libhandle.la + rm -f ${D}/${base_libdir}/libhandle.a + ln -s ../usr/lib/libhandle.la ${D}/${base_libdir}/libhandle.la + ln -s ../usr/lib/libhandle.a ${D}/${base_libdir}/libhandle.a + + # and link from /usr/lib/libhandle.so to /lib/libhandle.so + rm -f ${D}/${libdir}/libhandle.so + ln -s ../../lib/libhandle.a ${D}/${libdir}/libhandle.so } -- cgit v1.2.3 From 1816ba36398c620c6c57edc5a623bf775fd1a558 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 11 Aug 2010 09:31:24 +0200 Subject: xfsdump: add recipe Signed-off-by: Martin Jansa --- recipes/xfsprogs/xfsdump_3.0.4.bb | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 recipes/xfsprogs/xfsdump_3.0.4.bb diff --git a/recipes/xfsprogs/xfsdump_3.0.4.bb b/recipes/xfsprogs/xfsdump_3.0.4.bb new file mode 100644 index 0000000000..da6381646b --- /dev/null +++ b/recipes/xfsprogs/xfsdump_3.0.4.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "XFS Filesystem Dump Utility" +HOMEPAGE = "http://oss.sgi.com/projects/xfs" +LICENSE = "GPL" +SECTION = "base" +DEPENDS = "util-linux-ng" + +SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz" +SRC_URI[md5sum] = "af6932cfcd95ce64dc583128a190ffd7" +SRC_URI[sha256sum] = "d3932f0d482f6f77ec8519ce24c00edbe006262751bfb4ad4b4bc3e219d807d1" + +PARALLEL_MAKE = "" +inherit autotools +EXTRA_OECONF = "--enable-gettext=no" +TARGET_CC_ARCH += "${LDFLAGS}" + + +do_configure () { + export LIBTOOL="${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool" + export DEBUG="-DNDEBUG" + oe_runconf +} + +do_install () { + export DIST_ROOT=${D} + oe_runmake install +} + -- cgit v1.2.3 From e6b733c03eaf199797d3baebd48a55b8e3ea08cb Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 11 Aug 2010 09:31:52 +0200 Subject: task-shr-feed: add xfsdump Signed-off-by: Martin Jansa --- recipes/tasks/task-shr-feed.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb index 178bc370db..8c4c661e8d 100644 --- a/recipes/tasks/task-shr-feed.bb +++ b/recipes/tasks/task-shr-feed.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SHR Feed" -PR = "r64" +PR = "r65" PV = "1.0" LICENSE = "GPL" @@ -297,6 +297,7 @@ RDEPENDS_${PN} += "\ unixbench \ maxima \ xfsprogs \ + xfsdump \ " # this is only usefull on gta02 and on other devices it's trying to pull mesa-dri (not respecting DEFAULT_PROVIDER for virtual/libgl) -- cgit v1.2.3 From d1c85b533319f7616ba70cfd0ce0a8c6a669b9b4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 11 Aug 2010 10:54:20 +0200 Subject: xfsdump: add xfsprogs to DEPENDS --- recipes/xfsprogs/xfsdump_3.0.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/xfsprogs/xfsdump_3.0.4.bb b/recipes/xfsprogs/xfsdump_3.0.4.bb index da6381646b..46a3d74116 100644 --- a/recipes/xfsprogs/xfsdump_3.0.4.bb +++ b/recipes/xfsprogs/xfsdump_3.0.4.bb @@ -2,7 +2,7 @@ DESCRIPTION = "XFS Filesystem Dump Utility" HOMEPAGE = "http://oss.sgi.com/projects/xfs" LICENSE = "GPL" SECTION = "base" -DEPENDS = "util-linux-ng" +DEPENDS = "xfsprogs" SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz" SRC_URI[md5sum] = "af6932cfcd95ce64dc583128a190ffd7" -- cgit v1.2.3 From 56f7be76454e47732462a74fae31e26bb4d01575 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 11 Aug 2010 12:04:59 +0200 Subject: omap3-sgx-modules: add patch to fix texture width detection --- recipes/powervr-drivers/omap3-sgx-modules/texture-width.patch | 11 +++++++++++ recipes/powervr-drivers/omap3-sgx-modules_1.4.14.2616.bb | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 recipes/powervr-drivers/omap3-sgx-modules/texture-width.patch diff --git a/recipes/powervr-drivers/omap3-sgx-modules/texture-width.patch b/recipes/powervr-drivers/omap3-sgx-modules/texture-width.patch new file mode 100644 index 0000000000..20a33bc0fc --- /dev/null +++ b/recipes/powervr-drivers/omap3-sgx-modules/texture-width.patch @@ -0,0 +1,11 @@ +--- /tmp/bc_cat.c 2010-08-11 11:36:20.000000000 +0200 ++++ OMAP35x_Graphics_SDK_3_01_00_06/GFX_Linux_KM/services4/3rdparty/bufferclass_ti/bc_cat.c 2010-08-11 11:36:53.000000000 +0200 +@@ -487,7 +487,7 @@ + + /* texture buffer width should be multiple of 8 for OMAP3 ES3.x, + * or 32 for ES2.x */ +- width_align = omap_rev_lt_3_0() ? 32 : 8; ++ width_align = cpu_is_omap3530() && omap_rev_lt_3_0() ? 32 : 8; + + major = register_chrdev(0, DEVNAME, &bc_cat_fops); + diff --git a/recipes/powervr-drivers/omap3-sgx-modules_1.4.14.2616.bb b/recipes/powervr-drivers/omap3-sgx-modules_1.4.14.2616.bb index 202c8e6ef8..0d2818be20 100644 --- a/recipes/powervr-drivers/omap3-sgx-modules_1.4.14.2616.bb +++ b/recipes/powervr-drivers/omap3-sgx-modules_1.4.14.2616.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the omap3 SoCs" LICENSE = "GPLv2" -PR_append = "b" +PR_append = "c" # download required binary distribution from: # http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/latest/index_FDS.html @@ -15,7 +15,9 @@ IMGPV = "1.4.14.2616" BINFILE := "OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin" SRC_URI = "http://install.source.dir.local/OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin \ + file://texture-width.patch;striplevel=2 \ " + S = "${WORKDIR}/OMAP35x_Graphics_SDK_${SGXPV}/GFX_Linux_KM" inherit module -- cgit v1.2.3 From fe8ec48505a3d992e90d0c6567defd97c4dc3ddc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 11 Aug 2010 13:49:59 +0200 Subject: gupnp: add 0.13.4 --- recipes/upnp/gupnp_0.13.4.bb | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 recipes/upnp/gupnp_0.13.4.bb diff --git a/recipes/upnp/gupnp_0.13.4.bb b/recipes/upnp/gupnp_0.13.4.bb new file mode 100644 index 0000000000..01e9fca6fe --- /dev/null +++ b/recipes/upnp/gupnp_0.13.4.bb @@ -0,0 +1,27 @@ +LICENSE = "LGPL" +DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2 gtk-doc-native libgee" + +SRC_URI = "http://gupnp.org/sites/all/files/sources/gupnp-${PV}.tar.gz \ +" +SRC_URI[md5sum] = "0d562f5f02534c70c3743b2c514db8ba" +SRC_URI[sha256sum] = "7974953f38a41236c875c3df509abc43e8218b5925fdc18212a73b1ae0d0e7e8" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-gtk-doc" + +do_configure() { + libtoolize --force + gnu-configize --force + oe_runconf +} + +FILES_${PN} = "${libdir}/*.so.*" +FILES_${PN}-dev += "${bindir}/gupnp-binding-tool" + +ROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess" + +gupnp_sysroot_preprocess () { + install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/ + install -m 755 ${D}${bindir}/gupnp-binding-tool ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/ +} -- cgit v1.2.3 From 9f75b210f2d8bffe44892b594374e06f8e476162 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 11 Aug 2010 14:08:36 +0200 Subject: gupnp-av: add 0.5.9 --- recipes/upnp/gupnp-av_0.5.9.bb | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 recipes/upnp/gupnp-av_0.5.9.bb diff --git a/recipes/upnp/gupnp-av_0.5.9.bb b/recipes/upnp/gupnp-av_0.5.9.bb new file mode 100644 index 0000000000..14763aed1c --- /dev/null +++ b/recipes/upnp/gupnp-av_0.5.9.bb @@ -0,0 +1,9 @@ +LICENSE = "LGPL" +DEPENDS = "gupnp" + +SRC_URI = "http://gupnp.org/sites/all/files/sources/gupnp-av-${PV}.tar.gz \ +" +SRC_URI[md5sum] = "5940df3c1152894685c3fc38ee95fd78" +SRC_URI[sha256sum] = "a909129997f79dcb6d35221ce205854d64c47a7390843e420cfba753485087bd" + +inherit autotools pkgconfig -- cgit v1.2.3 From b5ef0accda1420f302a88ac0c5f986a08ff34013 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 11 Aug 2010 14:16:13 +0200 Subject: rygel: add 0.6.0 --- recipes/rygel/rygel_0.6.0.bb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 recipes/rygel/rygel_0.6.0.bb diff --git a/recipes/rygel/rygel_0.6.0.bb b/recipes/rygel/rygel_0.6.0.bb new file mode 100644 index 0000000000..6b322fb370 --- /dev/null +++ b/recipes/rygel/rygel_0.6.0.bb @@ -0,0 +1,20 @@ +inherit gnome vala + +DESCRIPTION = "Collection of DLNA[1] (UPnP[2] AV) devices, implemented through a plug-in mechanism." +SECTION = "network/multimedia" +DEPENDS = "glib-2.0 gupnp gupnp-av gstreamer sqlite3 libsoup-2.4 " +HOMEPAGE = "http://live.gnome.org/Rygel" + +SRC_URI[archive.md5sum] = "037894e84f9b57c32e9bde75ee5b4dbf" +SRC_URI[archive.sha256sum] = "94b0904468c74d0931c95ba0920c5585e96f25cf014dd9756f78d5b6f2e428ca" + +#EXTRA_OECONF = "--enable-vala=no" + +do_configure() { + libtoolize --force + gnu-configize --force + oe_runconf +} + +FILES_${PN} += "${libdir}/rygel-1.0/librygel*.so ${datadir}/dbus-1/" +FILES_${PN}-dbg += "${libdir}/rygel-1.0/.debug/" -- cgit v1.2.3 From 6f16935793200288e189d90a9ea84a0a59fb775b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 11 Aug 2010 15:43:37 +0200 Subject: bash: bump PR after ncurses upgrade Signed-off-by: Martin Jansa --- recipes/bash/bash_3.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/bash/bash_3.2.bb b/recipes/bash/bash_3.2.bb index 178f195d35..5cf854b4e4 100644 --- a/recipes/bash/bash_3.2.bb +++ b/recipes/bash/bash_3.2.bb @@ -1,6 +1,6 @@ require bash.inc -PR = "r8" +PR = "r9" SRC_URI += "\ file://builtins.patch \ -- cgit v1.2.3 From 7751138384b7a2de55c405d2d959ae3cad394c2d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 11 Aug 2010 15:43:57 +0200 Subject: task-shr-feed: add numberx and neomis Signed-off-by: Martin Jansa --- recipes/tasks/task-shr-feed.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb index 8c4c661e8d..7886217053 100644 --- a/recipes/tasks/task-shr-feed.bb +++ b/recipes/tasks/task-shr-feed.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SHR Feed" -PR = "r65" +PR = "r66" PV = "1.0" LICENSE = "GPL" @@ -298,6 +298,8 @@ RDEPENDS_${PN} += "\ maxima \ xfsprogs \ xfsdump \ + numberx \ + neomis \ " # this is only usefull on gta02 and on other devices it's trying to pull mesa-dri (not respecting DEFAULT_PROVIDER for virtual/libgl) -- cgit v1.2.3 From 6d5bcdc04df95e18b53480869a0037841ed19e09 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 11 Aug 2010 15:47:18 +0200 Subject: lmbench: fix build --- recipes/lmbench/lmbench_2.5.bb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/recipes/lmbench/lmbench_2.5.bb b/recipes/lmbench/lmbench_2.5.bb index 80f53a8a3f..de7fc484ad 100644 --- a/recipes/lmbench/lmbench_2.5.bb +++ b/recipes/lmbench/lmbench_2.5.bb @@ -2,7 +2,10 @@ SECTION = "console/utils" DESCRIPTION = "Tools for performance analysis." LICENSE = "GPL" RDEPENDS_${PN} = "debianutils" -PR = "r2" + +PR = "r3" + +inherit autotools SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ file://build.patch \ @@ -14,11 +17,6 @@ EXTRA_OEMAKE = 'CC="${CC}" AR="${AR}" CFLAGS="${CFLAGS}" \ TARGET="${TARGET_OS}" BASE="${prefix}"' -inherit siteinfo - -# Space separated list of shell scripts with variables defined to supply test -# results for autoconf tests we cannot run at build time. -export CONFIG_SITE = "${@siteinfo_get_files(d)}" python do_unpack () { bb.build.exec_func('base_do_unpack', d) bb.build.exec_func('byebk_do_unpack', d) @@ -28,6 +26,10 @@ byebk_do_unpack () { find ${S}/.. -name BitKeeper -o -name SCCS | xargs rm -rf } +do_configure() { + : +} + do_compile () { . ${CONFIG_SITE} if [ X"$ac_cv_uint" == X"yes" ]; then -- cgit v1.2.3 From 02b206798943259214336d2a6ffbacfdf5562e44 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Wed, 11 Aug 2010 15:27:46 +0200 Subject: ncurses: swapped installation of widec and narrowc headers Widec headers contain additional definitions and shall be installed last hence. To ensure compatibility of both headers a sanity check was added. Thanks to Martin Jansa for noticing this issue. Signed-off-by: Enrico Scholz --- recipes/ncurses/ncurses_5.7.bb | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/recipes/ncurses/ncurses_5.7.bb b/recipes/ncurses/ncurses_5.7.bb index 35626854fa..ab029ae309 100644 --- a/recipes/ncurses/ncurses_5.7.bb +++ b/recipes/ncurses/ncurses_5.7.bb @@ -4,15 +4,15 @@ LICENSE = "MIT" SECTION = "libs" PATCHDATE = "20100501" PKGV = "${PV}+${PATCHDATE}" -PR = "r10" +PR = "r11" # recipe is experimental for now... DEFAULT_PREFERENCE = "-99" -DEPENDS = "ncurses-native" -DEPENDS_virtclass-native = "" +DEPENDS = "ncurses-native unifdef-native" +DEPENDS_virtclass-native = "unifdef-native" -inherit autotools binconfig +inherit autotools binconfig test SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz;name=tarball \ ftp://invisible-island.net/ncurses/5.7/ncurses-5.7-20100424-patch.sh.bz2;apply=yes;name=p20100424sh \ @@ -83,6 +83,30 @@ do_compile() { oe_runmake -C widec libs } +# set of expected differences between narrowc and widec header +# +# TODO: the NCURSES_CH_T difference can cause real problems :( +_unifdef_cleanup = " \ + -e '\!/\* \$Id: curses.wide,v!,\!/\* \$Id: curses.tail,v!d' \ + -e '/^#define NCURSES_CH_T /d' \ + -e '/^#include /d' \ + -e '\!^/\* .* \*/!d' \ +" + +do_test[dirs] = "${S}" +do_test() { + ${ENABLE_WIDEC} || return 0 + + # make sure that the narrow and widec header are compatible + # and differ only in minor details. + unifdef -k narrowc/include/curses.h | \ + sed ${_unifdef_cleanup} > curses-narrowc.h + unifdef -k widec/include/curses.h | \ + sed ${_unifdef_cleanup} > curses-widec.h + + diff curses-narrowc.h curses-widec.h +} + _install_opts = "\ DESTDIR='${D}' \ PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \ @@ -90,12 +114,15 @@ _install_opts = "\ " do_install() { + # Order of installation is important; widec installs a 'curses.h' + # header with more definitions and must be installed last hence. + # Compatibility of these headers will be checked in 'do_test()'. + oe_runmake -C narrowc ${_install_opts} \ + install.data install.progs + ! ${ENABLE_WIDEC} || \ oe_runmake -C widec ${_install_opts} - oe_runmake -C narrowc ${_install_opts} \ - install.data install.progs - cd narrowc -- cgit v1.2.3 From 0dee8eb3458f655ff7e21a898178051c521e5891 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 11 Aug 2010 22:44:40 +0200 Subject: eglibc: build with -ggdb3 as workaround for alignment traps * I've seen it only with eglibc-2.12 built with gcc-4.5 that's why I bumped PR only in 2.12 * can be removed as soon as gcc bug is fixed Signed-off-by: Martin Jansa --- conf/distro/include/sane-toolchain-eglibc.inc | 2 ++ recipes/eglibc/eglibc_2.12.bb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/distro/include/sane-toolchain-eglibc.inc b/conf/distro/include/sane-toolchain-eglibc.inc index 1e370d0b8c..149f61ed3e 100644 --- a/conf/distro/include/sane-toolchain-eglibc.inc +++ b/conf/distro/include/sane-toolchain-eglibc.inc @@ -4,6 +4,8 @@ # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" +# Work-around for alignment traps when eglibc-2.12 is built with gcc-4.5* +FULL_OPTIMIZATION_pn-eglibc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -ggdb3" FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" diff --git a/recipes/eglibc/eglibc_2.12.bb b/recipes/eglibc/eglibc_2.12.bb index ea221344a4..f34cbb4559 100644 --- a/recipes/eglibc/eglibc_2.12.bb +++ b/recipes/eglibc/eglibc_2.12.bb @@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1" DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.12" -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" PR_append = "+svnr${SRCPV}" SRCREV="11187" EGLIBC_BRANCH="eglibc-2_12" -- cgit v1.2.3 From f502472a26a50cb1adec355fb4a7d10d029c7ace Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Thu, 12 Aug 2010 01:29:42 +0200 Subject: klibc: remove old unused 1.5 and 1.5.15 recipes. * Keep 1.5.18 which builds vs. 2.6.2x and 2.6.3x kernels. * Reintroduce do_stage (hard to die!). * WIP in order to get finally rid of legacy staging * For the moment, refactor the recipe and bump PR. --- recipes/klibc/klibc-1.5.18.inc | 33 - recipes/klibc/klibc-1.5.inc | 19 - recipes/klibc/klibc-1.5/dash_readopt.patch | 105 -- .../fstype-sane-vfat-and-jffs2-for-1.5.patch | 63 - recipes/klibc/klibc-1.5/modprobe.patch | 1985 -------------------- recipes/klibc/klibc-1.5/staging.patch | 144 -- recipes/klibc/klibc-1.5/wc.patch | 236 --- recipes/klibc/klibc-common.inc | 36 - recipes/klibc/klibc-utils-static.inc | 14 - recipes/klibc/klibc-utils-static_1.5.18.bb | 19 +- recipes/klibc/klibc-utils-static_1.5.bb | 3 - recipes/klibc/klibc-utils.inc | 38 +- recipes/klibc/klibc.inc | 107 +- recipes/klibc/klibc_1.5.18.bb | 62 +- recipes/klibc/klibc_1.5.bb | 3 - 15 files changed, 145 insertions(+), 2722 deletions(-) delete mode 100644 recipes/klibc/klibc-1.5.inc delete mode 100644 recipes/klibc/klibc-1.5/dash_readopt.patch delete mode 100644 recipes/klibc/klibc-1.5/fstype-sane-vfat-and-jffs2-for-1.5.patch delete mode 100644 recipes/klibc/klibc-1.5/modprobe.patch delete mode 100644 recipes/klibc/klibc-1.5/staging.patch delete mode 100644 recipes/klibc/klibc-1.5/wc.patch delete mode 100644 recipes/klibc/klibc-common.inc delete mode 100644 recipes/klibc/klibc-utils-static.inc delete mode 100644 recipes/klibc/klibc-utils-static_1.5.bb delete mode 100644 recipes/klibc/klibc_1.5.bb diff --git a/recipes/klibc/klibc-1.5.18.inc b/recipes/klibc/klibc-1.5.18.inc index 9c0ff760d1..3c8c5fefb8 100644 --- a/recipes/klibc/klibc-1.5.18.inc +++ b/recipes/klibc/klibc-1.5.18.inc @@ -1,35 +1,2 @@ -require klibc-common.inc - -SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \ - file://modprobe.patch \ - file://dash_readopt.patch \ - file://wc.patch \ - file://staging.patch \ - file://klibc_kexecsyscall.patch \ - file://mntproc-definitions.patch \ - file://arm-signal-cleanup.patch \ - file://socket.h.patch \ - file://isystem.patch \ - file://klibc-x86-KLIBCARCHINCFLAGS.patch \ - " - -KLIBC_FETCHDIR = "1.5" - -EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ - 'CROSS_COMPILE=${TARGET_PREFIX}' \ - 'KLIBCKERNELSRC=${STAGING_KERNEL_DIR}' \ - " - -do_configure () { - ln -sf ${STAGING_KERNEL_DIR} linux -} - SRC_URI[md5sum] = "5c8b6577b9acb3809cace6e118cdd55b" SRC_URI[sha256sum] = "e4104f8b34a5f354222bd4622f50b58c6218bf70614450d68539cbef666b6446" - -do_install_append() { - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dmesg ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sync ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ls ${D}${base_bindir} - install -m 755 klcc/klcc ${D}${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}klcc -} diff --git a/recipes/klibc/klibc-1.5.inc b/recipes/klibc/klibc-1.5.inc deleted file mode 100644 index b00f02cc56..0000000000 --- a/recipes/klibc/klibc-1.5.inc +++ /dev/null @@ -1,19 +0,0 @@ -require klibc-common.inc - -SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \ - file://modprobe.patch \ - file://losetup.patch \ - file://dash_readopt.patch \ - file://wc.patch \ - file://staging.patch \ - file://klibc_kexecsyscall.patch \ - " - -KLIBC_FETCHDIR = "1.5" - -SRC_URI[md5sum] = "481dfdef7273f2cc776c2637f481f017" -SRC_URI[sha256sum] = "27000ba4bc73a5977502b27d7036df24dd6ab94a1c33b8f5d6d54ba62772f0c7" - -do_install_append() { - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/insmod ${D}${base_bindir} -} diff --git a/recipes/klibc/klibc-1.5/dash_readopt.patch b/recipes/klibc/klibc-1.5/dash_readopt.patch deleted file mode 100644 index 49bc087edd..0000000000 --- a/recipes/klibc/klibc-1.5/dash_readopt.patch +++ /dev/null @@ -1,105 +0,0 @@ -Index: klibc-1.5/usr/dash/miscbltin.c -=================================================================== ---- klibc-1.5.orig/usr/dash/miscbltin.c 2008-03-27 20:38:09.354564817 +0100 -+++ klibc-1.5/usr/dash/miscbltin.c 2008-04-04 18:05:32.063364195 +0200 -@@ -46,6 +46,7 @@ - #include - #include - #include /* strtotimeval() */ -+#include - - #include "shell.h" - #include "options.h" -@@ -83,6 +84,11 @@ - int timeout; - int i; - fd_set set; -+ int n_flag = 0; -+ unsigned int nchars = 0; -+ int silent = 0; -+ struct termios tty, old_tty; -+ - struct timeval ts, t0, t1, to; - - ts.tv_sec = ts.tv_usec = 0; -@@ -90,11 +96,18 @@ - rflag = 0; - timeout = 0; - prompt = NULL; -- while ((i = nextopt("p:rt:")) != '\0') { -+ while ((i = nextopt("p:rt:n:s")) != '\0') { - switch(i) { - case 'p': - prompt = optionarg; - break; -+ case 'n': -+ nchars = strtoul(optionarg, NULL, 10); -+ n_flag = nchars; /* just a flag "nchars is nonzero" */ -+ break; -+ case 's': -+ silent = 1; -+ break; - case 't': - p = strtotimeval(optionarg, &ts); - if (*p || (!ts.tv_sec && !ts.tv_usec)) -@@ -118,6 +131,23 @@ - sh_error("arg count"); - if ((ifs = bltinlookup("IFS")) == NULL) - ifs = defifs; -+ if (n_flag || silent) { -+ if (tcgetattr(0, &tty) != 0) { -+ /* Not a tty */ -+ n_flag = 0; -+ silent = 0; -+ } else { -+ old_tty = tty; -+ if (n_flag) { -+ tty.c_lflag &= ~ICANON; -+ tty.c_cc[VMIN] = nchars < 256 ? nchars : 255; -+ } -+ if (silent) { -+ tty.c_lflag &= ~(ECHO | ECHOK | ECHONL); -+ } -+ tcsetattr(0, TCSANOW, &tty); -+ } -+ } - status = 0; - startword = 1; - backslash = 0; -@@ -133,13 +163,15 @@ - ts.tv_sec += t0.tv_sec; - } - STARTSTACKSTR(p); -- for (;;) { -+ do { - if (timeout) { - gettimeofday(&t1, NULL); - if (t1.tv_sec > ts.tv_sec || - (t1.tv_sec == ts.tv_sec && - t1.tv_usec >= ts.tv_usec)) { - status = 1; -+ if (n_flag) -+ tcsetattr(0, TCSANOW, &old_tty); - break; /* Timeout! */ - } - -@@ -156,6 +188,8 @@ - FD_SET(0, &set); - if (select(1, &set, NULL, NULL, &to) != 1) { - status = 1; -+ if (n_flag) -+ tcsetattr(0, TCSANOW, &old_tty); - break; /* Timeout! */ - } - } -@@ -191,7 +225,9 @@ - put: - STPUTC(c, p); - } -- } -+ } while (!n_flag || --nchars); -+ if (n_flag || silent) -+ tcsetattr(0, TCSANOW, &old_tty); - STACKSTRNUL(p); - /* Remove trailing blanks */ - while ((char *)stackblock() <= --p && strchr(ifs, *p) != NULL) diff --git a/recipes/klibc/klibc-1.5/fstype-sane-vfat-and-jffs2-for-1.5.patch b/recipes/klibc/klibc-1.5/fstype-sane-vfat-and-jffs2-for-1.5.patch deleted file mode 100644 index 2ba6d98172..0000000000 --- a/recipes/klibc/klibc-1.5/fstype-sane-vfat-and-jffs2-for-1.5.patch +++ /dev/null @@ -1,63 +0,0 @@ -Index: klibc-1.5/usr/kinit/fstype/fstype.c -=================================================================== ---- klibc-1.5.orig/usr/kinit/fstype/fstype.c 2008-02-28 00:48:35.319254938 +0100 -+++ klibc-1.5/usr/kinit/fstype/fstype.c 2008-02-28 00:52:20.583257793 +0100 -@@ -20,7 +20,7 @@ - #include - #include - #include -- -+#include - #define cpu_to_be32(x) __cpu_to_be32(x) /* Needed by romfs_fs.h */ - - #include "romfs_fs.h" -@@ -33,6 +33,12 @@ - #include "lvm2_sb.h" - #include "iso9660_sb.h" - -+#if __BYTE_ORDER == __BIG_ENDIAN -+#include -+#else -+#include -+#endif -+ - /* - * Slightly cleaned up version of jfs_superblock to - * avoid pulling in other kernel header files. -@@ -54,6 +60,27 @@ - /* Swap needs the definition of block size */ - #include "swap_fs.h" - -+static int jffs2_image(const unsigned char *buf, unsigned long *blocks) -+{ -+ // Very sloppy! ;-E -+ if (*buf == 0x85 && buf[1] == 0x19) -+ return 1; -+ -+ return 0; -+} -+ -+static int vfat_image(const unsigned char *buf, unsigned long *blocks) -+{ -+ const struct romfs_super_block *sb = -+ (const struct romfs_super_block *)buf; -+ if (!strncmp(buf + 54, "FAT12 ", 8) -+ || !strncmp(buf + 54, "FAT16 ", 8) -+ || !strncmp(buf + 82, "FAT32 ", 8)) -+ return 1; -+ -+ return 0; -+} -+ - static int gzip_image(const void *buf, unsigned long long *bytes) - { - const unsigned char *p = buf; -@@ -277,6 +304,8 @@ - {1, "ext3", ext3_image}, - {1, "ext2", ext2_image}, - {1, "minix", minix_image}, -+ {0, "jffs2", jffs2_image}, -+ {0, "vfat", vfat_image}, - {8, "reiserfs", reiserfs_image}, - {64, "reiserfs", reiserfs_image}, - {32, "jfs", jfs_image}, diff --git a/recipes/klibc/klibc-1.5/modprobe.patch b/recipes/klibc/klibc-1.5/modprobe.patch deleted file mode 100644 index dceaf6103f..0000000000 --- a/recipes/klibc/klibc-1.5/modprobe.patch +++ /dev/null @@ -1,1985 +0,0 @@ -Index: klibc-1.5/usr/utils/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/utils/Kbuild 2008-03-07 22:01:45.223695348 +0100 -+++ klibc-1.5/usr/utils/Kbuild 2008-03-07 22:48:44.660783243 +0100 -@@ -3,8 +3,8 @@ - # - - progs := chroot dd mkdir mkfifo mknod mount pivot_root umount --progs += true false sleep ln nuke minips cat --progs += insmod uname halt kill readlink cpio -+progs += true false sleep ln nuke minips cat losetup -+progs += insmod uname halt kill readlink cpio modprobe - - static-y := $(addprefix static/, $(progs)) - shared-y := $(addprefix shared/, $(progs)) -@@ -52,7 +52,10 @@ - shared/readlink-y := readlink.o - static/cpio-y := cpio.o - shared/cpio-y := cpio.o -- -+static/modprobe-y := modprobe.o -+shared/modprobe-y := modprobe.o -+static/losetup-y := losetup.o -+shared/losetup-y := losetup.o - # Additionally linked targets - always := static/reboot static/poweroff shared/reboot shared/poweroff - -Index: klibc-1.5/usr/utils/list.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ klibc-1.5/usr/utils/list.h 2008-03-07 22:33:22.287688586 +0100 -@@ -0,0 +1,238 @@ -+/* Stolen from Linux Kernel Source's list.h -- GPL. */ -+#ifndef _MODINITTOOLS_LIST_H -+#define _MODINITTOOLS_LIST_H -+ -+#undef offsetof -+#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) -+ -+/** -+ * container_of - cast a member of a structure out to the containing structure -+ * -+ * @ptr: the pointer to the member. -+ * @type: the type of the container struct this is embedded in. -+ * @member: the name of the member within the struct. -+ * -+ */ -+#define container_of(ptr, type, member) ({ \ -+ const typeof( ((type *)0)->member ) *__mptr = (ptr); \ -+ (type *)( (char *)__mptr - offsetof(type,member) );}) -+ -+/* -+ * Simple doubly linked list implementation. -+ * -+ * Some of the internal functions ("__xxx") are useful when -+ * manipulating whole lists rather than single entries, as -+ * sometimes we already know the next/prev entries and we can -+ * generate better code by using them directly rather than -+ * using the generic single-entry routines. -+ */ -+ -+struct list_head { -+ struct list_head *next, *prev; -+}; -+ -+#define LIST_HEAD_INIT(name) { &(name), &(name) } -+ -+#define LIST_HEAD(name) \ -+ struct list_head name = LIST_HEAD_INIT(name) -+ -+#define INIT_LIST_HEAD(ptr) do { \ -+ (ptr)->next = (ptr); (ptr)->prev = (ptr); \ -+} while (0) -+ -+/* -+ * Insert a new entry between two known consecutive entries. -+ * -+ * This is only for internal list manipulation where we know -+ * the prev/next entries already! -+ */ -+static inline void __list_add(struct list_head *new, -+ struct list_head *prev, -+ struct list_head *next) -+{ -+ next->prev = new; -+ new->next = next; -+ new->prev = prev; -+ prev->next = new; -+} -+ -+/** -+ * list_add - add a new entry -+ * @new: new entry to be added -+ * @head: list head to add it after -+ * -+ * Insert a new entry after the specified head. -+ * This is good for implementing stacks. -+ */ -+static inline void list_add(struct list_head *new, struct list_head *head) -+{ -+ __list_add(new, head, head->next); -+} -+ -+/** -+ * list_add_tail - add a new entry -+ * @new: new entry to be added -+ * @head: list head to add it before -+ * -+ * Insert a new entry before the specified head. -+ * This is useful for implementing queues. -+ */ -+static inline void list_add_tail(struct list_head *new, struct list_head *head) -+{ -+ __list_add(new, head->prev, head); -+} -+ -+/* -+ * Delete a list entry by making the prev/next entries -+ * point to each other. -+ * -+ * This is only for internal list manipulation where we know -+ * the prev/next entries already! -+ */ -+static inline void __list_del(struct list_head * prev, struct list_head * next) -+{ -+ next->prev = prev; -+ prev->next = next; -+} -+ -+/** -+ * list_del - deletes entry from list. -+ * @entry: the element to delete from the list. -+ * Note: list_empty on entry does not return true after this, the entry is -+ * in an undefined state. -+ */ -+static inline void list_del(struct list_head *entry) -+{ -+ __list_del(entry->prev, entry->next); -+} -+ -+/** -+ * list_del_init - deletes entry from list and reinitialize it. -+ * @entry: the element to delete from the list. -+ */ -+static inline void list_del_init(struct list_head *entry) -+{ -+ __list_del(entry->prev, entry->next); -+ INIT_LIST_HEAD(entry); -+} -+ -+/** -+ * list_move - delete from one list and add as another's head -+ * @list: the entry to move -+ * @head: the head that will precede our entry -+ */ -+static inline void list_move(struct list_head *list, struct list_head *head) -+{ -+ __list_del(list->prev, list->next); -+ list_add(list, head); -+} -+ -+/** -+ * list_move_tail - delete from one list and add as another's tail -+ * @list: the entry to move -+ * @head: the head that will follow our entry -+ */ -+static inline void list_move_tail(struct list_head *list, -+ struct list_head *head) -+{ -+ __list_del(list->prev, list->next); -+ list_add_tail(list, head); -+} -+ -+/** -+ * list_empty - tests whether a list is empty -+ * @head: the list to test. -+ */ -+static inline int list_empty(struct list_head *head) -+{ -+ return head->next == head; -+} -+ -+static inline void __list_splice(struct list_head *list, -+ struct list_head *head) -+{ -+ struct list_head *first = list->next; -+ struct list_head *last = list->prev; -+ struct list_head *at = head->next; -+ -+ first->prev = head; -+ head->next = first; -+ -+ last->next = at; -+ at->prev = last; -+} -+ -+/** -+ * list_splice - join two lists -+ * @list: the new list to add. -+ * @head: the place to add it in the first list. -+ */ -+static inline void list_splice(struct list_head *list, struct list_head *head) -+{ -+ if (!list_empty(list)) -+ __list_splice(list, head); -+} -+ -+/** -+ * list_splice_init - join two lists and reinitialise the emptied list. -+ * @list: the new list to add. -+ * @head: the place to add it in the first list. -+ * -+ * The list at @list is reinitialised -+ */ -+static inline void list_splice_init(struct list_head *list, -+ struct list_head *head) -+{ -+ if (!list_empty(list)) { -+ __list_splice(list, head); -+ INIT_LIST_HEAD(list); -+ } -+} -+ -+/** -+ * list_entry - get the struct for this entry -+ * @ptr: the &struct list_head pointer. -+ * @type: the type of the struct this is embedded in. -+ * @member: the name of the list_struct within the struct. -+ */ -+#define list_entry(ptr, type, member) \ -+ container_of(ptr, type, member) -+ -+/** -+ * list_for_each - iterate over a list -+ * @pos: the &struct list_head to use as a loop counter. -+ * @head: the head for your list. -+ */ -+#define list_for_each(pos, head) \ -+ for (pos = (head)->next; pos != (head); pos = pos->next) -+ -+/** -+ * list_for_each_prev - iterate over a list backwards -+ * @pos: the &struct list_head to use as a loop counter. -+ * @head: the head for your list. -+ */ -+#define list_for_each_prev(pos, head) \ -+ for (pos = (head)->prev; pos != (head); pos = pos->prev) -+ -+/** -+ * list_for_each_safe - iterate over a list safe against removal of list entry -+ * @pos: the &struct list_head to use as a loop counter. -+ * @n: another &struct list_head to use as temporary storage -+ * @head: the head for your list. -+ */ -+#define list_for_each_safe(pos, n, head) \ -+ for (pos = (head)->next, n = pos->next; pos != (head); \ -+ pos = n, n = pos->next) -+ -+/** -+ * list_for_each_entry - iterate over list of given type -+ * @pos: the type * to use as a loop counter. -+ * @head: the head for your list. -+ * @member: the name of the list_struct within the struct. -+ */ -+#define list_for_each_entry(pos, head, member) \ -+ for (pos = list_entry((head)->next, typeof(*pos), member); \ -+ &pos->member != (head); \ -+ pos = list_entry(pos->member.next, typeof(*pos), member)) -+ -+#endif -Index: klibc-1.5/usr/utils/modprobe.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ klibc-1.5/usr/utils/modprobe.c 2008-03-08 03:05:51.847688952 +0100 -@@ -0,0 +1,1710 @@ -+/* modprobe.c: insert a module into the kernel, intelligently. -+ Copyright (C) 2001 Rusty Russell. -+ Copyright (C) 2002, 2003 Rusty Russell, IBM Corporation. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+*/ -+#define _GNU_SOURCE /* asprintf */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#define streq(a,b) (strcmp((a),(b)) == 0) -+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) -+ -+#include "list.h" -+static inline void try_old_version(const char *progname, char *argv[]) -+{ -+} -+extern long init_module(void *, unsigned long, const char *); -+extern long delete_module(const char *, unsigned int); -+ -+struct module { -+ struct list_head list; -+ char *modname; -+ char filename[0]; -+}; -+ -+#ifndef MODULE_DIR -+#define MODULE_DIR "/lib/modules" -+#endif -+ -+typedef void (*errfn_t)(const char *fmt, ...); -+ -+/* Do we use syslog or stderr for messages? */ -+static int log; -+ -+static void message(const char *prefix, const char *fmt, va_list *arglist) -+{ -+ char *buf, *buf2; -+ -+ vasprintf(&buf, fmt, *arglist); -+ asprintf(&buf2, "%s%s", prefix, buf); -+ -+ if (log) -+ syslog(LOG_NOTICE, "%s", buf2); -+ else -+ fprintf(stderr, "%s", buf2); -+ free(buf2); -+ free(buf); -+} -+void *grab_contents(gzFile *gzfd, unsigned long *size) -+{ -+ unsigned int max = 16384; -+ void *buffer = malloc(max); -+ int ret; -+ -+ if (!buffer) -+ return NULL; -+ -+ *size = 0; -+ while ((ret = gzread(gzfd, buffer + *size, max - *size)) > 0) { -+ *size += ret; -+ if (*size == max) { -+ buffer = realloc(buffer, max *= 2); -+ if (!buffer) -+ return NULL; -+ } -+ } -+ if (ret < 0) { -+ free(buffer); -+ buffer = NULL; -+ } -+ return buffer; -+} -+ -+void *grab_fd(int fd, unsigned long *size) -+{ -+ gzFile gzfd; -+ -+ gzfd = gzdopen(fd, "rb"); -+ if (!gzfd) -+ return NULL; -+ -+ /* gzclose(gzfd) would close fd, which would drop locks. -+ Don't blame zlib: POSIX locking semantics are so horribly -+ broken that they should be ripped out. */ -+ return grab_contents(gzfd, size); -+} -+void release_file(void *data, unsigned long size) -+{ -+ free(data); -+} -+ -+ -+static int warned = 0; -+static void warn(const char *fmt, ...) -+{ -+ va_list arglist; -+ warned++; -+ va_start(arglist, fmt); -+ message("WARNING: ", fmt, &arglist); -+ va_end(arglist); -+} -+ -+static void fatal(const char *fmt, ...) -+{ -+ va_list arglist; -+ va_start(arglist, fmt); -+ message("FATAL: ", fmt, &arglist); -+ va_end(arglist); -+ exit(1); -+} -+ -+ -+static void grammar(const char *cmd, const char *filename, unsigned int line) -+{ -+ warn("%s line %u: ignoring bad line starting with '%s'\n", -+ filename, line, cmd); -+} -+ -+static void *do_nofail(void *ptr, const char *file, int line, const char *expr) -+{ -+ if (!ptr) { -+ fatal("Memory allocation failure %s line %d: %s.\n", -+ file, line, expr); -+ } -+ return ptr; -+} -+ -+#define NOFAIL(ptr) do_nofail((ptr), __FILE__, __LINE__, #ptr) -+ -+static void print_usage(const char *progname) -+{ -+ fprintf(stderr, -+ "Usage: %s [-v] [-V] [-C config-file] [-n] [-i] [-q] [-b] [-o ] [parameters...]\n" -+ "%s -r [-n] [-i] [-v] ...\n" -+ "%s -l -t [ -a ...]\n", -+ progname, progname, progname); -+ exit(1); -+} -+ -+static int fgetc_wrapped(FILE *file, unsigned int *linenum) -+{ -+ for (;;) { -+ int ch = fgetc(file); -+ if (ch != '\\') -+ return ch; -+ ch = fgetc(file); -+ if (ch != '\n') -+ return ch; -+ if (linenum) -+ (*linenum)++; -+ } -+} -+ -+static char *getline_wrapped(FILE *file, unsigned int *linenum) -+{ -+ int size = 1024; -+ int i = 0; -+ char *buf = NOFAIL(malloc(size)); -+ for(;;) { -+ int ch = fgetc_wrapped(file, linenum); -+ if (i == size) { -+ size *= 2; -+ buf = NOFAIL(realloc(buf, size)); -+ } -+ if (ch < 0 && i == 0) { -+ free(buf); -+ return NULL; -+ } -+ if (ch < 0 || ch == '\n') { -+ if (linenum) -+ (*linenum)++; -+ buf[i] = '\0'; -+ return NOFAIL(realloc(buf, i+1)); -+ } -+ buf[i++] = ch; -+ } -+} -+ -+static struct module *find_module(const char *filename, struct list_head *list) -+{ -+ struct module *i; -+ -+ list_for_each_entry(i, list, list) { -+ if (strcmp(i->filename, filename) == 0) -+ return i; -+ } -+ return NULL; -+} -+ -+/* Convert filename to the module name. Works if filename == modname, too. */ -+static void filename2modname(char *modname, const char *filename) -+{ -+ const char *afterslash; -+ unsigned int i; -+ -+ afterslash = strrchr(filename, '/'); -+ if (!afterslash) -+ afterslash = filename; -+ else -+ afterslash++; -+ -+ /* Convert to underscores, stop at first . */ -+ for (i = 0; afterslash[i] && afterslash[i] != '.'; i++) { -+ if (afterslash[i] == '-') -+ modname[i] = '_'; -+ else -+ modname[i] = afterslash[i]; -+ } -+ modname[i] = '\0'; -+} -+ -+static int lock_file(const char *filename) -+{ -+ int fd = open(filename, O_RDWR, 0); -+ -+ if (fd >= 0) { -+ struct flock lock; -+ lock.l_type = F_WRLCK; -+ lock.l_whence = SEEK_SET; -+ lock.l_start = 0; -+ lock.l_len = 1; -+ fcntl(fd, F_SETLKW, &lock); -+ } else -+ /* Read-only filesystem? There goes locking... */ -+ fd = open(filename, O_RDONLY, 0); -+ return fd; -+} -+ -+static void unlock_file(int fd) -+{ -+ /* Valgrind is picky... */ -+ close(fd); -+} -+ -+static void add_module(char *filename, int namelen, struct list_head *list) -+{ -+ struct module *mod; -+ -+ /* If it's a duplicate: move it to the end, so it gets -+ inserted where it is *first* required. */ -+ mod = find_module(filename, list); -+ if (mod) -+ list_del(&mod->list); -+ else { -+ /* No match. Create a new module. */ -+ mod = NOFAIL(malloc(sizeof(struct module) + namelen + 1)); -+ memcpy(mod->filename, filename, namelen); -+ mod->filename[namelen] = '\0'; -+ mod->modname = NOFAIL(malloc(namelen + 1)); -+ filename2modname(mod->modname, mod->filename); -+ } -+ -+ list_add_tail(&mod->list, list); -+} -+ -+/* Compare len chars of a to b, with _ and - equivalent. */ -+static int modname_equal(const char *a, const char *b, unsigned int len) -+{ -+ unsigned int i; -+ -+ if (strlen(b) != len) -+ return 0; -+ -+ for (i = 0; i < len; i++) { -+ if ((a[i] == '_' || a[i] == '-') -+ && (b[i] == '_' || b[i] == '-')) -+ continue; -+ if (a[i] != b[i]) -+ return 0; -+ } -+ return 1; -+} -+ -+/* Fills in list of modules if this is the line we want. */ -+static int add_modules_dep_line(char *line, -+ const char *name, -+ struct list_head *list) -+{ -+ char *ptr; -+ int len; -+ char *modname; -+ -+ /* Ignore lines without : or which start with a # */ -+ ptr = strchr(line, ':'); -+ if (ptr == NULL || line[strspn(line, "\t ")] == '#') -+ return 0; -+ -+ /* Is this the module we are looking for? */ -+ *ptr = '\0'; -+ if (strrchr(line, '/')) -+ modname = strrchr(line, '/') + 1; -+ else -+ modname = line; -+ -+ len = strlen(modname); -+ if (strchr(modname, '.')) -+ len = strchr(modname, '.') - modname; -+ if (!modname_equal(modname, name, len)) -+ return 0; -+ -+ /* Create the list. */ -+ add_module(line, ptr - line, list); -+ -+ ptr++; -+ for(;;) { -+ char *dep_start; -+ ptr += strspn(ptr, " \t"); -+ if (*ptr == '\0') -+ break; -+ dep_start = ptr; -+ ptr += strcspn(ptr, " \t"); -+ add_module(dep_start, ptr - dep_start, list); -+ } -+ return 1; -+} -+ -+static void read_depends(const char *dirname, -+ const char *start_name, -+ struct list_head *list) -+{ -+ char *modules_dep_name; -+ char *line; -+ FILE *modules_dep; -+ int done = 0; -+ -+ asprintf(&modules_dep_name, "%s/%s", dirname, "modules.dep"); -+ modules_dep = fopen(modules_dep_name, "r"); -+ if (!modules_dep) -+ fatal("Could not load %s: %s\n", -+ modules_dep_name, strerror(errno)); -+ -+ /* Stop at first line, as we can have duplicates (eg. symlinks -+ from boot/ */ -+ while (!done && (line = getline_wrapped(modules_dep, NULL)) != NULL) { -+ done = add_modules_dep_line(line, start_name, list); -+ free(line); -+ } -+ fclose(modules_dep); -+ free(modules_dep_name); -+} -+ -+/* We use error numbers in a loose translation... */ -+static const char *insert_moderror(int err) -+{ -+ switch (err) { -+ case ENOEXEC: -+ return "Invalid module format"; -+ case ENOENT: -+ return "Unknown symbol in module, or unknown parameter (see dmesg)"; -+ case ENOSYS: -+ return "Kernel does not have module support"; -+ default: -+ return strerror(err); -+ } -+} -+ -+static const char *remove_moderror(int err) -+{ -+ switch (err) { -+ case ENOENT: -+ return "No such module"; -+ case ENOSYS: -+ return "Kernel does not have module unloading support"; -+ default: -+ return strerror(err); -+ } -+} -+ -+/* Is module in /proc/modules? If so, fill in usecount if not NULL. -+ 0 means no, 1 means yes, -1 means unknown. -+ */ -+static int module_in_kernel(const char *modname, unsigned int *usecount) -+{ -+ FILE *proc_modules; -+ char *line; -+ -+again: -+ /* Might not be mounted yet. Don't fail. */ -+ proc_modules = fopen("/proc/modules", "r"); -+ if (!proc_modules) -+ return -1; -+ -+ while ((line = getline_wrapped(proc_modules, NULL)) != NULL) { -+ char *entry = strtok(line, " \n"); -+ -+ if (entry && streq(entry, modname)) { -+ /* If it exists, usecount is the third entry. */ -+ if (!strtok(NULL, " \n")) -+ goto out; -+ -+ if (!(entry = strtok(NULL, " \n"))) /* usecount */ -+ goto out; -+ else -+ if (usecount) -+ *usecount = atoi(entry); -+ -+ /* Followed by - then status. */ -+ if (strtok(NULL, " \n") -+ && (entry = strtok(NULL, " \n")) != NULL) { -+ /* Locking will fail on ro fs, we might hit -+ * cases where module is in flux. Spin. */ -+ if (streq(entry, "Loading") -+ || streq(entry, "Unloading")) { -+ usleep(100000); -+ free(line); -+ fclose(proc_modules); -+ goto again; -+ } -+ } -+ -+ out: -+ free(line); -+ fclose(proc_modules); -+ return 1; -+ } -+ free(line); -+ } -+ fclose(proc_modules); -+ return 0; -+} -+ -+static void replace_modname(struct module *module, -+ void *mem, unsigned long len, -+ const char *oldname, const char *newname) -+{ -+ char *p; -+ -+ /* 64 - sizeof(unsigned long) - 1 */ -+ if (strlen(newname) > 55) -+ fatal("New name %s is too long\n", newname); -+ -+ /* Find where it is in the module structure. Don't assume layout! */ -+ for (p = mem; p < (char *)mem + len - strlen(oldname); p++) { -+ if (memcmp(p, oldname, strlen(oldname)) == 0) { -+ strcpy(p, newname); -+ return; -+ } -+ } -+ -+ warn("Could not find old name in %s to replace!\n", module->filename); -+} -+ -+static void *get_section32(void *file, -+ unsigned long size, -+ const char *name, -+ unsigned long *secsize) -+{ -+ Elf32_Ehdr *hdr = file; -+ Elf32_Shdr *sechdrs = file + hdr->e_shoff; -+ const char *secnames; -+ unsigned int i; -+ -+ /* Too short? */ -+ if (size < sizeof(*hdr)) -+ return NULL; -+ if (size < hdr->e_shoff + hdr->e_shnum * sizeof(sechdrs[0])) -+ return NULL; -+ if (size < sechdrs[hdr->e_shstrndx].sh_offset) -+ return NULL; -+ -+ secnames = file + sechdrs[hdr->e_shstrndx].sh_offset; -+ for (i = 1; i < hdr->e_shnum; i++) -+ if (strcmp(secnames + sechdrs[i].sh_name, name) == 0) { -+ *secsize = sechdrs[i].sh_size; -+ return file + sechdrs[i].sh_offset; -+ } -+ return NULL; -+} -+ -+static void *get_section64(void *file, -+ unsigned long size, -+ const char *name, -+ unsigned long *secsize) -+{ -+ Elf64_Ehdr *hdr = file; -+ Elf64_Shdr *sechdrs = file + hdr->e_shoff; -+ const char *secnames; -+ unsigned int i; -+ -+ /* Too short? */ -+ if (size < sizeof(*hdr)) -+ return NULL; -+ if (size < hdr->e_shoff + hdr->e_shnum * sizeof(sechdrs[0])) -+ return NULL; -+ if (size < sechdrs[hdr->e_shstrndx].sh_offset) -+ return NULL; -+ -+ secnames = file + sechdrs[hdr->e_shstrndx].sh_offset; -+ for (i = 1; i < hdr->e_shnum; i++) -+ if (strcmp(secnames + sechdrs[i].sh_name, name) == 0) { -+ *secsize = sechdrs[i].sh_size; -+ return file + sechdrs[i].sh_offset; -+ } -+ return NULL; -+} -+ -+static int elf_ident(void *mod, unsigned long size) -+{ -+ /* "\177ELF" where byte = 001 for 32-bit, 002 for 64 */ -+ char *ident = mod; -+ -+ if (size < EI_CLASS || memcmp(mod, ELFMAG, SELFMAG) != 0) -+ return ELFCLASSNONE; -+ return ident[EI_CLASS]; -+} -+ -+static void *get_section(void *file, -+ unsigned long size, -+ const char *name, -+ unsigned long *secsize) -+{ -+ switch (elf_ident(file, size)) { -+ case ELFCLASS32: -+ return get_section32(file, size, name, secsize); -+ case ELFCLASS64: -+ return get_section64(file, size, name, secsize); -+ default: -+ return NULL; -+ } -+} -+ -+static void rename_module(struct module *module, -+ void *mod, -+ unsigned long len, -+ const char *newname) -+{ -+ void *modstruct; -+ unsigned long modstruct_len; -+ -+ /* Old-style */ -+ modstruct = get_section(mod, len, ".gnu.linkonce.this_module", -+ &modstruct_len); -+ /* New-style */ -+ if (!modstruct) -+ modstruct = get_section(mod, len, "__module", &modstruct_len); -+ if (!modstruct) -+ warn("Could not find module name to change in %s\n", -+ module->filename); -+ else -+ replace_modname(module, modstruct, modstruct_len, -+ module->modname, newname); -+} -+ -+/* Kernel told to ignore these sections if SHF_ALLOC not set. */ -+static void invalidate_section32(void *mod, const char *secname) -+{ -+ Elf32_Ehdr *hdr = mod; -+ Elf32_Shdr *sechdrs = mod + hdr->e_shoff; -+ const char *secnames = mod + sechdrs[hdr->e_shstrndx].sh_offset; -+ unsigned int i; -+ -+ for (i = 1; i < hdr->e_shnum; i++) -+ if (strcmp(secnames+sechdrs[i].sh_name, secname) == 0) -+ sechdrs[i].sh_flags &= ~SHF_ALLOC; -+} -+ -+static void invalidate_section64(void *mod, const char *secname) -+{ -+ Elf64_Ehdr *hdr = mod; -+ Elf64_Shdr *sechdrs = mod + hdr->e_shoff; -+ const char *secnames = mod + sechdrs[hdr->e_shstrndx].sh_offset; -+ unsigned int i; -+ -+ for (i = 1; i < hdr->e_shnum; i++) -+ if (strcmp(secnames+sechdrs[i].sh_name, secname) == 0) -+ sechdrs[i].sh_flags &= ~(unsigned long long)SHF_ALLOC; -+} -+ -+static void strip_section(struct module *module, -+ void *mod, -+ unsigned long len, -+ const char *secname) -+{ -+ switch (elf_ident(mod, len)) { -+ case ELFCLASS32: -+ invalidate_section32(mod, secname); -+ break; -+ case ELFCLASS64: -+ invalidate_section64(mod, secname); -+ break; -+ default: -+ warn("Unknown module format in %s: not forcing version\n", -+ module->filename); -+ } -+} -+ -+static const char *next_string(const char *string, unsigned long *secsize) -+{ -+ /* Skip non-zero chars */ -+ while (string[0]) { -+ string++; -+ if ((*secsize)-- <= 1) -+ return NULL; -+ } -+ -+ /* Skip any zero padding. */ -+ while (!string[0]) { -+ string++; -+ if ((*secsize)-- <= 1) -+ return NULL; -+ } -+ return string; -+} -+ -+static void clear_magic(struct module *module, void *mod, unsigned long len) -+{ -+ const char *p; -+ unsigned long modlen; -+ -+ /* Old-style: __vermagic section */ -+ strip_section(module, mod, len, "__vermagic"); -+ -+ /* New-style: in .modinfo section */ -+ for (p = get_section(mod, len, ".modinfo", &modlen); -+ p; -+ p = next_string(p, &modlen)) { -+ if (strncmp(p, "vermagic=", strlen("vermagic=")) == 0) { -+ memset((char *)p, 0, strlen(p)); -+ return; -+ } -+ } -+} -+ -+struct module_options -+{ -+ struct module_options *next; -+ char *modulename; -+ char *options; -+}; -+ -+struct module_command -+{ -+ struct module_command *next; -+ char *modulename; -+ char *command; -+}; -+ -+struct module_alias -+{ -+ struct module_alias *next; -+ char *module; -+}; -+ -+struct module_blacklist -+{ -+ struct module_blacklist *next; -+ char *modulename; -+}; -+ -+/* Link in a new option line from the config file. */ -+static struct module_options * -+add_options(const char *modname, -+ const char *option, -+ struct module_options *options) -+{ -+ struct module_options *new; -+ char *tab; -+ -+ new = NOFAIL(malloc(sizeof(*new))); -+ new->modulename = NOFAIL(strdup(modname)); -+ new->options = NOFAIL(strdup(option)); -+ /* We can handle tabs, kernel can't. */ -+ for (tab = strchr(new->options, '\t'); tab; tab = strchr(tab, '\t')) -+ *tab = ' '; -+ new->next = options; -+ return new; -+} -+ -+/* Link in a new install line from the config file. */ -+static struct module_command * -+add_command(const char *modname, -+ const char *command, -+ struct module_command *commands) -+{ -+ struct module_command *new; -+ -+ new = NOFAIL(malloc(sizeof(*new))); -+ new->modulename = NOFAIL(strdup(modname)); -+ new->command = NOFAIL(strdup(command)); -+ new->next = commands; -+ return new; -+} -+ -+/* Link in a new alias line from the config file. */ -+static struct module_alias * -+add_alias(const char *modname, struct module_alias *aliases) -+{ -+ struct module_alias *new; -+ -+ new = NOFAIL(malloc(sizeof(*new))); -+ new->module = NOFAIL(strdup(modname)); -+ new->next = aliases; -+ return new; -+} -+ -+/* Link in a new blacklist line from the config file. */ -+static struct module_blacklist * -+add_blacklist(const char *modname, struct module_blacklist *blacklist) -+{ -+ struct module_blacklist *new; -+ -+ new = NOFAIL(malloc(sizeof(*new))); -+ new->modulename = NOFAIL(strdup(modname)); -+ new->next = blacklist; -+ return new; -+} -+ -+/* Find blacklist commands if any. */ -+static int -+find_blacklist(const char *modname, const struct module_blacklist *blacklist) -+{ -+ while (blacklist) { -+ if (strcmp(blacklist->modulename, modname) == 0) -+ return 1; -+ blacklist = blacklist->next; -+ } -+ return 0; -+} -+ -+/* return a new alias list, with backlisted elems filtered out */ -+static struct module_alias * -+apply_blacklist(const struct module_alias *aliases, -+ const struct module_blacklist *blacklist) -+{ -+ struct module_alias *result = NULL; -+ while (aliases) { -+ char *modname = aliases->module; -+ if (!find_blacklist(modname, blacklist)) -+ result = add_alias(modname, result); -+ aliases = aliases->next; -+ } -+ return result; -+} -+ -+/* Find install commands if any. */ -+static const char *find_command(const char *modname, -+ const struct module_command *commands) -+{ -+ while (commands) { -+ if (fnmatch(commands->modulename, modname, 0) == 0) -+ return commands->command; -+ commands = commands->next; -+ } -+ return NULL; -+} -+ -+static char *append_option(char *options, const char *newoption) -+{ -+ options = NOFAIL(realloc(options, strlen(options) + 1 -+ + strlen(newoption) + 1)); -+ if (strlen(options)) strcat(options, " "); -+ strcat(options, newoption); -+ return options; -+} -+ -+/* Add to options */ -+static char *add_extra_options(const char *modname, -+ char *optstring, -+ const struct module_options *options) -+{ -+ while (options) { -+ if (strcmp(options->modulename, modname) == 0) -+ optstring = append_option(optstring, options->options); -+ options = options->next; -+ } -+ return optstring; -+} -+ -+/* If we don't flush, then child processes print before we do */ -+static void verbose_printf(int verbose, const char *fmt, ...) -+{ -+ va_list arglist; -+ -+ if (verbose) { -+ va_start(arglist, fmt); -+ vprintf(fmt, arglist); -+ fflush(stdout); -+ va_end(arglist); -+ } -+} -+ -+/* Do an install/remove command: replace $CMDLINE_OPTS if it's specified. */ -+static void do_command(const char *modname, -+ const char *command, -+ int verbose, int dry_run, -+ errfn_t error, -+ const char *type, -+ const char *cmdline_opts) -+{ -+ int ret; -+ char *p, *replaced_cmd = NOFAIL(strdup(command)); -+ -+ while ((p = strstr(replaced_cmd, "$CMDLINE_OPTS")) != NULL) { -+ char *new; -+ asprintf(&new, "%.*s%s%s", -+ p - replaced_cmd, replaced_cmd, cmdline_opts, -+ p + strlen("$CMDLINE_OPTS")); -+ NOFAIL(new); -+ free(replaced_cmd); -+ replaced_cmd = new; -+ } -+ -+ verbose_printf(verbose, "%s %s\n", type, replaced_cmd); -+ if (dry_run) -+ return; -+ -+ setenv("MODPROBE_MODULE", modname, 1); -+ ret = system(replaced_cmd); -+ if (ret == -1 || WEXITSTATUS(ret)) -+ error("Error running %s command for %s\n", type, modname); -+ free(replaced_cmd); -+} -+ -+/* Actually do the insert. Frees second arg. */ -+static void insmod(struct list_head *list, -+ char *optstring, -+ const char *newname, -+ int first_time, -+ errfn_t error, -+ int dry_run, -+ int verbose, -+ const struct module_options *options, -+ const struct module_command *commands, -+ int ignore_commands, -+ int ignore_proc, -+ int strip_vermagic, -+ int strip_modversion, -+ const char *cmdline_opts) -+{ -+ int ret, fd; -+ unsigned long len; -+ void *map; -+ const char *command; -+ struct module *mod = list_entry(list->next, struct module, list); -+ -+ /* Take us off the list. */ -+ list_del(&mod->list); -+ -+ /* Do things we (or parent) depend on first, but don't die if -+ * they fail. */ -+ if (!list_empty(list)) { -+ insmod(list, NOFAIL(strdup("")), NULL, 0, warn, -+ dry_run, verbose, options, commands, 0, ignore_proc, -+ strip_vermagic, strip_modversion, cmdline_opts); -+ } -+ -+ /* Lock before we look, in case it's initializing. */ -+ fd = lock_file(mod->filename); -+ if (fd < 0) { -+ error("Could not open '%s': %s\n", -+ mod->filename, strerror(errno)); -+ goto out_optstring; -+ } -+ -+ /* Don't do ANYTHING if already in kernel. */ -+ if (!ignore_proc -+ && module_in_kernel(newname ?: mod->modname, NULL) == 1) { -+ if (first_time) -+ error("Module %s already in kernel.\n", -+ newname ?: mod->modname); -+ goto out_unlock; -+ } -+ -+ command = find_command(mod->modname, commands); -+ if (command && !ignore_commands) { -+ /* It might recurse: unlock. */ -+ unlock_file(fd); -+ do_command(mod->modname, command, verbose, dry_run, error, -+ "install", cmdline_opts); -+ goto out_optstring; -+ } -+ -+ map = grab_fd(fd, &len); -+ if (!map) { -+ error("Could not read '%s': %s\n", -+ mod->filename, strerror(errno)); -+ goto out_unlock; -+ } -+ -+ /* Rename it? */ -+ if (newname) -+ rename_module(mod, map, len, newname); -+ -+ if (strip_modversion) -+ strip_section(mod, map, len, "__versions"); -+ if (strip_vermagic) -+ clear_magic(mod, map, len); -+ -+ /* Config file might have given more options */ -+ optstring = add_extra_options(mod->modname, optstring, options); -+ -+ verbose_printf(verbose, "insmod %s %s\n", mod->filename, optstring); -+ -+ if (dry_run) -+ goto out; -+ -+ ret = init_module(map, len, optstring); -+ if (ret != 0) { -+ if (errno == EEXIST) { -+ if (first_time) -+ error("Module %s already in kernel.\n", -+ newname ?: mod->modname); -+ goto out_unlock; -+ } -+ error("Error inserting %s (%s): %s\n", -+ mod->modname, mod->filename, insert_moderror(errno)); -+ } -+ out: -+ release_file(map, len); -+ out_unlock: -+ unlock_file(fd); -+ out_optstring: -+ free(optstring); -+ return; -+} -+ -+/* Do recursive removal. */ -+static void rmmod(struct list_head *list, -+ const char *name, -+ int first_time, -+ errfn_t error, -+ int dry_run, -+ int verbose, -+ struct module_command *commands, -+ int ignore_commands, -+ int ignore_inuse, -+ const char *cmdline_opts) -+{ -+ const char *command; -+ unsigned int usecount = 0; -+ int lock; -+ struct module *mod = list_entry(list->next, struct module, list); -+ -+ /* Take first one off the list. */ -+ list_del(&mod->list); -+ -+ /* Ignore failure; it's best effort here. */ -+ lock = lock_file(mod->filename); -+ -+ if (!name) -+ name = mod->modname; -+ -+ /* Even if renamed, find commands to orig. name. */ -+ command = find_command(mod->modname, commands); -+ if (command && !ignore_commands) { -+ /* It might recurse: unlock. */ -+ unlock_file(lock); -+ do_command(mod->modname, command, verbose, dry_run, error, -+ "remove", cmdline_opts); -+ goto remove_rest_no_unlock; -+ } -+ -+ if (module_in_kernel(name, &usecount) == 0) -+ goto nonexistent_module; -+ -+ if (usecount != 0) { -+ if (!ignore_inuse) -+ error("Module %s is in use.\n", name); -+ goto remove_rest; -+ } -+ -+ verbose_printf(verbose, "rmmod %s\n", mod->filename); -+ -+ if (dry_run) -+ goto remove_rest; -+ -+ if (delete_module(name, O_EXCL) != 0) { -+ if (errno == ENOENT) -+ goto nonexistent_module; -+ error("Error removing %s (%s): %s\n", -+ name, mod->filename, -+ remove_moderror(errno)); -+ } -+ -+ remove_rest: -+ unlock_file(lock); -+ remove_rest_no_unlock: -+ /* Now do things we depend. */ -+ if (!list_empty(list)) -+ rmmod(list, NULL, 0, warn, dry_run, verbose, commands, -+ 0, 1, cmdline_opts); -+ return; -+ -+nonexistent_module: -+ if (first_time) -+ fatal("Module %s is not in kernel.\n", mod->modname); -+ goto remove_rest; -+} -+ -+/* Does path contain directory(s) subpath? */ -+static int type_matches(const char *path, const char *subpath) -+{ -+ char *subpath_with_slashes; -+ int ret; -+ -+ asprintf(&subpath_with_slashes, "/%s/", subpath); -+ NOFAIL(subpath_with_slashes); -+ -+ ret = (strstr(path, subpath_with_slashes) != NULL); -+ free(subpath_with_slashes); -+ return ret; -+} -+ -+static char *underscores(char *string) -+{ -+ if (string) { -+ unsigned int i; -+ for (i = 0; string[i]; i++) -+ if (string[i] == '-') -+ string[i] = '_'; -+ } -+ return string; -+} -+ -+static int do_wildcard(const char *dirname, -+ const char *type, -+ const char *wildcard) -+{ -+ char modules_dep_name[strlen(dirname) + sizeof("modules.dep") + 1]; -+ char *line, *wcard; -+ FILE *modules_dep; -+ -+ /* Canonicalize wildcard */ -+ wcard = strdup(wildcard); -+ underscores(wcard); -+ -+ sprintf(modules_dep_name, "%s/%s", dirname, "modules.dep"); -+ modules_dep = fopen(modules_dep_name, "r"); -+ if (!modules_dep) -+ fatal("Could not load %s: %s\n", -+ modules_dep_name, strerror(errno)); -+ -+ while ((line = getline_wrapped(modules_dep, NULL)) != NULL) { -+ char *ptr; -+ -+ /* Ignore lines without : or which start with a # */ -+ ptr = strchr(line, ':'); -+ if (ptr == NULL || line[strspn(line, "\t ")] == '#') -+ goto next; -+ *ptr = '\0'; -+ -+ /* "type" must match complete directory component(s). */ -+ if (!type || type_matches(line, type)) { -+ char modname[strlen(line)+1]; -+ -+ filename2modname(modname, line); -+ if (fnmatch(wcard, modname, 0) == 0) -+ printf("%s\n", line); -+ } -+ next: -+ free(line); -+ } -+ -+ free(wcard); -+ return 0; -+} -+ -+static char *strsep_skipspace(char **string, char *delim) -+{ -+ if (!*string) -+ return NULL; -+ *string += strspn(*string, delim); -+ return strsep(string, delim); -+} -+ -+/* Recursion */ -+static int read_config(const char *filename, -+ const char *name, -+ int dump_only, -+ int removing, -+ struct module_options **options, -+ struct module_command **commands, -+ struct module_alias **alias, -+ struct module_blacklist **blacklist); -+ -+/* FIXME: Maybe should be extended to "alias a b [and|or c]...". --RR */ -+static int read_config_file(const char *filename, -+ const char *name, -+ int dump_only, -+ int removing, -+ struct module_options **options, -+ struct module_command **commands, -+ struct module_alias **aliases, -+ struct module_blacklist **blacklist) -+{ -+ char *line; -+ unsigned int linenum = 0; -+ FILE *cfile; -+ -+ cfile = fopen(filename, "r"); -+ if (!cfile) -+ return 0; -+ -+ while ((line = getline_wrapped(cfile, &linenum)) != NULL) { -+ char *ptr = line; -+ char *cmd, *modname; -+ -+ if (dump_only) -+ printf("%s\n", line); -+ -+ cmd = strsep_skipspace(&ptr, "\t "); -+ if (cmd == NULL || cmd[0] == '#' || cmd[0] == '\0') -+ continue; -+ -+ if (strcmp(cmd, "alias") == 0) { -+ char *wildcard -+ = underscores(strsep_skipspace(&ptr, "\t ")); -+ char *realname -+ = underscores(strsep_skipspace(&ptr, "\t ")); -+ -+ if (!wildcard || !realname) -+ grammar(cmd, filename, linenum); -+ else if (fnmatch(wildcard,name,0) == 0) -+ *aliases = add_alias(realname, *aliases); -+ } else if (strcmp(cmd, "include") == 0) { -+ struct module_alias *newalias = NULL; -+ char *newfilename; -+ -+ newfilename = strsep_skipspace(&ptr, "\t "); -+ if (!newfilename) -+ grammar(cmd, filename, linenum); -+ else { -+ if (!read_config(newfilename, name, -+ dump_only, removing, -+ options, commands, &newalias, -+ blacklist)) -+ warn("Failed to open included" -+ " config file %s: %s\n", -+ newfilename, strerror(errno)); -+ -+ /* Files included override aliases, -+ etc that was already set ... */ -+ if (newalias) -+ *aliases = newalias; -+ } -+ } else if (strcmp(cmd, "options") == 0) { -+ modname = strsep_skipspace(&ptr, "\t "); -+ if (!modname || !ptr) -+ grammar(cmd, filename, linenum); -+ else { -+ ptr += strspn(ptr, "\t "); -+ *options = add_options(underscores(modname), -+ ptr, *options); -+ } -+ } else if (strcmp(cmd, "install") == 0) { -+ modname = strsep_skipspace(&ptr, "\t "); -+ if (!modname || !ptr) -+ grammar(cmd, filename, linenum); -+ else if (!removing) { -+ ptr += strspn(ptr, "\t "); -+ *commands = add_command(underscores(modname), -+ ptr, *commands); -+ } -+ } else if (strcmp(cmd, "blacklist") == 0) { -+ modname = strsep_skipspace(&ptr, "\t "); -+ if (!modname) -+ grammar(cmd, filename, linenum); -+ else if (!removing) { -+ *blacklist = add_blacklist(underscores(modname), -+ *blacklist); -+ } -+ } else if (strcmp(cmd, "remove") == 0) { -+ modname = strsep_skipspace(&ptr, "\t "); -+ if (!modname || !ptr) -+ grammar(cmd, filename, linenum); -+ else if (removing) { -+ ptr += strspn(ptr, "\t "); -+ *commands = add_command(underscores(modname), -+ ptr, *commands); -+ } -+ } else -+ grammar(cmd, filename, linenum); -+ -+ free(line); -+ } -+ fclose(cfile); -+ return 1; -+} -+ -+/* Simple format, ignore lines starting with #, one command per line. -+ Returns true or false. */ -+static int read_config(const char *filename, -+ const char *name, -+ int dump_only, -+ int removing, -+ struct module_options **options, -+ struct module_command **commands, -+ struct module_alias **aliases, -+ struct module_blacklist **blacklist) -+{ -+ DIR *dir; -+ int ret = 0; -+ -+ /* ignore everything in this directory */ -+ if (streq(filename, "/etc/modprobe.d/arch")) -+ return 1; -+ -+ /* Reiser4 has file/directory duality: treat it as both. */ -+ dir = opendir(filename); -+ if (dir) { -+ struct dirent *i; -+ while ((i = readdir(dir)) != NULL) { -+ if (!streq(i->d_name,".") && !streq(i->d_name,"..")) { -+ char sub[strlen(filename) + 1 -+ + strlen(i->d_name) + 1]; -+ -+ sprintf(sub, "%s/%s", filename, i->d_name); -+ if (!read_config(sub, name, -+ dump_only, removing, options, -+ commands, aliases, blacklist)) -+ warn("Failed to open" -+ " config file %s: %s\n", -+ sub, strerror(errno)); -+ } -+ } -+ closedir(dir); -+ ret = 1; -+ } -+ -+ if (read_config_file(filename, name, dump_only, removing, -+ options, commands, aliases, blacklist)) -+ ret = 1; -+ -+ return ret; -+} -+ -+static const char *default_configs[] = -+{ -+ "/etc/modprobe.conf", -+ "/etc/modprobe.d", -+}; -+ -+static void read_toplevel_config(const char *filename, -+ const char *name, -+ int dump_only, -+ int removing, -+ struct module_options **options, -+ struct module_command **commands, -+ struct module_alias **aliases, -+ struct module_blacklist **blacklist) -+{ -+ unsigned int i; -+ -+ if (filename) { -+ if (!read_config(filename, name, dump_only, removing, -+ options, commands, aliases, blacklist)) -+ fatal("Failed to open config file %s: %s\n", -+ filename, strerror(errno)); -+ return; -+ } -+ -+ /* Try defaults. */ -+ for (i = 0; i < ARRAY_SIZE(default_configs); i++) { -+ if (read_config(default_configs[i], name, dump_only, removing, -+ options, commands, aliases, blacklist)) -+ return; -+ } -+} -+ -+static void add_to_env_var(const char *option) -+{ -+ const char *oldenv; -+ -+ if ((oldenv = getenv("MODPROBE_OPTIONS")) != NULL) { -+ char *newenv; -+ asprintf(&newenv, "%s %s", oldenv, option); -+ setenv("MODPROBE_OPTIONS", newenv, 1); -+ } else -+ setenv("MODPROBE_OPTIONS", option, 1); -+} -+ -+/* Prepend options from environment. */ -+static char **merge_args(char *args, char *argv[], int *argc) -+{ -+ char *arg, *argstring; -+ char **newargs = NULL; -+ unsigned int i, num_env = 0; -+ -+ if (!args) -+ return argv; -+ -+ argstring = NOFAIL(strdup(args)); -+ for (arg = strtok(argstring, " "); arg; arg = strtok(NULL, " ")) { -+ num_env++; -+ newargs = NOFAIL(realloc(newargs, -+ sizeof(newargs[0]) -+ * (num_env + *argc + 1))); -+ newargs[num_env] = arg; -+ } -+ -+ /* Append commandline args */ -+ newargs[0] = argv[0]; -+ for (i = 1; i <= *argc; i++) -+ newargs[num_env+i] = argv[i]; -+ -+ *argc += num_env; -+ return newargs; -+} -+ -+static char *gather_options(char *argv[]) -+{ -+ char *optstring = NOFAIL(strdup("")); -+ -+ /* Rest is module options */ -+ while (*argv) { -+ /* Quote value if it contains spaces. */ -+ unsigned int eq = strcspn(*argv, "="); -+ -+ if (strchr(*argv+eq, ' ') && !strchr(*argv, '"')) { -+ char quoted[strlen(*argv) + 3]; -+ (*argv)[eq] = '\0'; -+ sprintf(quoted, "%s=\"%s\"", *argv, *argv+eq+1); -+ optstring = append_option(optstring, quoted); -+ } else -+ optstring = append_option(optstring, *argv); -+ argv++; -+ } -+ return optstring; -+} -+ -+static void handle_module(const char *modname, -+ struct list_head *todo_list, -+ const char *newname, -+ int remove, -+ char *options, -+ int first_time, -+ errfn_t error, -+ int dry_run, -+ int verbose, -+ struct module_options *modoptions, -+ struct module_command *commands, -+ int ignore_commands, -+ int ignore_proc, -+ int strip_vermagic, -+ int strip_modversion, -+ int unknown_silent, -+ const char *cmdline_opts) -+{ -+ if (list_empty(todo_list)) { -+ const char *command; -+ -+ /* The dependencies have to be real modules, but -+ handle case where the first is completely bogus. */ -+ command = find_command(modname, commands); -+ if (command && !ignore_commands) { -+ do_command(modname, command, verbose, dry_run, error, -+ remove ? "remove":"install", cmdline_opts); -+ return; -+ } -+ -+ if (unknown_silent) -+ exit(1); -+ error("Module %s not found.\n", modname); -+ return; -+ } -+ -+ if (remove) -+ rmmod(todo_list, newname, first_time, error, dry_run, verbose, -+ commands, ignore_commands, 0, cmdline_opts); -+ else -+ insmod(todo_list, NOFAIL(strdup(options)), newname, -+ first_time, error, dry_run, verbose, modoptions, -+ commands, ignore_commands, ignore_proc, strip_vermagic, -+ strip_modversion, cmdline_opts); -+} -+ -+static struct option options[] = { { "verbose", 0, NULL, 'v' }, -+ { "version", 0, NULL, 'V' }, -+ { "config", 1, NULL, 'C' }, -+ { "name", 1, NULL, 'o' }, -+ { "remove", 0, NULL, 'r' }, -+ { "showconfig", 0, NULL, 'c' }, -+ { "autoclean", 0, NULL, 'k' }, -+ { "quiet", 0, NULL, 'q' }, -+ { "show", 0, NULL, 'n' }, -+ { "dry-run", 0, NULL, 'n' }, -+ { "syslog", 0, NULL, 's' }, -+ { "type", 1, NULL, 't' }, -+ { "list", 0, NULL, 'l' }, -+ { "all", 0, NULL, 'a' }, -+ { "ignore-install", 0, NULL, 'i' }, -+ { "ignore-remove", 0, NULL, 'i' }, -+ { "force", 0, NULL, 'f' }, -+ { "force-vermagic", 0, NULL, 1 }, -+ { "force-modversion", 0, NULL, 2 }, -+ { "set-version", 1, NULL, 'S' }, -+ { "show-depends", 0, NULL, 'D' }, -+ { "first-time", 0, NULL, 3 }, -+ { "use-blacklist", 0, NULL, 'b' }, -+ { NULL, 0, NULL, 0 } }; -+ -+#define MODPROBE_DEVFSD_CONF "/etc/modprobe.devfs" -+ -+/* This is a horrible hack to allow devfsd, which calls modprobe with -+ -C /etc/modules.conf or /etc/modules.devfs, to work. FIXME. */ -+/* Modern devfsd or variants should use -q explicitly in 2.6. */ -+static int is_devfs_call(char *argv[]) -+{ -+ unsigned int i; -+ -+ /* Look for "/dev" arg */ -+ for (i = 1; argv[i]; i++) { -+ if (strncmp(argv[i], "/dev/", 5) == 0) -+ return 1; -+ } -+ return 0; -+} -+ -+int main(int argc, char *argv[]) -+{ -+ struct utsname buf; -+ struct stat statbuf; -+ int opt; -+ int dump_only = 0; -+ int dry_run = 0; -+ int remove = 0; -+ int verbose = 0; -+ int unknown_silent = 0; -+ int list_only = 0; -+ int all = 0; -+ int ignore_commands = 0; -+ int strip_vermagic = 0; -+ int strip_modversion = 0; -+ int ignore_proc = 0; -+ int first_time = 0; -+ int use_blacklist = 0; -+ unsigned int i, num_modules; -+ char *type = NULL; -+ const char *config = NULL; -+ char *dirname, *optstring; -+ char *newname = NULL; -+ char *aliasfilename, *symfilename; -+ errfn_t error = fatal; -+ -+ /* Prepend options from environment. */ -+ argv = merge_args(getenv("MODPROBE_OPTIONS"), argv, &argc); -+ -+ /* --set-version overrides version, and disables backwards compat. */ -+ for (opt = 1; opt < argc; opt++) -+ if (strncmp(argv[opt],"--set-version",strlen("--set-version")) -+ == 0) -+ break; -+ -+ if (opt == argc) -+ try_old_version("modprobe", argv); -+ -+ uname(&buf); -+ while ((opt = getopt_long(argc, argv, "vVC:o:rknqQsclt:aifb", options, NULL)) != -1){ -+ switch (opt) { -+ case 'v': -+ add_to_env_var("-v"); -+ verbose = 1; -+ break; -+ case 'V': -+ puts("module-init-tools version 3.2.2"); -+ exit(0); -+ case 'S': -+ strncpy(buf.release, optarg, sizeof(buf.release)); -+ buf.release[sizeof(buf.release)-1] = '\0'; -+ break; -+ case 'C': -+ if (is_devfs_call(argv)) { -+ if (streq("/etc/modules.devfs", optarg)) { -+ config = MODPROBE_DEVFSD_CONF; -+ add_to_env_var("-C"); -+ add_to_env_var(config); -+ /* Fall thru to -q */ -+ } else if (streq("/etc/modules.conf", optarg)) -+ /* Ignore config, fall thru to -q */ -+ ; -+ else { -+ /* False alarm. Treat as normal. */ -+ config = optarg; -+ add_to_env_var("-C"); -+ add_to_env_var(config); -+ break; -+ } -+ } else { -+ config = optarg; -+ add_to_env_var("-C"); -+ add_to_env_var(config); -+ break; -+ } -+ case 'q': -+ unknown_silent = 1; -+ add_to_env_var("-q"); -+ break; -+ case 'D': -+ dry_run = 1; -+ ignore_proc = 1; -+ verbose = 1; -+ add_to_env_var("-D"); -+ break; -+ case 'o': -+ newname = optarg; -+ break; -+ case 'r': -+ remove = 1; -+ break; -+ case 'c': -+ dump_only = 1; -+ break; -+ case 't': -+ type = optarg; -+ break; -+ case 'l': -+ list_only = 1; -+ break; -+ case 'a': -+ all = 1; -+ error = warn; -+ break; -+ case 'k': -+ /* FIXME: This should actually do something */ -+ break; -+ case 'n': -+ dry_run = 1; -+ break; -+ case 's': -+ add_to_env_var("-s"); -+ log = 1; -+ break; -+ case 'i': -+ ignore_commands = 1; -+ break; -+ case 'f': -+ strip_vermagic = 1; -+ strip_modversion = 1; -+ break; -+ case 'b': -+ use_blacklist = 1; -+ break; -+ case 1: -+ strip_vermagic = 1; -+ break; -+ case 2: -+ strip_modversion = 1; -+ break; -+ case 3: -+ first_time = 1; -+ break; -+ default: -+ print_usage(argv[0]); -+ } -+ } -+ -+ /* If stderr not open, go to syslog */ -+ if (log || fstat(STDERR_FILENO, &statbuf) != 0) { -+ openlog("modprobe", LOG_CONS, LOG_DAEMON); -+ log = 1; -+ } -+ -+ if (argc < optind + 1 && !dump_only && !list_only && !remove) -+ print_usage(argv[0]); -+ -+ dirname = NOFAIL(malloc(strlen(buf.release) + sizeof(MODULE_DIR) + 1)); -+ sprintf(dirname, "%s/%s", MODULE_DIR, buf.release); -+ aliasfilename = NOFAIL(malloc(strlen(dirname) -+ + sizeof("/modules.alias"))); -+ sprintf(aliasfilename, "%s/modules.alias", dirname); -+ symfilename = NOFAIL(malloc(strlen(dirname) -+ + sizeof("/modules.symbols"))); -+ sprintf(symfilename, "%s/modules.symbols", dirname); -+ -+ /* Old-style -t xxx wildcard? Only with -l. */ -+ if (list_only) { -+ if (optind+1 < argc) -+ fatal("Can't have multiple wildcards\n"); -+ /* fprintf(stderr, "man find\n"); return 1; */ -+ return do_wildcard(dirname, type, argv[optind]?:"*"); -+ } -+ if (type) -+ fatal("-t only supported with -l"); -+ -+ if (dump_only) { -+ struct module_command *commands = NULL; -+ struct module_options *modoptions = NULL; -+ struct module_alias *aliases = NULL; -+ struct module_blacklist *blacklist = NULL; -+ -+ read_toplevel_config(config, "", 1, 0, -+ &modoptions, &commands, &aliases, &blacklist); -+ read_config(aliasfilename, "", 1, 0,&modoptions, &commands, -+ &aliases, &blacklist); -+ read_config(symfilename, "", 1, 0, &modoptions, &commands, -+ &aliases, &blacklist); -+ exit(0); -+ } -+ -+ if (remove || all) { -+ num_modules = argc - optind; -+ optstring = NOFAIL(strdup("")); -+ } else { -+ num_modules = 1; -+ optstring = gather_options(argv+optind+1); -+ } -+ -+ /* num_modules is always 1 except for -r or -a. */ -+ for (i = 0; i < num_modules; i++) { -+ struct module_command *commands = NULL; -+ struct module_options *modoptions = NULL; -+ struct module_alias *aliases = NULL; -+ struct module_blacklist *blacklist = NULL; -+ LIST_HEAD(list); -+ char *modulearg = argv[optind + i]; -+ -+ /* Convert name we are looking for */ -+ underscores(modulearg); -+ -+ /* Returns the resolved alias, options */ -+ read_toplevel_config(config, modulearg, 0, -+ remove, &modoptions, &commands, &aliases, &blacklist); -+ -+ /* No luck? Try symbol names, if starts with symbol:. */ -+ if (!aliases -+ && strncmp(modulearg, "symbol:", strlen("symbol:")) == 0) -+ read_config(symfilename, modulearg, 0, -+ remove, &modoptions, &commands, -+ &aliases, &blacklist); -+ -+ if (!aliases) { -+ /* We only use canned aliases as last resort. */ -+ read_depends(dirname, modulearg, &list); -+ -+ if (list_empty(&list) -+ && !find_command(modulearg, commands)) -+ { -+ read_config(aliasfilename, modulearg, 0, -+ remove, &modoptions, &commands, -+ &aliases, &blacklist); -+ aliases = apply_blacklist(aliases, blacklist); -+ } -+ } -+ -+ if (aliases) { -+ errfn_t err = error; -+ -+ /* More than one alias? Don't bail out on failure. */ -+ if (aliases->next) -+ err = warn; -+ while (aliases) { -+ /* Add the options for this alias. */ -+ char *opts = NOFAIL(strdup(optstring)); -+ opts = add_extra_options(modulearg, -+ opts, modoptions); -+ -+ read_depends(dirname, aliases->module, &list); -+ handle_module(aliases->module, &list, newname, -+ remove, opts, first_time, err, -+ dry_run, verbose, modoptions, -+ commands, ignore_commands, -+ ignore_proc, strip_vermagic, -+ strip_modversion, -+ unknown_silent, -+ optstring); -+ -+ aliases = aliases->next; -+ INIT_LIST_HEAD(&list); -+ } -+ } else { -+ if (use_blacklist -+ && find_blacklist(modulearg, blacklist)) -+ continue; -+ -+ handle_module(modulearg, &list, newname, remove, -+ optstring, first_time, error, dry_run, -+ verbose, modoptions, commands, -+ ignore_commands, ignore_proc, -+ strip_vermagic, strip_modversion, -+ unknown_silent, optstring); -+ } -+ } -+ if (log) -+ closelog(); -+ -+ return 0; -+} diff --git a/recipes/klibc/klibc-1.5/staging.patch b/recipes/klibc/klibc-1.5/staging.patch deleted file mode 100644 index cb426ac267..0000000000 --- a/recipes/klibc/klibc-1.5/staging.patch +++ /dev/null @@ -1,144 +0,0 @@ -Index: klibc-1.5/Makefile -=================================================================== ---- klibc-1.5.orig/Makefile 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/Makefile 2008-02-24 15:25:15.213824149 +0100 -@@ -33,7 +33,7 @@ - export PERL := perl - - # Location for installation --export prefix = /usr -+export prefix = $(INST) - export bindir = $(prefix)/bin - export libdir = $(prefix)/lib - export mandir = $(prefix)/man -Index: klibc-1.5/scripts/Kbuild.install -=================================================================== ---- klibc-1.5.orig/scripts/Kbuild.install 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/scripts/Kbuild.install 2008-02-24 15:24:28.085825030 +0100 -@@ -88,25 +88,21 @@ - header: - $(Q)echo " INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)" - $(Q)mkdir -p $(INSTALLROOT)$(bindir) -- $(Q)mkdir -p $(INSTALLROOT)$(mandir)/man1 -- $(Q)mkdir -p $(INSTALLROOT)$(SHLIBDIR) - $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR) - $(Q)-rm -rf $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include - $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include - $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib -- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin - $(Q)set -e ; for d in linux scsi asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \ - mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)include/$$d ; \ - for r in $(KLIBCKERNELSRC)/include $(KLIBCKERNELOBJ)/include \ - $(KLIBCKERNELOBJ)/include2 ; do \ - [ ! -d $$r/$$d ] || \ -- cp -rfL $$r/$$d/. \ -+ cp -rfd $$r/$$d/. \ - $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/$$d/. ; \ - done ; \ - done - $(Q)cd $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include && ln -sf asm-$(KLIBCARCH) asm - $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. -- $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1 - $(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir) - - footer: header -Index: klibc-1.5/usr/dash/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/dash/Kbuild 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/usr/dash/Kbuild 2008-02-24 15:13:50.189827040 +0100 -@@ -107,5 +107,3 @@ - $(obj)/arith.c: $(obj)/arith.h - $(Q): - --# Targets to install --install-y := sh.shared -Index: klibc-1.5/usr/gzip/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/gzip/Kbuild 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/usr/gzip/Kbuild 2008-02-24 15:13:50.197824604 +0100 -@@ -21,5 +21,3 @@ - # Cleaning - targets := gzip gzip.g gunzip zcat - --# Targets to install --install-y := gzip gunzip zcat -Index: klibc-1.5/usr/kinit/fstype/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/kinit/fstype/Kbuild 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/usr/kinit/fstype/Kbuild 2008-02-24 15:13:50.201824503 +0100 -@@ -21,5 +21,3 @@ - # Cleaning - clean-dirs := static shared - --# install binary --install-y := $(shared-y) -Index: klibc-1.5/usr/kinit/ipconfig/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/kinit/ipconfig/Kbuild 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/usr/kinit/ipconfig/Kbuild 2008-02-24 15:13:50.205824123 +0100 -@@ -27,5 +27,3 @@ - # Cleaning - clean-dirs := static shared - --# install binary --install-y := $(shared-y) -Index: klibc-1.5/usr/kinit/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/kinit/Kbuild 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/usr/kinit/Kbuild 2008-02-24 15:13:50.209824302 +0100 -@@ -33,5 +33,3 @@ - subdir- := fstype ipconfig nfsmount resume run-init - - --# install binary --install-y := kinit kinit.shared -Index: klibc-1.5/usr/kinit/nfsmount/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/kinit/nfsmount/Kbuild 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/usr/kinit/nfsmount/Kbuild 2008-02-24 15:13:50.213824201 +0100 -@@ -23,5 +23,3 @@ - - clean-dirs := static shared - --# Install binary --install-y := $(shared-y) -Index: klibc-1.5/usr/kinit/resume/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/kinit/resume/Kbuild 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/usr/kinit/resume/Kbuild 2008-02-24 15:13:50.217824380 +0100 -@@ -26,5 +26,3 @@ - # Cleaning - clean-dirs := static shared - --# install binary --install-y := $(shared-y) -Index: klibc-1.5/usr/kinit/run-init/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/kinit/run-init/Kbuild 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/usr/kinit/run-init/Kbuild 2008-02-24 15:13:50.221824559 +0100 -@@ -21,5 +21,3 @@ - # Cleaning - clean-dirs := static shared - --# install binary --install-y := $(shared-y) -Index: klibc-1.5/usr/klibc/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/klibc/Kbuild 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/usr/klibc/Kbuild 2008-02-24 15:13:50.229824358 +0100 -@@ -175,5 +175,3 @@ - $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib)) - $(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \ - $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib -- $(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \ -- $(INSTALLROOT)$(SHLIBDIR) -Index: klibc-1.5/usr/utils/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/utils/Kbuild 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5/usr/utils/Kbuild 2008-02-24 15:13:50.229824358 +0100 -@@ -64,5 +64,3 @@ - # Clean deletes the static and shared dir - clean-dirs := static shared - --# install only install the shared binaries --install-y := $(shared-y) shared/reboot shared/poweroff diff --git a/recipes/klibc/klibc-1.5/wc.patch b/recipes/klibc/klibc-1.5/wc.patch deleted file mode 100644 index 301679799f..0000000000 --- a/recipes/klibc/klibc-1.5/wc.patch +++ /dev/null @@ -1,236 +0,0 @@ -Index: klibc-1.5/usr/utils/Kbuild -=================================================================== ---- klibc-1.5.orig/usr/utils/Kbuild 2008-04-14 23:21:57.702294843 +0200 -+++ klibc-1.5/usr/utils/Kbuild 2008-04-14 23:24:38.817291977 +0200 -@@ -3,7 +3,7 @@ - # - - progs := chroot dd mkdir mkfifo mknod mount pivot_root umount --progs += true false sleep ln nuke minips cat losetup -+progs += true false sleep ln nuke minips cat losetup wc - progs += insmod uname halt kill readlink cpio modprobe - - static-y := $(addprefix static/, $(progs)) -@@ -56,6 +56,9 @@ - shared/modprobe-y := modprobe.o - static/losetup-y := losetup.o - shared/losetup-y := losetup.o -+static/wc-y := wc.o -+shared/wc-y := wc.o -+ - # Additionally linked targets - always := static/reboot static/poweroff shared/reboot shared/poweroff - -Index: klibc-1.5/usr/utils/wc.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ klibc-1.5/usr/utils/wc.c 2008-04-14 23:25:15.449292711 +0200 -@@ -0,0 +1,208 @@ -+/* vi: set sw=4 ts=4: */ -+/* -+ * wc implementation for busybox -+ * -+ * Copyright (C) 2003 Manuel Novoa III -+ * -+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. -+ */ -+ -+/* BB_AUDIT SUSv3 _NOT_ compliant -- option -m is not currently supported. */ -+/* http://www.opengroup.org/onlinepubs/007904975/utilities/wc.html */ -+ -+/* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org) -+ * -+ * Rewritten to fix a number of problems and do some size optimizations. -+ * Problems in the previous busybox implementation (besides bloat) included: -+ * 1) broken 'wc -c' optimization (read note below) -+ * 2) broken handling of '-' args -+ * 3) no checking of ferror on EOF returns -+ * 4) isprint() wasn't considered when word counting. -+ * -+ * TODO: -+ * -+ * When locale support is enabled, count multibyte chars in the '-m' case. -+ * -+ * NOTES: -+ * -+ * The previous busybox wc attempted an optimization using stat for the -+ * case of counting chars only. I omitted that because it was broken. -+ * It didn't take into account the possibility of input coming from a -+ * pipe, or input from a file with file pointer not at the beginning. -+ * -+ * To implement such a speed optimization correctly, not only do you -+ * need the size, but also the file position. Note also that the -+ * file position may be past the end of file. Consider the example -+ * (adapted from example in gnu wc.c) -+ * -+ * echo hello > /tmp/testfile && -+ * (dd ibs=1k skip=1 count=0 &> /dev/null; wc -c) < /tmp/testfile -+ * -+ * for which 'wc -c' should output '0'. -+ */ -+#include -+#include -+#include -+#include -+#undef isspace -+#undef isprint -+#define isspace(c) ((((c) == ' ') || (((unsigned int)((c) - 9)) <= (13 - 9)))) -+#define isprint(c) (((unsigned int)((c) - 0x20)) <= (0x7e - 0x20)) -+#define isspace_given_isprint(c) ((c) == ' ') -+ -+#define COUNT_T unsigned long -+#define COUNT_FMT "u" -+#define optind 1 -+FILE *fopen_or_warn_stdin(const char *filename) -+{ -+ FILE *fp = stdin; -+ -+ if (filename[0]) { -+ fp = fopen(filename, "r"); -+ } -+ -+ return fp; -+} -+ -+enum { -+ WC_LINES = 0, -+ WC_WORDS = 1, -+ WC_CHARS = 2, -+ WC_LENGTH = 3 -+}; -+ -+int main(int argc, char **argv) -+{ -+ FILE *fp; -+ const char *s, *arg; -+ const char *start_fmt = "%9"COUNT_FMT; -+ const char *fname_fmt = " %s\n"; -+ COUNT_T *pcounts; -+ COUNT_T counts[4]; -+ COUNT_T totals[4]; -+ unsigned linepos; -+ unsigned u; -+ int num_files = 0; -+ int c; -+ signed char status = EXIT_SUCCESS; -+ signed char in_word; -+ unsigned print_type; -+ -+ print_type = getopt(argc, argv, "lwcL"); -+ -+ if (print_type == 0) { -+ print_type = (1 << WC_LINES) | (1 << WC_WORDS) | (1 << WC_CHARS); -+ } -+ -+ argv += optind; -+ if (!argv[0]) { -+ *--argv = (char *) "wc"; -+ fname_fmt = "\n"; -+ if (!((print_type-1) & print_type)) /* exactly one option? */ -+ start_fmt = "%"COUNT_FMT; -+ } -+ -+ memset(totals, 0, sizeof(totals)); -+ -+ pcounts = counts; -+ -+ while ((arg = *argv++) != 0) { -+ ++num_files; -+ fp = fopen_or_warn_stdin(arg); -+ if (!fp) { -+ status = EXIT_FAILURE; -+ continue; -+ } -+ -+ memset(counts, 0, sizeof(counts)); -+ linepos = 0; -+ in_word = 0; -+ -+ do { -+ /* Our -w doesn't match GNU wc exactly... oh well */ -+ -+ ++counts[WC_CHARS]; -+ c = getc(fp); -+ if (isprint(c)) { -+ ++linepos; -+ if (!isspace_given_isprint(c)) { -+ in_word = 1; -+ continue; -+ } -+ } else if (((unsigned int)(c - 9)) <= 4) { -+ /* \t 9 -+ * \n 10 -+ * \v 11 -+ * \f 12 -+ * \r 13 -+ */ -+ if (c == '\t') { -+ linepos = (linepos | 7) + 1; -+ } else { /* '\n', '\r', '\f', or '\v' */ -+ DO_EOF: -+ if (linepos > counts[WC_LENGTH]) { -+ counts[WC_LENGTH] = linepos; -+ } -+ if (c == '\n') { -+ ++counts[WC_LINES]; -+ } -+ if (c != '\v') { -+ linepos = 0; -+ } -+ } -+ } else if (c == EOF) { -+/* if (ferror(fp)) { -+ status = EXIT_FAILURE; -+ } -+*/ --counts[WC_CHARS]; -+ goto DO_EOF; /* Treat an EOF as '\r'. */ -+ } else { -+ continue; -+ } -+ -+ counts[WC_WORDS] += in_word; -+ in_word = 0; -+ if (c == EOF) { -+ break; -+ } -+ } while (1); -+ -+ if (totals[WC_LENGTH] < counts[WC_LENGTH]) { -+ totals[WC_LENGTH] = counts[WC_LENGTH]; -+ } -+ totals[WC_LENGTH] -= counts[WC_LENGTH]; -+ -+ if(fp != stdin) -+ fclose(fp); -+ -+ OUTPUT: -+ /* coreutils wc tries hard to print pretty columns -+ * (saves results for all files, find max col len etc...) -+ * we won't try that hard, it will bloat us too much */ -+ s = start_fmt; -+ u = 0; -+ do { -+ if (print_type & (1 << u)) { -+ printf(s, pcounts[u]); -+ s = " %9"COUNT_FMT; /* Ok... restore the leading space. */ -+ } -+ totals[u] += pcounts[u]; -+ } while (++u < 4); -+ printf(fname_fmt, arg); -+ } -+ -+ /* If more than one file was processed, we want the totals. To save some -+ * space, we set the pcounts ptr to the totals array. This has the side -+ * effect of trashing the totals array after outputting it, but that's -+ * irrelavent since we no longer need it. */ -+ if (num_files > 1) { -+ num_files = 0; /* Make sure we don't get here again. */ -+ arg = "total"; -+ pcounts = totals; -+ --argv; -+ goto OUTPUT; -+ } -+ -+ fflush(stdout); -+ exit(status); -+} diff --git a/recipes/klibc/klibc-common.inc b/recipes/klibc/klibc-common.inc deleted file mode 100644 index b4c27c9f4a..0000000000 --- a/recipes/klibc/klibc-common.inc +++ /dev/null @@ -1,36 +0,0 @@ -DEPENDS = "virtual/kernel perl-native" -SECTION = "libs" -DESCRIPTION = "klibc is intended to be a minimalistic libc subset for \ -use with initramfs. It is deliberately written for small size, \ -minimal entaglement, and portability, not speed." -LICENSE = "BSD-ADV" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/${KLIBC_FETCHDIR}/klibc-${PV}.tar.bz2" - -S = "${WORKDIR}/klibc-${PV}" -PACKAGE_ARCH = "${MACHINE_ARCH}" -INC_PR = "r17" - -KLIBC_ARCH = '${TARGET_ARCH}' -KLIBC_ARCH_armeb = 'arm' -KLIBC_ARCH_mipsel = 'mips' -KLIBC_ARCH_x86 = 'i386' -KLIBC_ARCH_i486 = 'i386' -KLIBC_ARCH_i586 = 'i386' -KLIBC_ARCH_i686 = 'i386' -KLIBC_ARCH_pentium = 'i386' - -# the klibc code contains ARM instructions (for ARM), this -# could be fixed, but for the moment: -ARM_INSTRUCTION_SET = "arm" - -SRC_URI_append_linux-gnueabi = "file://klibc-config-eabi.patch" -SRC_URI_append_linux-uclibceabi = "file://klibc-config-eabi.patch" - -EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ - 'CROSS_COMPILE=${TARGET_PREFIX}' \ - " - -do_configure () { - ln -sf ${STAGING_KERNEL_DIR} linux -} diff --git a/recipes/klibc/klibc-utils-static.inc b/recipes/klibc/klibc-utils-static.inc deleted file mode 100644 index e7ec1ecc0d..0000000000 --- a/recipes/klibc/klibc-utils-static.inc +++ /dev/null @@ -1,14 +0,0 @@ -FILESPATHPKG =. "klibc-${PV}:" - -do_install() { - install -d ${D}${base_bindir} - install -m 755 usr/dash/sh ${D}${base_bindir} - install -m 755 usr/kinit/kinit ${D}${base_bindir} -} - -#Package only separate utils -PACKAGES = "" - -KLIBC_UTILS_VARIANT = "static" -KLIBC_UTILS_PKGNAME = "klibc-utils-static" -require klibc-utils.inc diff --git a/recipes/klibc/klibc-utils-static_1.5.18.bb b/recipes/klibc/klibc-utils-static_1.5.18.bb index a244b75b91..30b2222def 100644 --- a/recipes/klibc/klibc-utils-static_1.5.18.bb +++ b/recipes/klibc/klibc-utils-static_1.5.18.bb @@ -1,3 +1,18 @@ -require klibc-utils-static.inc +FILESPATHPKG =. "klibc-${PV}:" + +do_install() { + install -d ${D}${base_bindir} + install -m 755 usr/dash/sh ${D}${base_bindir} + install -m 755 usr/kinit/kinit ${D}${base_bindir} +} + +# Package only separate utils +PACKAGES = "" + +KLIBC_UTILS_VARIANT = "static" +KLIBC_UTILS_PKGNAME = "klibc-utils-static" + +####################### +require klibc-utils.inc +require klibc.inc require klibc-${PV}.inc -PR = "${INC_PR}.1" diff --git a/recipes/klibc/klibc-utils-static_1.5.bb b/recipes/klibc/klibc-utils-static_1.5.bb deleted file mode 100644 index 4d1dd4171f..0000000000 --- a/recipes/klibc/klibc-utils-static_1.5.bb +++ /dev/null @@ -1,3 +0,0 @@ -require klibc-utils-static.inc -require klibc-${PV}.inc -PR = "${INC_PR}.0" diff --git a/recipes/klibc/klibc-utils.inc b/recipes/klibc/klibc-utils.inc index e5c4acbeae..993b9d5ea0 100644 --- a/recipes/klibc/klibc-utils.inc +++ b/recipes/klibc/klibc-utils.inc @@ -1,7 +1,8 @@ KLIBC_UTILS_VARIANT ?= "shared" KLIBC_UTILS_PKGNAME ?= "klibc-utils" -# We only want the static utils. klibc build both. So we install only what we want. +# modprobe and losetup go to ${base_sbindir} + do_install_append() { install -d ${D}${base_bindir} install -d ${D}${base_sbindir} @@ -15,14 +16,18 @@ do_install_append() { install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/chroot ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/cpio ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dd ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dmesg ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/false ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/halt ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/kill ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ln ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/losetup ${D}${base_sbindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ls ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/minips ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mkdir ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mkfifo ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mknod ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/modprobe ${D}${base_sbindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mount ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/nuke ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/pivot_root ${D}${base_bindir} @@ -30,27 +35,18 @@ do_install_append() { install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/readlink ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/reboot ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sleep ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sync ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/true ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/umount ${D}${base_bindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/uname ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/modprobe ${D}${base_sbindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/losetup ${D}${base_sbindir} install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/wc ${D}${base_bindir} ln -s gzip ${D}${base_bindir}/gunzip ln -s gzip ${D}${base_bindir}/zcat } -# only in 1.5 -# install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/insmod ${D}${base_bindir} - -# only in >= 1.5.18 (can be moved to do_install_append above as soon as klibc_1.5 is dropped from tree) -# install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dmesg ${D}${base_bindir} -# install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sync ${D}${base_bindir} -# install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ls ${D}${base_bindir} - PACKAGES += "${KLIBC_UTILS_PKGNAME}-sh \ - ${KLIBC_UTILS_PKGNAME}-gzip \ ${KLIBC_UTILS_PKGNAME}-kinit \ + ${KLIBC_UTILS_PKGNAME}-gzip \ ${KLIBC_UTILS_PKGNAME}-fstype \ ${KLIBC_UTILS_PKGNAME}-ipconfig \ ${KLIBC_UTILS_PKGNAME}-nfsmount \ @@ -65,10 +61,13 @@ PACKAGES += "${KLIBC_UTILS_PKGNAME}-sh \ ${KLIBC_UTILS_PKGNAME}-halt \ ${KLIBC_UTILS_PKGNAME}-kill \ ${KLIBC_UTILS_PKGNAME}-ln \ + ${KLIBC_UTILS_PKGNAME}-losetup \ + ${KLIBC_UTILS_PKGNAME}-ls \ ${KLIBC_UTILS_PKGNAME}-minips \ ${KLIBC_UTILS_PKGNAME}-mkdir \ ${KLIBC_UTILS_PKGNAME}-mkfifo \ ${KLIBC_UTILS_PKGNAME}-mknod \ + ${KLIBC_UTILS_PKGNAME}-modprobe \ ${KLIBC_UTILS_PKGNAME}-mount \ ${KLIBC_UTILS_PKGNAME}-nuke \ ${KLIBC_UTILS_PKGNAME}-pivot-root \ @@ -80,15 +79,11 @@ PACKAGES += "${KLIBC_UTILS_PKGNAME}-sh \ ${KLIBC_UTILS_PKGNAME}-true \ ${KLIBC_UTILS_PKGNAME}-umount \ ${KLIBC_UTILS_PKGNAME}-uname \ - ${KLIBC_UTILS_PKGNAME}-modprobe \ - ${KLIBC_UTILS_PKGNAME}-losetup \ - ${KLIBC_UTILS_PKGNAME}-wc \ - ${KLIBC_UTILS_PKGNAME}-insmod \ - ${KLIBC_UTILS_PKGNAME}-ls" + ${KLIBC_UTILS_PKGNAME}-wc" FILES_${KLIBC_UTILS_PKGNAME}-sh = "${base_bindir}/sh" -FILES_${KLIBC_UTILS_PKGNAME}-gzip = "${base_bindir}/gzip ${base_bindir}/gunzip ${base_bindir}/zcat" FILES_${KLIBC_UTILS_PKGNAME}-kinit = "${base_bindir}/kinit" +FILES_${KLIBC_UTILS_PKGNAME}-gzip = "${base_bindir}/gzip ${base_bindir}/gunzip ${base_bindir}/zcat" FILES_${KLIBC_UTILS_PKGNAME}-fstype = "${base_bindir}/fstype" FILES_${KLIBC_UTILS_PKGNAME}-ipconfig = "${base_bindir}/ipconfig" FILES_${KLIBC_UTILS_PKGNAME}-nfsmount = "${base_bindir}/nfsmount" @@ -103,10 +98,13 @@ FILES_${KLIBC_UTILS_PKGNAME}-false = "${base_bindir}/false" FILES_${KLIBC_UTILS_PKGNAME}-halt = "${base_bindir}/halt" FILES_${KLIBC_UTILS_PKGNAME}-kill = "${base_bindir}/kill" FILES_${KLIBC_UTILS_PKGNAME}-ln = "${base_bindir}/ln" +FILES_${KLIBC_UTILS_PKGNAME}-losetup = "${base_sbindir}/losetup" +FILES_${KLIBC_UTILS_PKGNAME}-ls = "${base_bindir}/ls" FILES_${KLIBC_UTILS_PKGNAME}-minips = "${base_bindir}/minips" FILES_${KLIBC_UTILS_PKGNAME}-mkdir = "${base_bindir}/mkdir" FILES_${KLIBC_UTILS_PKGNAME}-mkfifo = "${base_bindir}/mkfifo" FILES_${KLIBC_UTILS_PKGNAME}-mknod = "${base_bindir}/mknod" +FILES_${KLIBC_UTILS_PKGNAME}-modprobe = "${base_sbindir}/modprobe" FILES_${KLIBC_UTILS_PKGNAME}-mount = "${base_bindir}/mount" FILES_${KLIBC_UTILS_PKGNAME}-nuke = "${base_bindir}/nuke" FILES_${KLIBC_UTILS_PKGNAME}-pivot-root = "${base_bindir}/pivot_root" @@ -118,8 +116,4 @@ FILES_${KLIBC_UTILS_PKGNAME}-sync = "${base_bindir}/sync" FILES_${KLIBC_UTILS_PKGNAME}-true = "${base_bindir}/true" FILES_${KLIBC_UTILS_PKGNAME}-umount = "${base_bindir}/umount" FILES_${KLIBC_UTILS_PKGNAME}-uname = "${base_bindir}/uname" -FILES_${KLIBC_UTILS_PKGNAME}-modprobe = "${base_sbindir}/modprobe" -FILES_${KLIBC_UTILS_PKGNAME}-losetup = "${base_sbindir}/losetup" FILES_${KLIBC_UTILS_PKGNAME}-wc = "${base_bindir}/wc" -FILES_${KLIBC_UTILS_PKGNAME}-insmod = "${base_bindir}/insmod" -FILES_${KLIBC_UTILS_PKGNAME}-ls = "${base_bindir}/ls" diff --git a/recipes/klibc/klibc.inc b/recipes/klibc/klibc.inc index 59f4a5c893..fc8862c3bb 100644 --- a/recipes/klibc/klibc.inc +++ b/recipes/klibc/klibc.inc @@ -1,57 +1,52 @@ -do_install() { - install -d ${D}${base_bindir} - install -m 755 usr/dash/sh.${KLIBC_UTILS_VARIANT} ${D}${base_bindir}/sh - install -m 755 usr/kinit/kinit.${KLIBC_UTILS_VARIANT} ${D}${base_bindir}/kinit - - install -d ${D}${base_libdir} - install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir} - install -d ${D}${TOOLCHAIN_PATH}/bin/ - install -m 755 klcc/klcc '${D}${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}klcc' - (cd ${D}${base_libdir}; ln -s klibc-*.so klibc.so) -} +DEPENDS = "virtual/kernel perl-native" +SECTION = "libs" +DESCRIPTION = "klibc is intended to be a minimalistic libc subset for \ +use with initramfs. It is deliberately written for small size, \ +minimal entaglement, and portability, not speed." +LICENSE = "BSD-ADV" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +INC_PR = "r18" + +KLIBC_ARCH = '${TARGET_ARCH}' +KLIBC_ARCH_armeb = 'arm' +KLIBC_ARCH_mipsel = 'mips' +KLIBC_ARCH_x86 = 'i386' +KLIBC_ARCH_i486 = 'i386' +KLIBC_ARCH_i586 = 'i386' +KLIBC_ARCH_i686 = 'i386' +KLIBC_ARCH_pentium = 'i386' + +# the klibc code contains ARM instructions (for ARM), this +# could be fixed, but for the moment: +ARM_INSTRUCTION_SET = "arm" + +KLIBC_FETCHDIR = "1.5" +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/${KLIBC_FETCHDIR}/klibc-${PV}.tar.bz2" -export INST=${STAGING_DIR_TARGET} - -PACKAGES = "${PN} ${PN}-dev " -FILES_${PN} = "${base_libdir}/klibc-*.so" -FILES_${PN}-dev = "${base_libdir}/klibc.so" - -require klibc-utils.inc - -# Yes we want exactly the klibc that was compiled with the utils -RDEPENDS_${KLIBC_UTILS_PKGNAME}-sh = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-kinit = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-fstype = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-ipconfig = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-nfsmount = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-resume = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-run-init = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-cat = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-chroot = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-cpio = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-dd = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-dmesg = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-false = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-halt = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-insmod = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-kill = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-ln = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-minips = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-mkdir = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-mkfifo = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-mknod = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-mount = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-nuke = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-pivot-root = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-poweroff = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-readlink = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-reboot = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-sleep = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-sync = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-true = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-umount = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-uname = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-modprobe = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-losetup = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-wc = "${PN} (=${PV}-${PR})" -RDEPENDS_${KLIBC_UTILS_PKGNAME}-ls = "${PN} (=${PV}-${PR})" +SRC_URI_append_linux-gnueabi = "file://klibc-config-eabi.patch" +SRC_URI_append_linux-uclibceabi = "file://klibc-config-eabi.patch" + +SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \ + file://modprobe.patch \ + file://dash_readopt.patch \ + file://wc.patch \ + file://staging.patch \ + file://klibc_kexecsyscall.patch \ + file://mntproc-definitions.patch \ + file://arm-signal-cleanup.patch \ + file://socket.h.patch \ + file://isystem.patch \ + file://klibc-x86-KLIBCARCHINCFLAGS.patch \ + " + +S = "${WORKDIR}/klibc-${PV}" + +EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ + 'CROSS_COMPILE=${TARGET_PREFIX}' \ + 'KLIBCKERNELSRC=${STAGING_KERNEL_DIR}' \ + " + +do_configure () { + ln -sf ${STAGING_KERNEL_DIR} linux +} diff --git a/recipes/klibc/klibc_1.5.18.bb b/recipes/klibc/klibc_1.5.18.bb index cf69b4398c..8271abc8ab 100644 --- a/recipes/klibc/klibc_1.5.18.bb +++ b/recipes/klibc/klibc_1.5.18.bb @@ -1,3 +1,63 @@ +do_install() { + install -d ${D}${base_bindir} + install -m 755 usr/dash/sh.${KLIBC_UTILS_VARIANT} ${D}${base_bindir}/sh + install -m 755 usr/kinit/kinit.${KLIBC_UTILS_VARIANT} ${D}${base_bindir}/kinit + + install -d ${D}${base_libdir} + install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir} + (cd ${D}${base_libdir}; ln -s klibc-*.so klibc.so) +} + +export INST=${STAGING_DIR_TARGET} + +do_stage() { + oe_runmake install + cp '${STAGING_DIR_TARGET}/bin/klcc' '${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}klcc' +} + +PACKAGES = "${PN} ${PN}-dev " +FILES_${PN} = "${base_libdir}/klibc-*.so" +FILES_${PN}-dev = "${base_libdir}/klibc.so" + +# Yes we want exactly the klibc that was compiled with the utils +RDEPENDS_${KLIBC_UTILS_PKGNAME}-sh = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-kinit = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-fstype = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-ipconfig = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-nfsmount = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-resume = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-run-init = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-cat = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-chroot = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-cpio = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-dd = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-dmesg = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-false = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-halt = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-insmod = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-kill = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-ln = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-losetup = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-ls = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-minips = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-mkdir = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-mkfifo = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-mknod = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-modprobe = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-mount = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-nuke = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-pivot-root = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-poweroff = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-readlink = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-reboot = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-sleep = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-sync = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-true = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-umount = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-uname = "${PN} (=${PV}-${PR})" +RDEPENDS_${KLIBC_UTILS_PKGNAME}-wc = "${PN} (=${PV}-${PR})" + +####################### +require klibc-utils.inc require klibc.inc require klibc-${PV}.inc -PR = "${INC_PR}.2" diff --git a/recipes/klibc/klibc_1.5.bb b/recipes/klibc/klibc_1.5.bb deleted file mode 100644 index 71718cfe65..0000000000 --- a/recipes/klibc/klibc_1.5.bb +++ /dev/null @@ -1,3 +0,0 @@ -require klibc.inc -require klibc-${PV}.inc -PR = "${INC_PR}.0" -- cgit v1.2.3 From b3f908c8611c0d205fb3cb1432838ed312b3acda Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 11 Aug 2010 16:36:36 -0700 Subject: libx11_1.3.2.bb: Use Os in DEBUG_OPTIMIZATION for thumb * This is to avoid a bug in GCC 4.5 where it ICEs with -O1 -mthumb -fno-omit-frame-pointer Signed-off-by: Khem Raj --- recipes/xorg-lib/libx11_1.3.2.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes/xorg-lib/libx11_1.3.2.bb b/recipes/xorg-lib/libx11_1.3.2.bb index 8d8611f255..0446674c99 100644 --- a/recipes/xorg-lib/libx11_1.3.2.bb +++ b/recipes/xorg-lib/libx11_1.3.2.bb @@ -1,6 +1,10 @@ require libx11.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" +# gcc 4.5 ends up ICEing with thumb and -O1 with -fno-omit-framepointer +# therefore if we are in thumb mode then we use -Os instead of -O1 for +# DEBUG_OPTIMIZATION +DEBUG_OPTIMIZATION_thumb_append = " -Os" SRC_URI += " file://dolt-fix.patch" SRC_URI[archive.md5sum] = "001d780829f936e34851ef7cd37b4dfd" SRC_URI[archive.sha256sum] = "4def4d5c9fce85d690f1f29d675154594acdea3d3fe792d0cb513732c7b4bcb2" -- cgit v1.2.3 From 41f405965615e4de3aea5d257ba34c94bd2db6d6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 11 Aug 2010 16:50:15 -0700 Subject: klibc: Remove do_stage * Some cleanups Signed-off-by: Khem Raj --- recipes/klibc/files/isystem.patch | 13 - recipes/klibc/files/klibc-config-eabi.patch | 9 - recipes/klibc/files/klibc_kexecsyscall.patch | 11 - recipes/klibc/files/losetup.patch | 571 --------------------- recipes/klibc/klibc-1.5.18.inc | 2 - recipes/klibc/klibc-1.5.18/isystem.patch | 13 + recipes/klibc/klibc-1.5.18/klibc-config-eabi.patch | 9 + .../klibc/klibc-1.5.18/klibc_kexecsyscall.patch | 11 + recipes/klibc/klibc-1.5.18/losetup.patch | 571 +++++++++++++++++++++ recipes/klibc/klibc-utils-static_1.5.18.bb | 4 +- recipes/klibc/klibc_1.5.18.bb | 11 +- 11 files changed, 612 insertions(+), 613 deletions(-) delete mode 100644 recipes/klibc/files/isystem.patch delete mode 100644 recipes/klibc/files/klibc-config-eabi.patch delete mode 100644 recipes/klibc/files/klibc_kexecsyscall.patch delete mode 100644 recipes/klibc/files/losetup.patch delete mode 100644 recipes/klibc/klibc-1.5.18.inc create mode 100644 recipes/klibc/klibc-1.5.18/isystem.patch create mode 100644 recipes/klibc/klibc-1.5.18/klibc-config-eabi.patch create mode 100644 recipes/klibc/klibc-1.5.18/klibc_kexecsyscall.patch create mode 100644 recipes/klibc/klibc-1.5.18/losetup.patch diff --git a/recipes/klibc/files/isystem.patch b/recipes/klibc/files/isystem.patch deleted file mode 100644 index ccdf9ed92d..0000000000 --- a/recipes/klibc/files/isystem.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: klibc-1.5.15/klcc/klcc.in -=================================================================== ---- klibc-1.5.15.orig/klcc/klcc.in 2009-12-14 00:32:41.373661102 +0100 -+++ klibc-1.5.15/klcc/klcc.in 2009-12-14 00:34:20.855735356 +0100 -@@ -147,7 +147,7 @@ - } elsif ( $a =~ /^-([fmwWQdO]|std=|ansi|pedantic|M[GPD]|MMD)/ ) { - # Options to gcc - push(@ccopt, $a); -- } elsif ( $a =~ /^-([DUI]|M[FQT])(.*)$/ ) { -+ } elsif ( $a =~ /^-([DUI]|M[FQT]|isystem)(.*)$/ ) { - # Options to gcc, which can take either a conjoined argument - # (-DFOO) or a disjoint argument (-D FOO) - push(@ccopt, $a); diff --git a/recipes/klibc/files/klibc-config-eabi.patch b/recipes/klibc/files/klibc-config-eabi.patch deleted file mode 100644 index 86517f0594..0000000000 --- a/recipes/klibc/files/klibc-config-eabi.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -Nur klibc-1.5/defconfig klibc-1.5p/defconfig ---- klibc-1.5/defconfig 2007-03-04 02:52:10.000000000 +0100 -+++ klibc-1.5p/defconfig 2008-02-08 19:24:22.337127756 +0100 -@@ -5,4 +5,4 @@ - CONFIG_REGPARM=y - # ARM options - # CONFIG_KLIBC_THUMB is not set --# CONFIG_AEABI is not set -+CONFIG_AEABI=y diff --git a/recipes/klibc/files/klibc_kexecsyscall.patch b/recipes/klibc/files/klibc_kexecsyscall.patch deleted file mode 100644 index 9b2dca4738..0000000000 --- a/recipes/klibc/files/klibc_kexecsyscall.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- klibc-1.5/usr/klibc/SYSCALLS.def 2007-03-04 02:52:10.000000000 +0100 -+++ klibc.clean/usr/klibc/SYSCALLS.def 2008-02-22 17:12:23.663612084 +0100 -@@ -13,6 +13,8 @@ - #include - #include - #include -+#include -+long kexec_load(void *, unsigned long , struct kexec_segment *, unsigned long ); - - /* - * Process-related syscalls diff --git a/recipes/klibc/files/losetup.patch b/recipes/klibc/files/losetup.patch deleted file mode 100644 index 77049bd05f..0000000000 --- a/recipes/klibc/files/losetup.patch +++ /dev/null @@ -1,571 +0,0 @@ -Index: klibc-1.5/usr/utils/losetup.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ klibc-1.5/usr/utils/losetup.c 2008-03-07 23:13:38.635692852 +0100 -@@ -0,0 +1,485 @@ -+/* Originally from Ted's losetup.c */ -+ -+#define LOOPMAJOR 7 -+ -+/* -+ * losetup.c - setup and control loop devices -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "loop.h" -+ -+extern int verbose; -+extern char *progname; -+extern char *xstrdup (const char *s); /* not: #include "sundries.h" */ -+extern void error (const char *fmt, ...); /* idem */ -+ -+/* caller guarantees n > 0 */ -+void -+xstrncpy(char *dest, const char *src, size_t n) { -+ strncpy(dest, src, n-1); -+ dest[n-1] = 0; -+} -+ -+ -+static int -+loop_info64_to_old(const struct loop_info64 *info64, struct loop_info *info) -+{ -+ memset(info, 0, sizeof(*info)); -+ info->lo_number = info64->lo_number; -+ info->lo_device = info64->lo_device; -+ info->lo_inode = info64->lo_inode; -+ info->lo_rdevice = info64->lo_rdevice; -+ info->lo_offset = info64->lo_offset; -+ info->lo_encrypt_type = info64->lo_encrypt_type; -+ info->lo_encrypt_key_size = info64->lo_encrypt_key_size; -+ info->lo_flags = info64->lo_flags; -+ info->lo_init[0] = info64->lo_init[0]; -+ info->lo_init[1] = info64->lo_init[1]; -+ if (info->lo_encrypt_type == LO_CRYPT_CRYPTOAPI) -+ memcpy(info->lo_name, info64->lo_crypt_name, LO_NAME_SIZE); -+ else -+ memcpy(info->lo_name, info64->lo_file_name, LO_NAME_SIZE); -+ memcpy(info->lo_encrypt_key, info64->lo_encrypt_key, LO_KEY_SIZE); -+ -+ /* error in case values were truncated */ -+ if (info->lo_device != info64->lo_device || -+ info->lo_rdevice != info64->lo_rdevice || -+ info->lo_inode != info64->lo_inode || -+ info->lo_offset != info64->lo_offset) -+ return -EOVERFLOW; -+ -+ return 0; -+} -+ -+ -+static int -+show_loop(char *device) { -+ struct loop_info loopinfo; -+ struct loop_info64 loopinfo64; -+ int fd, errsv; -+ -+ if ((fd = open(device, O_RDONLY)) < 0) { -+ int errsv = errno; -+ fprintf(stderr, "loop: can't open device %s: %s\n", -+ device, strerror (errsv)); -+ return 2; -+ } -+ -+ if (ioctl(fd, LOOP_GET_STATUS64, &loopinfo64) == 0) { -+ -+ loopinfo64.lo_file_name[LO_NAME_SIZE-2] = '*'; -+ loopinfo64.lo_file_name[LO_NAME_SIZE-1] = 0; -+ loopinfo64.lo_crypt_name[LO_NAME_SIZE-1] = 0; -+ -+ printf("%s: [%04llx]:%llu (%s)", -+ device, loopinfo64.lo_device, loopinfo64.lo_inode, -+ loopinfo64.lo_file_name); -+ -+ if (loopinfo64.lo_offset) -+ printf(", offset %lld", loopinfo64.lo_offset); -+ -+ if (loopinfo64.lo_sizelimit) -+ printf(", sizelimit %lld", loopinfo64.lo_sizelimit); -+ -+ if (loopinfo64.lo_encrypt_type || -+ loopinfo64.lo_crypt_name[0]) { -+ char *e = loopinfo64.lo_crypt_name; -+ -+ if (*e == 0 && loopinfo64.lo_encrypt_type == 1) -+ e = "XOR"; -+ printf(", encryption %s (type %d)", -+ e, loopinfo64.lo_encrypt_type); -+ } -+ printf("\n"); -+ close (fd); -+ return 0; -+ } -+ -+ if (ioctl(fd, LOOP_GET_STATUS, &loopinfo) == 0) { -+ printf ("%s: [%04x]:%ld (%s)", -+ device, loopinfo.lo_device, loopinfo.lo_inode, -+ loopinfo.lo_name); -+ -+ if (loopinfo.lo_offset) -+ printf(", offset %d", loopinfo.lo_offset); -+ -+ if (loopinfo.lo_encrypt_type) -+ printf(", encryption type %d\n", -+ loopinfo.lo_encrypt_type); -+ -+ printf("\n"); -+ close (fd); -+ return 0; -+ } -+ -+ errsv = errno; -+ fprintf(stderr, "loop: can't get info on device %s: %s\n", -+ device, strerror (errsv)); -+ close (fd); -+ return 1; -+} -+ -+int -+is_loop_device (const char *device) { -+ struct stat statbuf; -+ -+ return (stat(device, &statbuf) == 0 && -+ S_ISBLK(statbuf.st_mode) && -+ major(statbuf.st_rdev) == LOOPMAJOR); -+} -+ -+#define SIZE(a) (sizeof(a)/sizeof(a[0])) -+ -+char * -+find_unused_loop_device (void) { -+ /* Just creating a device, say in /tmp, is probably a bad idea - -+ people might have problems with backup or so. -+ So, we just try /dev/loop[0-7]. */ -+ char dev[20]; -+ char *loop_formats[] = { "/dev/loop%d", "/dev/loop/%d" }; -+ int i, j, fd, somedev = 0, someloop = 0, permission = 0; -+ struct stat statbuf; -+ struct loop_info loopinfo; -+ -+ for (j = 0; j < SIZE(loop_formats); j++) { -+ for(i = 0; i < 256; i++) { -+ sprintf(dev, loop_formats[j], i); -+ if (stat (dev, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)) { -+ somedev++; -+ fd = open (dev, O_RDONLY); -+ if (fd >= 0) { -+ if(ioctl (fd, LOOP_GET_STATUS, &loopinfo) == 0) -+ someloop++; /* in use */ -+ else if (errno == ENXIO) { -+ close (fd); -+ return xstrdup(dev);/* probably free */ -+ } -+ close (fd); -+ } else if (errno == EACCES) -+ permission++; -+ -+ continue;/* continue trying as long as devices exist */ -+ } -+ break; -+ } -+ } -+ -+ if (!somedev) -+ error("%s: could not find any device /dev/loop#", progname); -+ else if (!someloop && permission) -+ error("%s: no permission to look at /dev/loop#", progname); -+ else if (!someloop) -+ error( -+ "%s: Could not find any loop device. Maybe this kernel " -+ "does not know\n" -+ " about the loop device? (If so, recompile or " -+ "`modprobe loop'.)", progname); -+ else -+ error("%s: could not find any free loop device", progname); -+ return 0; -+} -+ -+/* -+ * A function to read the passphrase either from the terminal or from -+ * an open file descriptor. -+ */ -+static char * -+xgetpass(int pfd, const char *prompt) { -+ char *pass; -+ int buflen, i; -+ -+ pass = NULL; -+ buflen = 0; -+ for (i=0; ; i++) { -+ if (i >= buflen-1) { -+ /* we're running out of space in the buffer. -+ * Make it bigger: */ -+ char *tmppass = pass; -+ buflen += 128; -+ pass = realloc(tmppass, buflen); -+ if (pass == NULL) { -+ /* realloc failed. Stop reading. */ -+ error("Out of memory while reading passphrase"); -+ pass = tmppass; /* the old buffer hasn't changed */ -+ break; -+ } -+ } -+ if (read(pfd, pass+i, 1) != 1 || -+ pass[i] == '\n' || pass[i] == 0) -+ break; -+ } -+ -+ if (pass == NULL) -+ return ""; -+ -+ pass[i] = 0; -+ return pass; -+} -+ -+static int -+digits_only(const char *s) { -+ while (*s) -+ if (!isdigit(*s++)) -+ return 0; -+ return 1; -+} -+ -+int -+set_loop(const char *device, const char *file, unsigned long long offset, -+ const char *encryption, int pfd, int *loopro) { -+ struct loop_info64 loopinfo64; -+ int fd, ffd, mode, i; -+ char *pass; -+ -+ mode = (*loopro ? O_RDONLY : O_RDWR); -+ if ((ffd = open(file, mode)) < 0) { -+ if (!*loopro && errno == EROFS) -+ ffd = open(file, mode = O_RDONLY); -+ if (ffd < 0) { -+ perror(file); -+ return 1; -+ } -+ } -+ if ((fd = open(device, mode)) < 0) { -+ perror (device); -+ return 1; -+ } -+ *loopro = (mode == O_RDONLY); -+ -+ memset(&loopinfo64, 0, sizeof(loopinfo64)); -+ -+ xstrncpy(loopinfo64.lo_file_name, file, LO_NAME_SIZE); -+ -+ if (encryption && *encryption) { -+ if (digits_only(encryption)) { -+ loopinfo64.lo_encrypt_type = atoi(encryption); -+ } else { -+ loopinfo64.lo_encrypt_type = LO_CRYPT_CRYPTOAPI; -+ snprintf(loopinfo64.lo_crypt_name, LO_NAME_SIZE, -+ "%s", encryption); -+ } -+ } -+ -+ loopinfo64.lo_offset = offset; -+ -+ -+ switch (loopinfo64.lo_encrypt_type) { -+ case LO_CRYPT_NONE: -+ loopinfo64.lo_encrypt_key_size = 0; -+ break; -+ case LO_CRYPT_XOR: -+ pass = xgetpass(pfd, "Password: "); -+ goto gotpass; -+ default: -+ pass = xgetpass(pfd, "Password: "); -+ gotpass: -+ memset(loopinfo64.lo_encrypt_key, 0, LO_KEY_SIZE); -+ xstrncpy(loopinfo64.lo_encrypt_key, pass, LO_KEY_SIZE); -+ memset(pass, 0, strlen(pass)); -+ loopinfo64.lo_encrypt_key_size = LO_KEY_SIZE; -+ } -+ -+ if (ioctl(fd, LOOP_SET_FD, ffd) < 0) { -+ perror("ioctl: LOOP_SET_FD"); -+ return 1; -+ } -+ close (ffd); -+ -+ i = ioctl(fd, LOOP_SET_STATUS64, &loopinfo64); -+ if (i) { -+ struct loop_info loopinfo; -+ int errsv = errno; -+ -+ i = loop_info64_to_old(&loopinfo64, &loopinfo); -+ if (i) { -+ errno = errsv; -+ perror("ioctl: LOOP_SET_STATUS64"); -+ } else { -+ i = ioctl(fd, LOOP_SET_STATUS, &loopinfo); -+ if (i) -+ perror("ioctl: LOOP_SET_STATUS"); -+ } -+ memset(&loopinfo, 0, sizeof(loopinfo)); -+ } -+ memset(&loopinfo64, 0, sizeof(loopinfo64)); -+ -+ if (i) { -+ ioctl (fd, LOOP_CLR_FD, 0); -+ close (fd); -+ return 1; -+ } -+ close (fd); -+ -+ if (verbose > 1) -+ printf("set_loop(%s,%s,%llu): success\n", -+ device, file, offset); -+ return 0; -+} -+ -+int -+del_loop (const char *device) { -+ int fd; -+ -+ if ((fd = open (device, O_RDONLY)) < 0) { -+ int errsv = errno; -+ fprintf(stderr, "loop: can't delete device %s: %s\n", -+ device, strerror (errsv)); -+ return 1; -+ } -+ if (ioctl (fd, LOOP_CLR_FD, 0) < 0) { -+ perror ("ioctl: LOOP_CLR_FD"); -+ return 1; -+ } -+ close (fd); -+ if (verbose > 1) -+ printf("del_loop(%s): success\n", device); -+ return 0; -+} -+ -+ -+#include -+#include -+ -+int verbose = 0; -+char *progname; -+ -+static void -+usage(void) { -+ fprintf(stderr, "usage:\n\ -+ %s loop_device # give info\n\ -+ %s -d loop_device # delete\n\ -+ %s -f # find unused\n\ -+ %s [-e encryption] [-o offset] {-f|loop_device} file # setup\n", -+ progname, progname, progname, progname); -+ exit(1); -+} -+ -+char * -+xstrdup (const char *s) { -+ char *t; -+ -+ if (s == NULL) -+ return NULL; -+ -+ t = strdup (s); -+ -+ if (t == NULL) { -+ fprintf(stderr, "not enough memory"); -+ exit(1); -+ } -+ -+ return t; -+} -+ -+void -+error (const char *fmt, ...) { -+ va_list args; -+ -+ va_start (args, fmt); -+ vfprintf (stderr, fmt, args); -+ va_end (args); -+ fprintf (stderr, "\n"); -+} -+ -+int -+main(int argc, char **argv) { -+ char *p, *offset, *encryption, *passfd, *device, *file; -+ int delete, find, c; -+ int res = 0; -+ int ro = 0; -+ int pfd = -1; -+ unsigned long long off; -+ -+ -+ delete = find = 0; -+ off = 0; -+ offset = encryption = passfd = NULL; -+ -+ progname = argv[0]; -+ if ((p = strrchr(progname, '/')) != NULL) -+ progname = p+1; -+ -+ while ((c = getopt(argc, argv, "de:E:fo:p:v")) != -1) { -+ switch (c) { -+ case 'd': -+ delete = 1; -+ break; -+ case 'E': -+ case 'e': -+ encryption = optarg; -+ break; -+ case 'f': -+ find = 1; -+ break; -+ case 'o': -+ offset = optarg; -+ break; -+ case 'p': -+ passfd = optarg; -+ break; -+ case 'v': -+ verbose = 1; -+ break; -+ default: -+ usage(); -+ } -+ } -+ -+ if (argc == 1) { -+ usage(); -+ } else if (delete) { -+ if (argc != optind+1 || encryption || offset || find) -+ usage(); -+ } else if (find) { -+ if (argc < optind || argc > optind+1) -+ usage(); -+ } else { -+ if (argc < optind+1 || argc > optind+2) -+ usage(); -+ } -+ -+ if (find) { -+ device = find_unused_loop_device(); -+ if (device == NULL) -+ return -1; -+ if (verbose) -+ printf("Loop device is %s\n", device); -+ if (argc == optind) { -+ printf("%s\n", device); -+ return 0; -+ } -+ file = argv[optind]; -+ } else { -+ device = argv[optind]; -+ if (argc == optind+1) -+ file = NULL; -+ else -+ file = argv[optind+1]; -+ } -+ -+ if (delete) -+ res = del_loop(device); -+ else if (file == NULL) -+ res = show_loop(device); -+ else { -+ if (offset && sscanf(offset, "%llu", &off) != 1) -+ usage(); -+ if (passfd && sscanf(passfd, "%d", &pfd) != 1) -+ usage(); -+ res = set_loop(device, file, off, encryption, pfd, &ro); -+ } -+ return res; -+} -Index: klibc-1.5/usr/utils/loop.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ klibc-1.5/usr/utils/loop.h 2008-03-07 23:01:49.336694297 +0100 -@@ -0,0 +1,51 @@ -+#define LO_CRYPT_NONE 0 -+#define LO_CRYPT_XOR 1 -+#define LO_CRYPT_DES 2 -+#define LO_CRYPT_CRYPTOAPI 18 -+ -+#define LOOP_SET_FD 0x4C00 -+#define LOOP_CLR_FD 0x4C01 -+#define LOOP_SET_STATUS 0x4C02 -+#define LOOP_GET_STATUS 0x4C03 -+#define LOOP_SET_STATUS64 0x4C04 -+#define LOOP_GET_STATUS64 0x4C05 -+ -+#define LO_NAME_SIZE 64 -+#define LO_KEY_SIZE 32 -+ -+#include "my_dev_t.h" -+ -+struct loop_info { -+ int lo_number; -+ my_dev_t lo_device; -+ unsigned long lo_inode; -+ my_dev_t lo_rdevice; -+ int lo_offset; -+ int lo_encrypt_type; -+ int lo_encrypt_key_size; -+ int lo_flags; -+ char lo_name[LO_NAME_SIZE]; -+ unsigned char lo_encrypt_key[LO_KEY_SIZE]; -+ unsigned long lo_init[2]; -+ char reserved[4]; -+}; -+ -+/* -+ * Where to get __u8, __u32, __u64? Let us use unsigned char/int/long long -+ * and get punished when someone comes with 128-bit long longs. -+ */ -+struct loop_info64 { -+ unsigned long long lo_device; -+ unsigned long long lo_inode; -+ unsigned long long lo_rdevice; -+ unsigned long long lo_offset; -+ unsigned long long lo_sizelimit; /* bytes, 0 == max available */ -+ unsigned int lo_number; -+ unsigned int lo_encrypt_type; -+ unsigned int lo_encrypt_key_size; -+ unsigned int lo_flags; -+ unsigned char lo_file_name[LO_NAME_SIZE]; -+ unsigned char lo_crypt_name[LO_NAME_SIZE]; -+ unsigned char lo_encrypt_key[LO_KEY_SIZE]; -+ unsigned long long lo_init[2]; -+}; -Index: klibc-1.5/usr/utils/my_dev_t.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ klibc-1.5/usr/utils/my_dev_t.h 2008-03-07 23:03:45.148693283 +0100 -@@ -0,0 +1,20 @@ -+/* silliness to get dev_t defined as the kernel defines it */ -+/* glibc uses a different dev_t */ -+ -+#include -+#include -+ -+#ifndef KERNEL_VERSION -+#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) -+#endif -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(1,3,78) -+/* for i386 - alpha uses unsigned int */ -+#define my_dev_t unsigned short -+#else -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,68) -+#define my_dev_t __kernel_dev_t -+#else -+#define my_dev_t __kernel_old_dev_t -+#endif -+#endif diff --git a/recipes/klibc/klibc-1.5.18.inc b/recipes/klibc/klibc-1.5.18.inc deleted file mode 100644 index 3c8c5fefb8..0000000000 --- a/recipes/klibc/klibc-1.5.18.inc +++ /dev/null @@ -1,2 +0,0 @@ -SRC_URI[md5sum] = "5c8b6577b9acb3809cace6e118cdd55b" -SRC_URI[sha256sum] = "e4104f8b34a5f354222bd4622f50b58c6218bf70614450d68539cbef666b6446" diff --git a/recipes/klibc/klibc-1.5.18/isystem.patch b/recipes/klibc/klibc-1.5.18/isystem.patch new file mode 100644 index 0000000000..ccdf9ed92d --- /dev/null +++ b/recipes/klibc/klibc-1.5.18/isystem.patch @@ -0,0 +1,13 @@ +Index: klibc-1.5.15/klcc/klcc.in +=================================================================== +--- klibc-1.5.15.orig/klcc/klcc.in 2009-12-14 00:32:41.373661102 +0100 ++++ klibc-1.5.15/klcc/klcc.in 2009-12-14 00:34:20.855735356 +0100 +@@ -147,7 +147,7 @@ + } elsif ( $a =~ /^-([fmwWQdO]|std=|ansi|pedantic|M[GPD]|MMD)/ ) { + # Options to gcc + push(@ccopt, $a); +- } elsif ( $a =~ /^-([DUI]|M[FQT])(.*)$/ ) { ++ } elsif ( $a =~ /^-([DUI]|M[FQT]|isystem)(.*)$/ ) { + # Options to gcc, which can take either a conjoined argument + # (-DFOO) or a disjoint argument (-D FOO) + push(@ccopt, $a); diff --git a/recipes/klibc/klibc-1.5.18/klibc-config-eabi.patch b/recipes/klibc/klibc-1.5.18/klibc-config-eabi.patch new file mode 100644 index 0000000000..86517f0594 --- /dev/null +++ b/recipes/klibc/klibc-1.5.18/klibc-config-eabi.patch @@ -0,0 +1,9 @@ +diff -Nur klibc-1.5/defconfig klibc-1.5p/defconfig +--- klibc-1.5/defconfig 2007-03-04 02:52:10.000000000 +0100 ++++ klibc-1.5p/defconfig 2008-02-08 19:24:22.337127756 +0100 +@@ -5,4 +5,4 @@ + CONFIG_REGPARM=y + # ARM options + # CONFIG_KLIBC_THUMB is not set +-# CONFIG_AEABI is not set ++CONFIG_AEABI=y diff --git a/recipes/klibc/klibc-1.5.18/klibc_kexecsyscall.patch b/recipes/klibc/klibc-1.5.18/klibc_kexecsyscall.patch new file mode 100644 index 0000000000..9b2dca4738 --- /dev/null +++ b/recipes/klibc/klibc-1.5.18/klibc_kexecsyscall.patch @@ -0,0 +1,11 @@ +--- klibc-1.5/usr/klibc/SYSCALLS.def 2007-03-04 02:52:10.000000000 +0100 ++++ klibc.clean/usr/klibc/SYSCALLS.def 2008-02-22 17:12:23.663612084 +0100 +@@ -13,6 +13,8 @@ + #include + #include + #include ++#include ++long kexec_load(void *, unsigned long , struct kexec_segment *, unsigned long ); + + /* + * Process-related syscalls diff --git a/recipes/klibc/klibc-1.5.18/losetup.patch b/recipes/klibc/klibc-1.5.18/losetup.patch new file mode 100644 index 0000000000..77049bd05f --- /dev/null +++ b/recipes/klibc/klibc-1.5.18/losetup.patch @@ -0,0 +1,571 @@ +Index: klibc-1.5/usr/utils/losetup.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ klibc-1.5/usr/utils/losetup.c 2008-03-07 23:13:38.635692852 +0100 +@@ -0,0 +1,485 @@ ++/* Originally from Ted's losetup.c */ ++ ++#define LOOPMAJOR 7 ++ ++/* ++ * losetup.c - setup and control loop devices ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "loop.h" ++ ++extern int verbose; ++extern char *progname; ++extern char *xstrdup (const char *s); /* not: #include "sundries.h" */ ++extern void error (const char *fmt, ...); /* idem */ ++ ++/* caller guarantees n > 0 */ ++void ++xstrncpy(char *dest, const char *src, size_t n) { ++ strncpy(dest, src, n-1); ++ dest[n-1] = 0; ++} ++ ++ ++static int ++loop_info64_to_old(const struct loop_info64 *info64, struct loop_info *info) ++{ ++ memset(info, 0, sizeof(*info)); ++ info->lo_number = info64->lo_number; ++ info->lo_device = info64->lo_device; ++ info->lo_inode = info64->lo_inode; ++ info->lo_rdevice = info64->lo_rdevice; ++ info->lo_offset = info64->lo_offset; ++ info->lo_encrypt_type = info64->lo_encrypt_type; ++ info->lo_encrypt_key_size = info64->lo_encrypt_key_size; ++ info->lo_flags = info64->lo_flags; ++ info->lo_init[0] = info64->lo_init[0]; ++ info->lo_init[1] = info64->lo_init[1]; ++ if (info->lo_encrypt_type == LO_CRYPT_CRYPTOAPI) ++ memcpy(info->lo_name, info64->lo_crypt_name, LO_NAME_SIZE); ++ else ++ memcpy(info->lo_name, info64->lo_file_name, LO_NAME_SIZE); ++ memcpy(info->lo_encrypt_key, info64->lo_encrypt_key, LO_KEY_SIZE); ++ ++ /* error in case values were truncated */ ++ if (info->lo_device != info64->lo_device || ++ info->lo_rdevice != info64->lo_rdevice || ++ info->lo_inode != info64->lo_inode || ++ info->lo_offset != info64->lo_offset) ++ return -EOVERFLOW; ++ ++ return 0; ++} ++ ++ ++static int ++show_loop(char *device) { ++ struct loop_info loopinfo; ++ struct loop_info64 loopinfo64; ++ int fd, errsv; ++ ++ if ((fd = open(device, O_RDONLY)) < 0) { ++ int errsv = errno; ++ fprintf(stderr, "loop: can't open device %s: %s\n", ++ device, strerror (errsv)); ++ return 2; ++ } ++ ++ if (ioctl(fd, LOOP_GET_STATUS64, &loopinfo64) == 0) { ++ ++ loopinfo64.lo_file_name[LO_NAME_SIZE-2] = '*'; ++ loopinfo64.lo_file_name[LO_NAME_SIZE-1] = 0; ++ loopinfo64.lo_crypt_name[LO_NAME_SIZE-1] = 0; ++ ++ printf("%s: [%04llx]:%llu (%s)", ++ device, loopinfo64.lo_device, loopinfo64.lo_inode, ++ loopinfo64.lo_file_name); ++ ++ if (loopinfo64.lo_offset) ++ printf(", offset %lld", loopinfo64.lo_offset); ++ ++ if (loopinfo64.lo_sizelimit) ++ printf(", sizelimit %lld", loopinfo64.lo_sizelimit); ++ ++ if (loopinfo64.lo_encrypt_type || ++ loopinfo64.lo_crypt_name[0]) { ++ char *e = loopinfo64.lo_crypt_name; ++ ++ if (*e == 0 && loopinfo64.lo_encrypt_type == 1) ++ e = "XOR"; ++ printf(", encryption %s (type %d)", ++ e, loopinfo64.lo_encrypt_type); ++ } ++ printf("\n"); ++ close (fd); ++ return 0; ++ } ++ ++ if (ioctl(fd, LOOP_GET_STATUS, &loopinfo) == 0) { ++ printf ("%s: [%04x]:%ld (%s)", ++ device, loopinfo.lo_device, loopinfo.lo_inode, ++ loopinfo.lo_name); ++ ++ if (loopinfo.lo_offset) ++ printf(", offset %d", loopinfo.lo_offset); ++ ++ if (loopinfo.lo_encrypt_type) ++ printf(", encryption type %d\n", ++ loopinfo.lo_encrypt_type); ++ ++ printf("\n"); ++ close (fd); ++ return 0; ++ } ++ ++ errsv = errno; ++ fprintf(stderr, "loop: can't get info on device %s: %s\n", ++ device, strerror (errsv)); ++ close (fd); ++ return 1; ++} ++ ++int ++is_loop_device (const char *device) { ++ struct stat statbuf; ++ ++ return (stat(device, &statbuf) == 0 && ++ S_ISBLK(statbuf.st_mode) && ++ major(statbuf.st_rdev) == LOOPMAJOR); ++} ++ ++#define SIZE(a) (sizeof(a)/sizeof(a[0])) ++ ++char * ++find_unused_loop_device (void) { ++ /* Just creating a device, say in /tmp, is probably a bad idea - ++ people might have problems with backup or so. ++ So, we just try /dev/loop[0-7]. */ ++ char dev[20]; ++ char *loop_formats[] = { "/dev/loop%d", "/dev/loop/%d" }; ++ int i, j, fd, somedev = 0, someloop = 0, permission = 0; ++ struct stat statbuf; ++ struct loop_info loopinfo; ++ ++ for (j = 0; j < SIZE(loop_formats); j++) { ++ for(i = 0; i < 256; i++) { ++ sprintf(dev, loop_formats[j], i); ++ if (stat (dev, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)) { ++ somedev++; ++ fd = open (dev, O_RDONLY); ++ if (fd >= 0) { ++ if(ioctl (fd, LOOP_GET_STATUS, &loopinfo) == 0) ++ someloop++; /* in use */ ++ else if (errno == ENXIO) { ++ close (fd); ++ return xstrdup(dev);/* probably free */ ++ } ++ close (fd); ++ } else if (errno == EACCES) ++ permission++; ++ ++ continue;/* continue trying as long as devices exist */ ++ } ++ break; ++ } ++ } ++ ++ if (!somedev) ++ error("%s: could not find any device /dev/loop#", progname); ++ else if (!someloop && permission) ++ error("%s: no permission to look at /dev/loop#", progname); ++ else if (!someloop) ++ error( ++ "%s: Could not find any loop device. Maybe this kernel " ++ "does not know\n" ++ " about the loop device? (If so, recompile or " ++ "`modprobe loop'.)", progname); ++ else ++ error("%s: could not find any free loop device", progname); ++ return 0; ++} ++ ++/* ++ * A function to read the passphrase either from the terminal or from ++ * an open file descriptor. ++ */ ++static char * ++xgetpass(int pfd, const char *prompt) { ++ char *pass; ++ int buflen, i; ++ ++ pass = NULL; ++ buflen = 0; ++ for (i=0; ; i++) { ++ if (i >= buflen-1) { ++ /* we're running out of space in the buffer. ++ * Make it bigger: */ ++ char *tmppass = pass; ++ buflen += 128; ++ pass = realloc(tmppass, buflen); ++ if (pass == NULL) { ++ /* realloc failed. Stop reading. */ ++ error("Out of memory while reading passphrase"); ++ pass = tmppass; /* the old buffer hasn't changed */ ++ break; ++ } ++ } ++ if (read(pfd, pass+i, 1) != 1 || ++ pass[i] == '\n' || pass[i] == 0) ++ break; ++ } ++ ++ if (pass == NULL) ++ return ""; ++ ++ pass[i] = 0; ++ return pass; ++} ++ ++static int ++digits_only(const char *s) { ++ while (*s) ++ if (!isdigit(*s++)) ++ return 0; ++ return 1; ++} ++ ++int ++set_loop(const char *device, const char *file, unsigned long long offset, ++ const char *encryption, int pfd, int *loopro) { ++ struct loop_info64 loopinfo64; ++ int fd, ffd, mode, i; ++ char *pass; ++ ++ mode = (*loopro ? O_RDONLY : O_RDWR); ++ if ((ffd = open(file, mode)) < 0) { ++ if (!*loopro && errno == EROFS) ++ ffd = open(file, mode = O_RDONLY); ++ if (ffd < 0) { ++ perror(file); ++ return 1; ++ } ++ } ++ if ((fd = open(device, mode)) < 0) { ++ perror (device); ++ return 1; ++ } ++ *loopro = (mode == O_RDONLY); ++ ++ memset(&loopinfo64, 0, sizeof(loopinfo64)); ++ ++ xstrncpy(loopinfo64.lo_file_name, file, LO_NAME_SIZE); ++ ++ if (encryption && *encryption) { ++ if (digits_only(encryption)) { ++ loopinfo64.lo_encrypt_type = atoi(encryption); ++ } else { ++ loopinfo64.lo_encrypt_type = LO_CRYPT_CRYPTOAPI; ++ snprintf(loopinfo64.lo_crypt_name, LO_NAME_SIZE, ++ "%s", encryption); ++ } ++ } ++ ++ loopinfo64.lo_offset = offset; ++ ++ ++ switch (loopinfo64.lo_encrypt_type) { ++ case LO_CRYPT_NONE: ++ loopinfo64.lo_encrypt_key_size = 0; ++ break; ++ case LO_CRYPT_XOR: ++ pass = xgetpass(pfd, "Password: "); ++ goto gotpass; ++ default: ++ pass = xgetpass(pfd, "Password: "); ++ gotpass: ++ memset(loopinfo64.lo_encrypt_key, 0, LO_KEY_SIZE); ++ xstrncpy(loopinfo64.lo_encrypt_key, pass, LO_KEY_SIZE); ++ memset(pass, 0, strlen(pass)); ++ loopinfo64.lo_encrypt_key_size = LO_KEY_SIZE; ++ } ++ ++ if (ioctl(fd, LOOP_SET_FD, ffd) < 0) { ++ perror("ioctl: LOOP_SET_FD"); ++ return 1; ++ } ++ close (ffd); ++ ++ i = ioctl(fd, LOOP_SET_STATUS64, &loopinfo64); ++ if (i) { ++ struct loop_info loopinfo; ++ int errsv = errno; ++ ++ i = loop_info64_to_old(&loopinfo64, &loopinfo); ++ if (i) { ++ errno = errsv; ++ perror("ioctl: LOOP_SET_STATUS64"); ++ } else { ++ i = ioctl(fd, LOOP_SET_STATUS, &loopinfo); ++ if (i) ++ perror("ioctl: LOOP_SET_STATUS"); ++ } ++ memset(&loopinfo, 0, sizeof(loopinfo)); ++ } ++ memset(&loopinfo64, 0, sizeof(loopinfo64)); ++ ++ if (i) { ++ ioctl (fd, LOOP_CLR_FD, 0); ++ close (fd); ++ return 1; ++ } ++ close (fd); ++ ++ if (verbose > 1) ++ printf("set_loop(%s,%s,%llu): success\n", ++ device, file, offset); ++ return 0; ++} ++ ++int ++del_loop (const char *device) { ++ int fd; ++ ++ if ((fd = open (device, O_RDONLY)) < 0) { ++ int errsv = errno; ++ fprintf(stderr, "loop: can't delete device %s: %s\n", ++ device, strerror (errsv)); ++ return 1; ++ } ++ if (ioctl (fd, LOOP_CLR_FD, 0) < 0) { ++ perror ("ioctl: LOOP_CLR_FD"); ++ return 1; ++ } ++ close (fd); ++ if (verbose > 1) ++ printf("del_loop(%s): success\n", device); ++ return 0; ++} ++ ++ ++#include ++#include ++ ++int verbose = 0; ++char *progname; ++ ++static void ++usage(void) { ++ fprintf(stderr, "usage:\n\ ++ %s loop_device # give info\n\ ++ %s -d loop_device # delete\n\ ++ %s -f # find unused\n\ ++ %s [-e encryption] [-o offset] {-f|loop_device} file # setup\n", ++ progname, progname, progname, progname); ++ exit(1); ++} ++ ++char * ++xstrdup (const char *s) { ++ char *t; ++ ++ if (s == NULL) ++ return NULL; ++ ++ t = strdup (s); ++ ++ if (t == NULL) { ++ fprintf(stderr, "not enough memory"); ++ exit(1); ++ } ++ ++ return t; ++} ++ ++void ++error (const char *fmt, ...) { ++ va_list args; ++ ++ va_start (args, fmt); ++ vfprintf (stderr, fmt, args); ++ va_end (args); ++ fprintf (stderr, "\n"); ++} ++ ++int ++main(int argc, char **argv) { ++ char *p, *offset, *encryption, *passfd, *device, *file; ++ int delete, find, c; ++ int res = 0; ++ int ro = 0; ++ int pfd = -1; ++ unsigned long long off; ++ ++ ++ delete = find = 0; ++ off = 0; ++ offset = encryption = passfd = NULL; ++ ++ progname = argv[0]; ++ if ((p = strrchr(progname, '/')) != NULL) ++ progname = p+1; ++ ++ while ((c = getopt(argc, argv, "de:E:fo:p:v")) != -1) { ++ switch (c) { ++ case 'd': ++ delete = 1; ++ break; ++ case 'E': ++ case 'e': ++ encryption = optarg; ++ break; ++ case 'f': ++ find = 1; ++ break; ++ case 'o': ++ offset = optarg; ++ break; ++ case 'p': ++ passfd = optarg; ++ break; ++ case 'v': ++ verbose = 1; ++ break; ++ default: ++ usage(); ++ } ++ } ++ ++ if (argc == 1) { ++ usage(); ++ } else if (delete) { ++ if (argc != optind+1 || encryption || offset || find) ++ usage(); ++ } else if (find) { ++ if (argc < optind || argc > optind+1) ++ usage(); ++ } else { ++ if (argc < optind+1 || argc > optind+2) ++ usage(); ++ } ++ ++ if (find) { ++ device = find_unused_loop_device(); ++ if (device == NULL) ++ return -1; ++ if (verbose) ++ printf("Loop device is %s\n", device); ++ if (argc == optind) { ++ printf("%s\n", device); ++ return 0; ++ } ++ file = argv[optind]; ++ } else { ++ device = argv[optind]; ++ if (argc == optind+1) ++ file = NULL; ++ else ++ file = argv[optind+1]; ++ } ++ ++ if (delete) ++ res = del_loop(device); ++ else if (file == NULL) ++ res = show_loop(device); ++ else { ++ if (offset && sscanf(offset, "%llu", &off) != 1) ++ usage(); ++ if (passfd && sscanf(passfd, "%d", &pfd) != 1) ++ usage(); ++ res = set_loop(device, file, off, encryption, pfd, &ro); ++ } ++ return res; ++} +Index: klibc-1.5/usr/utils/loop.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ klibc-1.5/usr/utils/loop.h 2008-03-07 23:01:49.336694297 +0100 +@@ -0,0 +1,51 @@ ++#define LO_CRYPT_NONE 0 ++#define LO_CRYPT_XOR 1 ++#define LO_CRYPT_DES 2 ++#define LO_CRYPT_CRYPTOAPI 18 ++ ++#define LOOP_SET_FD 0x4C00 ++#define LOOP_CLR_FD 0x4C01 ++#define LOOP_SET_STATUS 0x4C02 ++#define LOOP_GET_STATUS 0x4C03 ++#define LOOP_SET_STATUS64 0x4C04 ++#define LOOP_GET_STATUS64 0x4C05 ++ ++#define LO_NAME_SIZE 64 ++#define LO_KEY_SIZE 32 ++ ++#include "my_dev_t.h" ++ ++struct loop_info { ++ int lo_number; ++ my_dev_t lo_device; ++ unsigned long lo_inode; ++ my_dev_t lo_rdevice; ++ int lo_offset; ++ int lo_encrypt_type; ++ int lo_encrypt_key_size; ++ int lo_flags; ++ char lo_name[LO_NAME_SIZE]; ++ unsigned char lo_encrypt_key[LO_KEY_SIZE]; ++ unsigned long lo_init[2]; ++ char reserved[4]; ++}; ++ ++/* ++ * Where to get __u8, __u32, __u64? Let us use unsigned char/int/long long ++ * and get punished when someone comes with 128-bit long longs. ++ */ ++struct loop_info64 { ++ unsigned long long lo_device; ++ unsigned long long lo_inode; ++ unsigned long long lo_rdevice; ++ unsigned long long lo_offset; ++ unsigned long long lo_sizelimit; /* bytes, 0 == max available */ ++ unsigned int lo_number; ++ unsigned int lo_encrypt_type; ++ unsigned int lo_encrypt_key_size; ++ unsigned int lo_flags; ++ unsigned char lo_file_name[LO_NAME_SIZE]; ++ unsigned char lo_crypt_name[LO_NAME_SIZE]; ++ unsigned char lo_encrypt_key[LO_KEY_SIZE]; ++ unsigned long long lo_init[2]; ++}; +Index: klibc-1.5/usr/utils/my_dev_t.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ klibc-1.5/usr/utils/my_dev_t.h 2008-03-07 23:03:45.148693283 +0100 +@@ -0,0 +1,20 @@ ++/* silliness to get dev_t defined as the kernel defines it */ ++/* glibc uses a different dev_t */ ++ ++#include ++#include ++ ++#ifndef KERNEL_VERSION ++#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) ++#endif ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(1,3,78) ++/* for i386 - alpha uses unsigned int */ ++#define my_dev_t unsigned short ++#else ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,68) ++#define my_dev_t __kernel_dev_t ++#else ++#define my_dev_t __kernel_old_dev_t ++#endif ++#endif diff --git a/recipes/klibc/klibc-utils-static_1.5.18.bb b/recipes/klibc/klibc-utils-static_1.5.18.bb index 30b2222def..2b6494d960 100644 --- a/recipes/klibc/klibc-utils-static_1.5.18.bb +++ b/recipes/klibc/klibc-utils-static_1.5.18.bb @@ -15,4 +15,6 @@ KLIBC_UTILS_PKGNAME = "klibc-utils-static" ####################### require klibc-utils.inc require klibc.inc -require klibc-${PV}.inc + +SRC_URI[md5sum] = "5c8b6577b9acb3809cace6e118cdd55b" +SRC_URI[sha256sum] = "e4104f8b34a5f354222bd4622f50b58c6218bf70614450d68539cbef666b6446" diff --git a/recipes/klibc/klibc_1.5.18.bb b/recipes/klibc/klibc_1.5.18.bb index 8271abc8ab..a70405e025 100644 --- a/recipes/klibc/klibc_1.5.18.bb +++ b/recipes/klibc/klibc_1.5.18.bb @@ -1,4 +1,5 @@ do_install() { + oe_runmake DEST_DIR=${D} install install -d ${D}${base_bindir} install -m 755 usr/dash/sh.${KLIBC_UTILS_VARIANT} ${D}${base_bindir}/sh install -m 755 usr/kinit/kinit.${KLIBC_UTILS_VARIANT} ${D}${base_bindir}/kinit @@ -6,15 +7,11 @@ do_install() { install -d ${D}${base_libdir} install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir} (cd ${D}${base_libdir}; ln -s klibc-*.so klibc.so) + install -m 755 klcc/klcc ${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}klcc } export INST=${STAGING_DIR_TARGET} -do_stage() { - oe_runmake install - cp '${STAGING_DIR_TARGET}/bin/klcc' '${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}klcc' -} - PACKAGES = "${PN} ${PN}-dev " FILES_${PN} = "${base_libdir}/klibc-*.so" FILES_${PN}-dev = "${base_libdir}/klibc.so" @@ -60,4 +57,6 @@ RDEPENDS_${KLIBC_UTILS_PKGNAME}-wc = "${PN} (=${PV}-${PR})" ####################### require klibc-utils.inc require klibc.inc -require klibc-${PV}.inc + +SRC_URI[md5sum] = "5c8b6577b9acb3809cace6e118cdd55b" +SRC_URI[sha256sum] = "e4104f8b34a5f354222bd4622f50b58c6218bf70614450d68539cbef666b6446" -- cgit v1.2.3 From 49ddf7eeda01a541d4bb9f25d8c756ef2d81012e Mon Sep 17 00:00:00 2001 From: Jason Kridner Date: Wed, 11 Aug 2010 09:33:29 +0000 Subject: u-boot: beagleboard: adjusted clocks to match PSP Signed-off-by: Jason Kridner Signed-off-by: Koen Kooi --- .../0019-OMAP3-clocks-update-clock-setup-for-36XX-37XX.patch | 4 ++-- recipes/u-boot/u-boot_git.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/u-boot/u-boot-git/beagleboard/0019-OMAP3-clocks-update-clock-setup-for-36XX-37XX.patch b/recipes/u-boot/u-boot-git/beagleboard/0019-OMAP3-clocks-update-clock-setup-for-36XX-37XX.patch index 03da8ce662..e5dbec62fc 100644 --- a/recipes/u-boot/u-boot-git/beagleboard/0019-OMAP3-clocks-update-clock-setup-for-36XX-37XX.patch +++ b/recipes/u-boot/u-boot-git/beagleboard/0019-OMAP3-clocks-update-clock-setup-for-36XX-37XX.patch @@ -726,9 +726,9 @@ index 73063ec..2045e4e 100644 +per_36x_dpll_param: +/* SYSCLK M N M2 M3 M4 M5 M6 m2DIV */ +.word 12000, 360, 4, 9, 16, 5, 4, 3, 1 -+.word 13000, 1728, 12, 9, 32, 18, 8, 6, 2 ++.word 13000, 864, 12, 9, 16, 9, 4, 3, 1 +.word 19200, 360, 7, 9, 16, 5, 4, 3, 1 -+.word 26000, 1728, 12, 9, 32, 18, 8, 6, 2 ++.word 26000, 432, 12, 9, 16, 9, 4, 3, 1 +.word 38400, 360, 15, 9, 16, 5, 4, 3, 1 + +.globl get_36x_mpu_dpll_param diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index ed2ee9265b..7f26a87114 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -1,5 +1,5 @@ require u-boot.inc -PR ="r62" +PR ="r63" FILESPATHPKG =. "u-boot-git:" -- cgit v1.2.3 From 44ded83e917c4d8b47b215648efc2860f794c764 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Thu, 12 Aug 2010 12:24:28 +0200 Subject: urjtag: added git version added git version as git head supports jtag over gpio. Signed-off-by: Frans Meulenbroeks --- recipes/urjtag/urjtag_git.bb | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 recipes/urjtag/urjtag_git.bb diff --git a/recipes/urjtag/urjtag_git.bb b/recipes/urjtag/urjtag_git.bb new file mode 100644 index 0000000000..1159c1fc6f --- /dev/null +++ b/recipes/urjtag/urjtag_git.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "UrJTAG is a universal JTAG library, servers and tools" +HOMEPAGE = "http://urjtag.org/" +LICENSE = "GPLv2" +DEPENDS = "libftdi libusb gettext readline" + +SRCREV = "fc8686b8dd545f54d25e77f65e43f4d774bc46" + +PV = "0.10" +PR = "r0" +PR_append = "+gitr${SRCPV}" + +S = "${WORKDIR}/git/urjtag" + +SRC_URI = "git://urjtag.git.sourceforge.net/gitroot/urjtag/urjtag;protocol=git;branch=master \ + " +inherit autotools + +# no idea why -s would make a difference but without it configure fails. +# guess the symlink is created before the actual content is there +EXTRA_AUTORECONF = "-s" + +do_install () { + oe_runmake DESTDIR=${D} MKINSTALLDIRS="${S}/tools/mkinstalldirs" install +} -- cgit v1.2.3 From 9e1bbdf672b12d0d7788eeba90f7a079c56bc0c6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 12 Aug 2010 12:41:49 +0200 Subject: xorg: add latest versions for 2010-08-12 Signed-off-by: Martin Jansa --- .../include/preferred-xorg-versions-live.inc | 44 +++++++++++----------- recipes/xorg-app/xditview_1.0.2.bb | 7 ++++ recipes/xorg-app/xset_1.2.0.bb | 14 +++++++ recipes/xorg-driver/xf86-input-aiptek_1.3.1.bb | 6 +++ .../xorg-driver/xf86-input-synaptics_1.2.99.1.bb | 7 ++++ recipes/xorg-driver/xf86-input-vmmouse_12.6.10.bb | 9 +++++ recipes/xorg-driver/xf86-video-ast_0.91.10.bb | 6 +++ recipes/xorg-driver/xf86-video-i128_1.3.4.bb | 7 ++++ recipes/xorg-driver/xf86-video-vmware_11.0.2.bb | 7 ++++ recipes/xorg-driver/xf86-video-xgi_1.6.0.bb | 7 ++++ recipes/xorg-driver/xf86-video-xgixp_1.8.0.bb | 7 ++++ recipes/xorg-lib/libx11-1.3.5/dolt-fix.patch | 22 +++++++++++ .../xorg-lib/libx11-1.3.5/keysymdef_include.patch | 21 +++++++++++ .../libx11-1.3.5/x11_disable_makekeys.patch | 29 ++++++++++++++ recipes/xorg-lib/libx11_1.3.5.bb | 6 +++ recipes/xorg-proto/glproto_1.4.12.bb | 6 +++ recipes/xorg-proto/kbproto_1.0.5.bb | 8 ++++ recipes/xorg-proto/renderproto_0.11.1.bb | 10 +++++ recipes/xorg-proto/videoproto_2.3.1.bb | 6 +++ recipes/xorg-proto/xextproto_7.1.2.bb | 8 ++++ recipes/xorg-proto/xproto_7.0.18.bb | 8 ++++ recipes/xorg-xserver/xserver-xorg_git.bb | 2 +- 22 files changed, 224 insertions(+), 23 deletions(-) create mode 100644 recipes/xorg-app/xditview_1.0.2.bb create mode 100644 recipes/xorg-app/xset_1.2.0.bb create mode 100644 recipes/xorg-driver/xf86-input-aiptek_1.3.1.bb create mode 100644 recipes/xorg-driver/xf86-input-synaptics_1.2.99.1.bb create mode 100644 recipes/xorg-driver/xf86-input-vmmouse_12.6.10.bb create mode 100644 recipes/xorg-driver/xf86-video-ast_0.91.10.bb create mode 100644 recipes/xorg-driver/xf86-video-i128_1.3.4.bb create mode 100644 recipes/xorg-driver/xf86-video-vmware_11.0.2.bb create mode 100644 recipes/xorg-driver/xf86-video-xgi_1.6.0.bb create mode 100644 recipes/xorg-driver/xf86-video-xgixp_1.8.0.bb create mode 100644 recipes/xorg-lib/libx11-1.3.5/dolt-fix.patch create mode 100644 recipes/xorg-lib/libx11-1.3.5/keysymdef_include.patch create mode 100644 recipes/xorg-lib/libx11-1.3.5/x11_disable_makekeys.patch create mode 100644 recipes/xorg-lib/libx11_1.3.5.bb create mode 100644 recipes/xorg-proto/glproto_1.4.12.bb create mode 100644 recipes/xorg-proto/kbproto_1.0.5.bb create mode 100644 recipes/xorg-proto/renderproto_0.11.1.bb create mode 100644 recipes/xorg-proto/videoproto_2.3.1.bb create mode 100644 recipes/xorg-proto/xextproto_7.1.2.bb create mode 100644 recipes/xorg-proto/xproto_7.0.18.bb diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc index 53d202a383..f50106851c 100644 --- a/conf/distro/include/preferred-xorg-versions-live.inc +++ b/conf/distro/include/preferred-xorg-versions-live.inc @@ -1,4 +1,4 @@ -#Wed Aug 4 08:58:39 CEST 2010 +#Thu Aug 12 11:37:37 CEST 2010 #app PREFERRED_VERSION_appres ?= "1.0.2" PREFERRED_VERSION_bdftopcf ?= "1.0.2" @@ -46,7 +46,7 @@ PREFERRED_VERSION_xconsole ?= "1.0.3" PREFERRED_VERSION_xcursorgen ?= "1.0.3" PREFERRED_VERSION_xcursorgen-native ?= "1.0.3" PREFERRED_VERSION_xdbedizzy ?= "1.0.2" -PREFERRED_VERSION_xditview ?= "1.0.1" +PREFERRED_VERSION_xditview ?= "1.0.2" PREFERRED_VERSION_xdm ?= "1.1.10" PREFERRED_VERSION_xdpyinfo ?= "1.1.0" PREFERRED_VERSION_xdriinfo ?= "1.0.3" @@ -91,7 +91,7 @@ PREFERRED_VERSION_xrandr ?= "1.3.3" PREFERRED_VERSION_xrdb ?= "1.0.6" PREFERRED_VERSION_xrefresh ?= "1.0.3" PREFERRED_VERSION_xrx ?= "1.0.3" -PREFERRED_VERSION_xset ?= "1.1.0" +PREFERRED_VERSION_xset ?= "1.2.0" PREFERRED_VERSION_xsetmode ?= "1.0.0" PREFERRED_VERSION_xsetpointer ?= "1.0.1" PREFERRED_VERSION_xsetroot ?= "1.0.3" @@ -112,7 +112,7 @@ PREFERRED_VERSION_xorg-docs ?= "1.5" PREFERRED_VERSION_xorg-sgml-doctools ?= "1.5" #driver PREFERRED_VERSION_xf86-input-acecad ?= "1.4.0" -PREFERRED_VERSION_xf86-input-aiptek ?= "1.3.0" +PREFERRED_VERSION_xf86-input-aiptek ?= "1.3.1" PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.2" PREFERRED_VERSION_xf86-input-citron ?= "2.2.2" PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.1" @@ -138,11 +138,11 @@ PREFERRED_VERSION_xf86-input-summa ?= "1.2.0" PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.99.1" PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0" PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0" -PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.9" +PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.10" PREFERRED_VERSION_xf86-input-void ?= "1.3.0" PREFERRED_VERSION_xf86-video-apm ?= "1.2.3" PREFERRED_VERSION_xf86-video-ark ?= "0.7.3" -PREFERRED_VERSION_xf86-video-ast ?= "0.89.9" +PREFERRED_VERSION_xf86-video-ast ?= "0.91.10" PREFERRED_VERSION_xf86-video-ati ?= "6.13.1" PREFERRED_VERSION_xf86-video-chips ?= "1.2.3" PREFERRED_VERSION_xf86-video-cirrus ?= "1.3.2" @@ -151,7 +151,7 @@ PREFERRED_VERSION_xf86-video-dummy ?= "0.3.4" PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.2" PREFERRED_VERSION_xf86-video-geode ?= "2.11.8" PREFERRED_VERSION_xf86-video-glint ?= "1.2.4" -PREFERRED_VERSION_xf86-video-i128 ?= "1.3.3" +PREFERRED_VERSION_xf86-video-i128 ?= "1.3.4" PREFERRED_VERSION_xf86-video-i740 ?= "1.3.2" PREFERRED_VERSION_xf86-video-i810 ?= "1.7.4" PREFERRED_VERSION_xf86-video-impact ?= "0.2.0" @@ -189,11 +189,11 @@ PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1" PREFERRED_VERSION_xf86-video-vesa ?= "2.3.0" PREFERRED_VERSION_xf86-video-vga ?= "4.1.0" PREFERRED_VERSION_xf86-video-via ?= "0.2.2" -PREFERRED_VERSION_xf86-video-vmware ?= "11.0.1" +PREFERRED_VERSION_xf86-video-vmware ?= "11.0.2" PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.4" PREFERRED_VERSION_xf86-video-wsfb ?= "0.3.0" -PREFERRED_VERSION_xf86-video-xgi ?= "1.5.1" -PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.4" +PREFERRED_VERSION_xf86-video-xgi ?= "1.6.0" +PREFERRED_VERSION_xf86-video-xgixp ?= "1.8.0" #font PREFERRED_VERSION_encodings ?= "1.0.3" PREFERRED_VERSION_font-adobe-100dpi ?= "1.0.1" @@ -242,8 +242,8 @@ PREFERRED_VERSION_libice-native ?= "1.0.6" PREFERRED_VERSION_libsm ?= "1.1.1" PREFERRED_VERSION_libsm-native ?= "1.1.1" PREFERRED_VERSION_libwindowswm ?= "1.0.1" -PREFERRED_VERSION_libx11 ?= "1.3.4" -PREFERRED_VERSION_libx11-native ?= "1.3.4" +PREFERRED_VERSION_libx11 ?= "1.3.5" +PREFERRED_VERSION_libx11-native ?= "1.3.5" PREFERRED_VERSION_libxscrnsaver ?= "1.2.0" PREFERRED_VERSION_libxtrap ?= "1.0.0" PREFERRED_VERSION_libxau ?= "1.0.6" @@ -312,26 +312,26 @@ PREFERRED_VERSION_fontcacheproto ?= "0.1.3" PREFERRED_VERSION_fontcacheproto-native ?= "0.1.3" PREFERRED_VERSION_fontsproto ?= "2.1.0" PREFERRED_VERSION_fontsproto-native ?= "2.1.0" -PREFERRED_VERSION_glproto ?= "1.4.11" +PREFERRED_VERSION_glproto ?= "1.4.12" PREFERRED_VERSION_inputproto ?= "2.0" PREFERRED_VERSION_inputproto-native ?= "2.0" -PREFERRED_VERSION_kbproto ?= "1.0.4" -PREFERRED_VERSION_kbproto-native ?= "1.0.4" +PREFERRED_VERSION_kbproto ?= "1.0.5" +PREFERRED_VERSION_kbproto-native ?= "1.0.5" PREFERRED_VERSION_printproto ?= "1.0.4" PREFERRED_VERSION_randrproto ?= "1.3.1" PREFERRED_VERSION_randrproto-native ?= "1.3.1" PREFERRED_VERSION_recordproto ?= "1.14" -PREFERRED_VERSION_renderproto ?= "0.11" -PREFERRED_VERSION_renderproto-native ?= "0.11" +PREFERRED_VERSION_renderproto ?= "0.11.1" +PREFERRED_VERSION_renderproto-native ?= "0.11.1" PREFERRED_VERSION_resourceproto ?= "1.1.0" PREFERRED_VERSION_scrnsaverproto ?= "1.2.0" PREFERRED_VERSION_trapproto ?= "3.4.3" -PREFERRED_VERSION_videoproto ?= "2.3.0" +PREFERRED_VERSION_videoproto ?= "2.3.1" PREFERRED_VERSION_windowswmproto ?= "1.0.4" PREFERRED_VERSION_xcmiscproto ?= "1.2.0" PREFERRED_VERSION_xcmiscproto-native ?= "1.2.0" -PREFERRED_VERSION_xextproto ?= "7.1.1" -PREFERRED_VERSION_xextproto-native ?= "7.1.1" +PREFERRED_VERSION_xextproto ?= "7.1.2" +PREFERRED_VERSION_xextproto-native ?= "7.1.2" PREFERRED_VERSION_xf86bigfontproto ?= "1.2.0" PREFERRED_VERSION_xf86bigfontproto-native ?= "1.2.0" PREFERRED_VERSION_xf86dgaproto ?= "2.1" @@ -340,8 +340,8 @@ PREFERRED_VERSION_xf86miscproto ?= "0.9.3" PREFERRED_VERSION_xf86rushproto ?= "1.1.2" PREFERRED_VERSION_xf86vidmodeproto ?= "2.3" PREFERRED_VERSION_xineramaproto ?= "1.2" -PREFERRED_VERSION_xproto ?= "7.0.17" -PREFERRED_VERSION_xproto-native ?= "7.0.17" +PREFERRED_VERSION_xproto ?= "7.0.18" +PREFERRED_VERSION_xproto-native ?= "7.0.18" PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3" #util PREFERRED_VERSION_gccmakedep ?= "1.0.2" diff --git a/recipes/xorg-app/xditview_1.0.2.bb b/recipes/xorg-app/xditview_1.0.2.bb new file mode 100644 index 0000000000..9a9f20a36d --- /dev/null +++ b/recipes/xorg-app/xditview_1.0.2.bb @@ -0,0 +1,7 @@ +require xorg-app-common.inc +DEPENDS += " libxaw libxt" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "dbf480019b75377154b6976726809bba" +SRC_URI[archive.sha256sum] = "e5d02b60a8f383a20c44cc7d718455075344fb37d171b0397b84f1cc8d49e776" diff --git a/recipes/xorg-app/xset_1.2.0.bb b/recipes/xorg-app/xset_1.2.0.bb new file mode 100644 index 0000000000..beae9e51c9 --- /dev/null +++ b/recipes/xorg-app/xset_1.2.0.bb @@ -0,0 +1,14 @@ +require xorg-app-common.inc +DESCRIPTION = "user preference utility for X" +LICENSE = "MIT" +DEPENDS += "libxext libxxf86misc libxfontcache libxmu libxp libxau" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI += "file://disable-xkb.patch" +SRC_URI[archive.md5sum] = "88ff2d390695366fa53e5d746fe86ad5" +SRC_URI[archive.sha256sum] = "f038dd98a1508ee9467946fa5d69cc6d758cd709f656a704d7a9c824eecc1bfd" + +EXTRA_OECONF = "--disable-xkb" + +CFLAGS += "-D_GNU_SOURCE" diff --git a/recipes/xorg-driver/xf86-input-aiptek_1.3.1.bb b/recipes/xorg-driver/xf86-input-aiptek_1.3.1.bb new file mode 100644 index 0000000000..adeb859832 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-aiptek_1.3.1.bb @@ -0,0 +1,6 @@ +require xorg-driver-input.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "86dbf173283b53c6402618f42adc4441" +SRC_URI[archive.sha256sum] = "43594db310572cfe81383d53934c373638e8be57dc01b34573b4183d0ef1eb9a" diff --git a/recipes/xorg-driver/xf86-input-synaptics_1.2.99.1.bb b/recipes/xorg-driver/xf86-input-synaptics_1.2.99.1.bb new file mode 100644 index 0000000000..62ee0d29cd --- /dev/null +++ b/recipes/xorg-driver/xf86-input-synaptics_1.2.99.1.bb @@ -0,0 +1,7 @@ +require xorg-driver-input.inc +DESCRIPTION = "X.Org X server -- mouse input driver" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "356b88de59d77fde2936f41239dca89c" +SRC_URI[archive.sha256sum] = "771b82f0d2691e1ae87e712e0532b3667d62663f6f9ed8f56c303a7c64a47492" diff --git a/recipes/xorg-driver/xf86-input-vmmouse_12.6.10.bb b/recipes/xorg-driver/xf86-input-vmmouse_12.6.10.bb new file mode 100644 index 0000000000..edf61b3ebb --- /dev/null +++ b/recipes/xorg-driver/xf86-input-vmmouse_12.6.10.bb @@ -0,0 +1,9 @@ +require xorg-driver-input.inc +DESCRIPTION = "X.Org X server -- VMMouse input driver to use with VMWare" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "49c6e77851e9f7bc5cb7d85f061992f8" +SRC_URI[archive.sha256sum] = "a6369d5a860627f2a38842d5563045b263a459e534f6ae08df48f330f9a40910" + +COMPATIBLE_HOST = "i.86.*-linux" diff --git a/recipes/xorg-driver/xf86-video-ast_0.91.10.bb b/recipes/xorg-driver/xf86-video-ast_0.91.10.bb new file mode 100644 index 0000000000..1f55ce4720 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-ast_0.91.10.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "65da53af3ebd1685149b6145976fdb2d" +SRC_URI[archive.sha256sum] = "7e1b1490f894677f616c0215a7d5fb7d6c5355ce393cf5dc9c9ab4b635b8cc15" diff --git a/recipes/xorg-driver/xf86-video-i128_1.3.4.bb b/recipes/xorg-driver/xf86-video-i128_1.3.4.bb new file mode 100644 index 0000000000..f7bbe1b2e2 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-i128_1.3.4.bb @@ -0,0 +1,7 @@ +require xorg-driver-video.inc +DESCRIPTION = "X.Org X server -- i128 display driver" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "103316abb2dc466219c027afc5a71691" +SRC_URI[archive.sha256sum] = "b69b13a7fd69f5ad35119b6f8efb3243bfea05ae9aa5a067d0e754de5d248bcf" diff --git a/recipes/xorg-driver/xf86-video-vmware_11.0.2.bb b/recipes/xorg-driver/xf86-video-vmware_11.0.2.bb new file mode 100644 index 0000000000..3b1a18696d --- /dev/null +++ b/recipes/xorg-driver/xf86-video-vmware_11.0.2.bb @@ -0,0 +1,7 @@ +require xorg-driver-video.inc +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "00c3a70870abcda5f340497b0285dab1" +SRC_URI[archive.sha256sum] = "eab19da564b9488423424722fc84309fba2c10f1b90c092bf993f80c59f475d2" diff --git a/recipes/xorg-driver/xf86-video-xgi_1.6.0.bb b/recipes/xorg-driver/xf86-video-xgi_1.6.0.bb new file mode 100644 index 0000000000..39a4b70733 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-xgi_1.6.0.bb @@ -0,0 +1,7 @@ +require xorg-driver-video.inc +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "b4ac771ae81b52fca9b6fa68006a258a" +SRC_URI[archive.sha256sum] = "e83406eb5c2b0d5eae208164544883a31af7842710fafb27d765c61b8a4a9417" diff --git a/recipes/xorg-driver/xf86-video-xgixp_1.8.0.bb b/recipes/xorg-driver/xf86-video-xgixp_1.8.0.bb new file mode 100644 index 0000000000..80a3633c58 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-xgixp_1.8.0.bb @@ -0,0 +1,7 @@ +require xorg-driver-video.inc +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "0ebf98f1beaf911a242c79647cc08fbf" +SRC_URI[archive.sha256sum] = "3aa66d6dcc44302a91c7c829e15cd7b09176164476f5cb65dda190e1862ed71a" diff --git a/recipes/xorg-lib/libx11-1.3.5/dolt-fix.patch b/recipes/xorg-lib/libx11-1.3.5/dolt-fix.patch new file mode 100644 index 0000000000..7e96075aa3 --- /dev/null +++ b/recipes/xorg-lib/libx11-1.3.5/dolt-fix.patch @@ -0,0 +1,22 @@ +Index: libX11-1.3.4/m4/dolt.m4 +=================================================================== +--- libX11-1.3.4/m4/dolt.m4 ++++ libX11-1.3.4/m4/dolt.m4 +@@ -155,7 +155,7 @@ dnl without '=', because automake does n + cat <<__DOLTLIBTOOL__EOF__ > doltlibtool + #!$DOLT_BASH + __DOLTLIBTOOL__EOF__ +- cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool ++ cat <<'__DOLTLIBTOOL__EOF__' | sed -e "s/@host_alias@/$host_alias/g" >>doltlibtool + top_builddir_slash="${0%%doltlibtool}" + : ${top_builddir_slash:=./} + args=() +@@ -171,7 +171,7 @@ done + if $modeok && $tagok ; then + . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}" + else +- exec ${top_builddir_slash}libtool "$[]@" ++ exec ${top_builddir_slash}@host_alias@-libtool "$[]@" + fi + __DOLTLIBTOOL__EOF__ + diff --git a/recipes/xorg-lib/libx11-1.3.5/keysymdef_include.patch b/recipes/xorg-lib/libx11-1.3.5/keysymdef_include.patch new file mode 100644 index 0000000000..0cab165f74 --- /dev/null +++ b/recipes/xorg-lib/libx11-1.3.5/keysymdef_include.patch @@ -0,0 +1,21 @@ +Index: libX11-1.3.4/configure.ac +=================================================================== +--- libX11-1.3.4.orig/configure.ac ++++ libX11-1.3.4/configure.ac +@@ -355,8 +355,14 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, + # Find keysymdef.h + # + AC_MSG_CHECKING([keysymdef.h]) +-dir=`$PKG_CONFIG --variable=includedir xproto` +-KEYSYMDEF="$dir/X11/keysymdef.h" ++AC_ARG_WITH(keysymdef, ++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]), ++ KEYSYMDEF=$withval, KEYSYMDEF="") ++ ++if test x$KEYSYMDEF = x; then ++ dir=`${PKG_CONFIG} --variable=includedir xproto` ++ KEYSYMDEF="$dir/X11/keysymdef.h" ++fi + if test -f "$KEYSYMDEF"; then + AC_MSG_RESULT([$KEYSYMDEF]) + else diff --git a/recipes/xorg-lib/libx11-1.3.5/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.3.5/x11_disable_makekeys.patch new file mode 100644 index 0000000000..9763313975 --- /dev/null +++ b/recipes/xorg-lib/libx11-1.3.5/x11_disable_makekeys.patch @@ -0,0 +1,29 @@ +Index: libX11-1.3.4/src/util/Makefile.am +=================================================================== +--- libX11-1.3.4.orig/src/util/Makefile.am ++++ libX11-1.3.4/src/util/Makefile.am +@@ -1,24 +1 @@ +- +-noinst_PROGRAMS=makekeys +- +-makekeys_CFLAGS = \ +- $(X11_CFLAGS) \ +- $(CWARNFLAGS) +- +-CC = @CC_FOR_BUILD@ +-CPPFLAGS = @CPPFLAGS_FOR_BUILD@ +-CFLAGS = @CFLAGS_FOR_BUILD@ +-LDFLAGS = @LDFLAGS_FOR_BUILD@ +- + EXTRA_DIST = mkks.sh +- +-if LINT +-# Check source code with tools like lint & sparse +- +-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) +- +-lint: +- $(LINT) $(ALL_LINT_FLAGS) makekeys.c +- +-endif LINT diff --git a/recipes/xorg-lib/libx11_1.3.5.bb b/recipes/xorg-lib/libx11_1.3.5.bb new file mode 100644 index 0000000000..8c61aa756d --- /dev/null +++ b/recipes/xorg-lib/libx11_1.3.5.bb @@ -0,0 +1,6 @@ +require libx11.inc +PR = "${INC_PR}.0" + +SRC_URI += " file://dolt-fix.patch" +SRC_URI[archive.md5sum] = "a1175b6667fcb249c6f1d725965944e3" +SRC_URI[archive.sha256sum] = "c95a3e3b5c7d45f933f922bdf6c757640f1c370369e85130bb75a9810dc6ede6" diff --git a/recipes/xorg-proto/glproto_1.4.12.bb b/recipes/xorg-proto/glproto_1.4.12.bb new file mode 100644 index 0000000000..40b0f38dc8 --- /dev/null +++ b/recipes/xorg-proto/glproto_1.4.12.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "55edc5ff2efb734215c868f72f7cf27e" +SRC_URI[archive.sha256sum] = "48be7a9d190b600210e5ad08b4e8862a6b08e72dc52dbdf324716a888eb457de" diff --git a/recipes/xorg-proto/kbproto_1.0.5.bb b/recipes/xorg-proto/kbproto_1.0.5.bb new file mode 100644 index 0000000000..1d62aaf36f --- /dev/null +++ b/recipes/xorg-proto/kbproto_1.0.5.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "e7edb59a3f54af15f749e8f3e314ee62" +SRC_URI[archive.sha256sum] = "0eba4f525e1700798cc0585fe29556e4369fba6517c670866273ad104cf5f49d" + +BBCLASSEXTEND = "native nativesdk sdk" diff --git a/recipes/xorg-proto/renderproto_0.11.1.bb b/recipes/xorg-proto/renderproto_0.11.1.bb new file mode 100644 index 0000000000..466333cb99 --- /dev/null +++ b/recipes/xorg-proto/renderproto_0.11.1.bb @@ -0,0 +1,10 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "a914ccc1de66ddeb4b611c6b0686e274" +SRC_URI[archive.sha256sum] = "06735a5b92b20759204e4751ecd6064a2ad8a6246bb65b3078b862a00def2537" + +BBCLASSEXTEND = "native nativesdk sdk" + +CONFLICTS = "renderext" diff --git a/recipes/xorg-proto/videoproto_2.3.1.bb b/recipes/xorg-proto/videoproto_2.3.1.bb new file mode 100644 index 0000000000..5175e619e5 --- /dev/null +++ b/recipes/xorg-proto/videoproto_2.3.1.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "c3b348c6e2031b72b11ae63fc7f805c2" +SRC_URI[archive.sha256sum] = "3ec76d24931d1e08c6c8d0b89a25e32dc44bc8f87d1dcb3fe201e3c99f89635a" diff --git a/recipes/xorg-proto/xextproto_7.1.2.bb b/recipes/xorg-proto/xextproto_7.1.2.bb new file mode 100644 index 0000000000..4e5cccd71d --- /dev/null +++ b/recipes/xorg-proto/xextproto_7.1.2.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "263ae968b223c23b2986603d84e5c30e" +SRC_URI[archive.sha256sum] = "f6f829e112c8eca7c2f10b2193e8d927b9b7722283d647cfd2aea09758159199" + +BBCLASSEXTEND = "native nativesdk sdk" diff --git a/recipes/xorg-proto/xproto_7.0.18.bb b/recipes/xorg-proto/xproto_7.0.18.bb new file mode 100644 index 0000000000..ebded45646 --- /dev/null +++ b/recipes/xorg-proto/xproto_7.0.18.bb @@ -0,0 +1,8 @@ +require xorg-proto-common.inc +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "6b8a34b274c6fceaffe57c579db826b9" +SRC_URI[archive.sha256sum] = "b8efe0e75ca4ce3a56c9143e360c4f5b20750f4275e8fffbc015ed5e3a17c96a" + +BBCLASSEXTEND = "native nativesdk sdk" diff --git a/recipes/xorg-xserver/xserver-xorg_git.bb b/recipes/xorg-xserver/xserver-xorg_git.bb index 9dd71eda89..46b0e0818a 100644 --- a/recipes/xorg-xserver/xserver-xorg_git.bb +++ b/recipes/xorg-xserver/xserver-xorg_git.bb @@ -10,7 +10,7 @@ PE = "2" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_shr = "1" -SRCREV = "7e0575baf14ec4a89492fd2780f9ab5b9244afbd" +SRCREV = "6dae7f3792611aace1df0cca63bf50c50d93de43" SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git;branch=master \ file://dolt-fix-1.7.0.patch \ file://randr-support-1.7.0.patch \ -- cgit v1.2.3 From 367d28ff1b6628c539bfa5ded36f924ff59f1817 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 12 Aug 2010 10:08:35 +0200 Subject: qt-4.7.0-beta1: move to beta2 Signed-off-by: Martin Jansa --- conf/distro/include/preferred-shr-versions.inc | 2 +- recipes/qt4/qt-4.6.2+4.7.0-beta1.inc | 73 ---------------------- .../0001-Added-Openembedded-crossarch-option.patch | 44 ------------- .../0002-Disable-tools-assistant.patch | 25 -------- .../0003-Disable-examples-designer.patch | 24 ------- ...isable-exaqmples-dbus-remotecontrolledcar.patch | 26 -------- .../0005-Disable-examples-help.patch | 25 -------- .../0006-Disable-demos-browser.patch | 24 ------- .../0007-Disable-demos-qtdemos.patch | 25 -------- .../0008-Disable-examples-declarative.patch | 24 ------- .../0009-Disable-demos-affine.patch | 24 ------- .../qt-4.6.2+4.7.0-beta1/add.xmlpatterns.lib.patch | 22 ------- .../demos.browser.add.mediaservices.lib.patch | 12 ---- recipes/qt4/qt-4.6.3+4.7.0-beta2.inc | 73 ++++++++++++++++++++++ .../0001-Added-Openembedded-crossarch-option.patch | 44 +++++++++++++ .../0002-Disable-tools-assistant.patch | 25 ++++++++ .../0003-Disable-examples-designer.patch | 24 +++++++ ...isable-exaqmples-dbus-remotecontrolledcar.patch | 26 ++++++++ .../0005-Disable-examples-help.patch | 25 ++++++++ .../0006-Disable-demos-browser.patch | 24 +++++++ .../0007-Disable-demos-qtdemos.patch | 25 ++++++++ .../0008-Disable-examples-declarative.patch | 24 +++++++ .../qt-4.6.3+4.7.0-beta2/add.xmlpatterns.lib.patch | 22 +++++++ .../demos.browser.add.mediaservices.lib.patch | 12 ++++ recipes/qt4/qt4-embedded_4.7.0-beta1.bb | 16 ----- recipes/qt4/qt4-embedded_4.7.0-beta2.bb | 16 +++++ .../fix.xlib-test.libs.patch | 9 --- .../fix.xlib-test.libs.patch | 9 +++ recipes/qt4/qt4-tools-native_4.7.0-beta1.bb | 22 ------- recipes/qt4/qt4-tools-native_4.7.0-beta2.bb | 22 +++++++ recipes/qt4/qt4-x11-free_4.7.0-beta1.bb | 17 ----- recipes/qt4/qt4-x11-free_4.7.0-beta2.bb | 17 +++++ 32 files changed, 389 insertions(+), 413 deletions(-) delete mode 100644 recipes/qt4/qt-4.6.2+4.7.0-beta1.inc delete mode 100644 recipes/qt4/qt-4.6.2+4.7.0-beta1/0001-Added-Openembedded-crossarch-option.patch delete mode 100644 recipes/qt4/qt-4.6.2+4.7.0-beta1/0002-Disable-tools-assistant.patch delete mode 100644 recipes/qt4/qt-4.6.2+4.7.0-beta1/0003-Disable-examples-designer.patch delete mode 100644 recipes/qt4/qt-4.6.2+4.7.0-beta1/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch delete mode 100644 recipes/qt4/qt-4.6.2+4.7.0-beta1/0005-Disable-examples-help.patch delete mode 100644 recipes/qt4/qt-4.6.2+4.7.0-beta1/0006-Disable-demos-browser.patch delete mode 100644 recipes/qt4/qt-4.6.2+4.7.0-beta1/0007-Disable-demos-qtdemos.patch delete mode 100644 recipes/qt4/qt-4.6.2+4.7.0-beta1/0008-Disable-examples-declarative.patch delete mode 100644 recipes/qt4/qt-4.6.2+4.7.0-beta1/0009-Disable-demos-affine.patch delete mode 100644 recipes/qt4/qt-4.6.2+4.7.0-beta1/add.xmlpatterns.lib.patch delete mode 100644 recipes/qt4/qt-4.6.2+4.7.0-beta1/demos.browser.add.mediaservices.lib.patch create mode 100644 recipes/qt4/qt-4.6.3+4.7.0-beta2.inc create mode 100644 recipes/qt4/qt-4.6.3+4.7.0-beta2/0001-Added-Openembedded-crossarch-option.patch create mode 100644 recipes/qt4/qt-4.6.3+4.7.0-beta2/0002-Disable-tools-assistant.patch create mode 100644 recipes/qt4/qt-4.6.3+4.7.0-beta2/0003-Disable-examples-designer.patch create mode 100644 recipes/qt4/qt-4.6.3+4.7.0-beta2/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch create mode 100644 recipes/qt4/qt-4.6.3+4.7.0-beta2/0005-Disable-examples-help.patch create mode 100644 recipes/qt4/qt-4.6.3+4.7.0-beta2/0006-Disable-demos-browser.patch create mode 100644 recipes/qt4/qt-4.6.3+4.7.0-beta2/0007-Disable-demos-qtdemos.patch create mode 100644 recipes/qt4/qt-4.6.3+4.7.0-beta2/0008-Disable-examples-declarative.patch create mode 100644 recipes/qt4/qt-4.6.3+4.7.0-beta2/add.xmlpatterns.lib.patch create mode 100644 recipes/qt4/qt-4.6.3+4.7.0-beta2/demos.browser.add.mediaservices.lib.patch delete mode 100644 recipes/qt4/qt4-embedded_4.7.0-beta1.bb create mode 100644 recipes/qt4/qt4-embedded_4.7.0-beta2.bb delete mode 100644 recipes/qt4/qt4-tools-native-4.6.2+4.7.0-beta1/fix.xlib-test.libs.patch create mode 100644 recipes/qt4/qt4-tools-native-4.6.3+4.7.0-beta2/fix.xlib-test.libs.patch delete mode 100644 recipes/qt4/qt4-tools-native_4.7.0-beta1.bb create mode 100644 recipes/qt4/qt4-tools-native_4.7.0-beta2.bb delete mode 100644 recipes/qt4/qt4-x11-free_4.7.0-beta1.bb create mode 100644 recipes/qt4/qt4-x11-free_4.7.0-beta2.bb diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc index 9b9dd097ac..23d320ce03 100644 --- a/conf/distro/include/preferred-shr-versions.inc +++ b/conf/distro/include/preferred-shr-versions.inc @@ -44,7 +44,7 @@ PREFERRED_VERSION_glib-2.0-native = "2.24.1" UDEV_GE_141 = "1" PREFERRED_VERSION_postgresql = "8.4.4" -ANGSTROM_QT_VERSION ?= "4.6.2+4.7.0-beta1" +ANGSTROM_QT_VERSION ?= "4.6.3+4.7.0-beta2" PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}" diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc b/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc deleted file mode 100644 index 114f3ae2ea..0000000000 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc +++ /dev/null @@ -1,73 +0,0 @@ -DEFAULT_PREFERENCE = "-1" -LICENSE = "LGPLv2.1 GPLv3" - -FILESPATHPKG .= ":qt-${PV}" - -SRC_URI = "\ - ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${SRCVER}.tar.gz \ - file://0004-no-qmake.patch \ - file://hack-out-pg_config.patch \ - file://0006-freetype-host-includes.patch \ - file://0001-Added-Openembedded-crossarch-option.patch \ - file://0002-Disable-tools-assistant.patch \ - file://0003-Disable-examples-designer.patch \ - file://0004-Disable-exaqmples-dbus-remotecontrolledcar.patch \ - file://0005-Disable-examples-help.patch \ - file://0007-Disable-demos-qtdemos.patch \ - file://0008-Disable-examples-declarative.patch \ - file://demos.browser.add.mediaservices.lib.patch \ - file://add.xmlpatterns.lib.patch \ - file://g++.conf \ - file://linux.conf \ - " - -S = "${WORKDIR}/qt-everywhere-opensource-src-${SRCVER}" - -QT_LIB_NAMES += "QtDeclarative" -FILES_${QT_BASE_NAME}-tools += "${bindir}/qml" - -do_configure_prepend() { - for pro in $(find ${S} -name "*.pro") ; do - sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro - done - - sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf - sed -i \ - -e /QMAKE_MOC\ /d \ - -e /QMAKE_UIC\ /d \ - -e /QMAKE_UIC3\ /d \ - -e /QMAKE_RCC\ /d \ - ${S}/configure -} - -do_configure_append() { - sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile -} - -QT_GLFLAGS ?= "" -QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}" - -do_compile() { - # Fixup missing wsegl header in some SGX SDKs - if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then - cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/ - fi - - unset CFLAGS CXXFLAGS - install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc - install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc - install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic - install -m 0755 ${STAGING_BINDIR_NATIVE}/lrelease4 ${S}/bin/lrelease - - oe_runmake ${EXTRA_ENV} -} - -do_install_append() { - install -d ${D}${bindir} - for i in rcc uic moc ; do - install -m 0755 ${S}/bin/$i ${D}${bindir}/ - done -} - -SRC_URI[md5sum] = "1a863712da64dd2c1d08380075b74f39" -SRC_URI[sha256sum] = "32237307496b255bb95abdcd1754885947008a52c76f32c6843744d330f2b7b5" diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0001-Added-Openembedded-crossarch-option.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0001-Added-Openembedded-crossarch-option.patch deleted file mode 100644 index 71a04a59d2..0000000000 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0001-Added-Openembedded-crossarch-option.patch +++ /dev/null @@ -1,44 +0,0 @@ -From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20G=C3=BCnther?= -Date: Wed, 12 May 2010 16:52:45 +0200 -Subject: [PATCH 1/9] Added Openembedded "-crossarch" option - ---- - configure | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -diff --git a/configure b/configure -index facd192..9d15136 100755 ---- a/configure -+++ b/configure -@@ -954,7 +954,7 @@ while [ "$#" -gt 0 ]; do - shift - VAL=$1 - ;; -- -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config) -+ -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-crossarch) - VAR=`echo $1 | sed "s,^-\(.*\),\1,"` - shift - VAL="$1" -@@ -1443,6 +1443,9 @@ while [ "$#" -gt 0 ]; do - xplatform) - XPLATFORM="$VAL" - ;; -+ crossarch) -+ CROSSARCH="$VAL" -+ ;; - debug-and-release) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_DEBUG_RELEASE="$VAL" -@@ -2918,6 +2921,8 @@ elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then - CFG_ARCH=$CFG_HOST_ARCH - fi - -+CFG_ARCH="$CROSSARCH" -+ - if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " '$CFG_ARCH' is supported" --- -1.7.0.4 - diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0002-Disable-tools-assistant.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0002-Disable-tools-assistant.patch deleted file mode 100644 index 1a5da6793b..0000000000 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0002-Disable-tools-assistant.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f107d9957f8382dfc2c7b28248eee2d628342a93 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20G=C3=BCnther?= -Date: Wed, 12 May 2010 19:41:13 +0200 -Subject: [PATCH 2/9] Disable tools/assistant - ---- - tools/tools.pro | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/tools/tools.pro b/tools/tools.pro -index 7598962..1d35a3f 100644 ---- a/tools/tools.pro -+++ b/tools/tools.pro -@@ -9,7 +9,7 @@ TEMPLATE = subdirs - } else:wince* { - SUBDIRS = qtestlib designer - } else { -- SUBDIRS = assistant \ -+ SUBDIRS = \ - pixeltool \ - porting \ - qtestlib \ --- -1.7.0.4 - diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0003-Disable-examples-designer.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0003-Disable-examples-designer.patch deleted file mode 100644 index 51fa4a6d6e..0000000000 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0003-Disable-examples-designer.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 82aaf21a465d0d693916c4b82932371a090482a7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20G=C3=BCnther?= -Date: Wed, 12 May 2010 20:33:11 +0200 -Subject: [PATCH 3/9] Disable examples/designer - ---- - examples/examples.pro | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/examples/examples.pro b/examples/examples.pro -index 43cad55..785c35c 100644 ---- a/examples/examples.pro -+++ b/examples/examples.pro -@@ -53,7 +53,6 @@ contains(QT_CONFIG, script): SUBDIRS += script - contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon - embedded:SUBDIRS += qws - !wince*:!symbian: { -- !contains(QT_EDITION, Console):!contains(QT_CONFIG, no-gui):contains(QT_BUILD_PARTS, tools):SUBDIRS += designer - contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib help - } else { - contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib --- -1.7.0.4 - diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch deleted file mode 100644 index cef56ef29b..0000000000 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 753cc5766d51c5b7d599fada569d6b262f2a3b1a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20G=C3=BCnther?= -Date: Wed, 12 May 2010 20:49:30 +0200 -Subject: [PATCH 4/9] Disable exaqmples/dbus/remotecontrolledcar - ---- - examples/dbus/dbus.pro | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/examples/dbus/dbus.pro b/examples/dbus/dbus.pro -index e599334..daa89b0 100644 ---- a/examples/dbus/dbus.pro -+++ b/examples/dbus/dbus.pro -@@ -4,8 +4,7 @@ SUBDIRS = listnames \ - complexpingpong - - !contains(QT_CONFIG, no-gui) { -- SUBDIRS += dbus-chat \ -- remotecontrolledcar -+ SUBDIRS += dbus-chat - } - - # install --- -1.7.0.4 - diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0005-Disable-examples-help.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0005-Disable-examples-help.patch deleted file mode 100644 index 026f2b08e9..0000000000 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0005-Disable-examples-help.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c7f749b564b473f0160a201c769153cfcaf3bc0b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20G=C3=BCnther?= -Date: Thu, 13 May 2010 14:27:22 +0200 -Subject: [PATCH 5/9] Disable examples/help - ---- - examples/examples.pro | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/examples/examples.pro b/examples/examples.pro -index 785c35c..e37f580 100644 ---- a/examples/examples.pro -+++ b/examples/examples.pro -@@ -53,7 +53,7 @@ contains(QT_CONFIG, script): SUBDIRS += script - contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon - embedded:SUBDIRS += qws - !wince*:!symbian: { -- contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib help -+ contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib - } else { - contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib - } --- -1.7.0.4 - diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0006-Disable-demos-browser.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0006-Disable-demos-browser.patch deleted file mode 100644 index e863f12749..0000000000 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0006-Disable-demos-browser.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 11657d8c4b964b7c16b1d216522a92d6280007e1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20G=C3=BCnther?= -Date: Thu, 13 May 2010 15:53:29 +0200 -Subject: [PATCH 6/9] Disable /demos/browser - ---- - demos/demos.pro | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/demos/demos.pro b/demos/demos.pro -index 5e8a4ea..8008ccb 100644 ---- a/demos/demos.pro -+++ b/demos/demos.pro -@@ -56,7 +56,6 @@ wince*:SUBDIRS += demos_sqlbrowser - } - } - contains(QT_CONFIG, phonon):!static:SUBDIRS += demos_mediaplayer --contains(QT_CONFIG, webkit):contains(QT_CONFIG, svg):!symbian:SUBDIRS += demos_browser - contains(QT_CONFIG, multimedia):SUBDIRS += demos_multimedia - contains(QT_CONFIG, declarative):SUBDIRS += demos_declarative - --- -1.7.0.4 - diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0007-Disable-demos-qtdemos.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0007-Disable-demos-qtdemos.patch deleted file mode 100644 index 6bef4c2dba..0000000000 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0007-Disable-demos-qtdemos.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6a4b829736399fef4a6f1d3223cf0d813caf7062 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20G=C3=BCnther?= -Date: Thu, 13 May 2010 16:00:06 +0200 -Subject: [PATCH 7/9] Disable demos/qtdemos - ---- - demos/demos.pro | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/demos/demos.pro b/demos/demos.pro -index 8008ccb..a0691bc 100644 ---- a/demos/demos.pro -+++ b/demos/demos.pro -@@ -51,7 +51,7 @@ wince*|symbian|embedded|x11: SUBDIRS += demos_embedded - - !cross_compile:{ - contains(QT_BUILD_PARTS, tools):{ --!wince*:SUBDIRS += demos_sqlbrowser demos_qtdemo -+!wince*:SUBDIRS += demos_sqlbrowser - wince*:SUBDIRS += demos_sqlbrowser - } - } --- -1.7.0.4 - diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0008-Disable-examples-declarative.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0008-Disable-examples-declarative.patch deleted file mode 100644 index 06e15623f7..0000000000 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0008-Disable-examples-declarative.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 1b855a946a1d060c52ddb04f308fb25f1d391b6a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20G=C3=BCnther?= -Date: Thu, 13 May 2010 19:49:45 +0200 -Subject: [PATCH 8/9] Disable examples/declarative - ---- - examples/examples.pro | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/examples/examples.pro b/examples/examples.pro -index e37f580..8681a41 100644 ---- a/examples/examples.pro -+++ b/examples/examples.pro -@@ -60,7 +60,6 @@ embedded:SUBDIRS += qws - contains(QT_CONFIG, opengl): SUBDIRS += opengl - contains(QT_CONFIG, openvg): SUBDIRS += openvg - contains(QT_CONFIG, dbus): SUBDIRS += dbus --contains(QT_CONFIG, declarative): SUBDIRS += declarative - win32: SUBDIRS += activeqt - contains(QT_CONFIG, xmlpatterns):!contains(QT_CONFIG, no-gui): SUBDIRS += xmlpatterns - contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows --- -1.7.0.4 - diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0009-Disable-demos-affine.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0009-Disable-demos-affine.patch deleted file mode 100644 index c4efddaf7b..0000000000 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0009-Disable-demos-affine.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ab87c21fab1b2bb3e593a27e4a08ba66e689f724 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20G=C3=BCnther?= -Date: Thu, 13 May 2010 20:46:18 +0200 -Subject: [PATCH 9/9] Disable demos/affine - ---- - demos/demos.pro | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/demos/demos.pro b/demos/demos.pro -index a0691bc..082a77d 100644 ---- a/demos/demos.pro -+++ b/demos/demos.pro -@@ -6,7 +6,6 @@ SUBDIRS = \ - demos_deform \ - demos_gradients \ - demos_pathstroke \ -- demos_affine \ - demos_composition \ - demos_books \ - demos_interview \ --- -1.7.0.4 - diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/add.xmlpatterns.lib.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/add.xmlpatterns.lib.patch deleted file mode 100644 index 57ba4f169e..0000000000 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/add.xmlpatterns.lib.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -uNr qt-everywhere-opensource-src-4.7.0-beta1.orig//demos/browser/browser.pro qt-everywhere-opensource-src-4.7.0-beta1/demos/browser/browser.pro ---- qt-everywhere-opensource-src-4.7.0-beta1.orig//demos/browser/browser.pro 2010-06-26 13:15:06.000000000 +0200 -+++ qt-everywhere-opensource-src-4.7.0-beta1/demos/browser/browser.pro 2010-06-26 13:18:17.000000000 +0200 -@@ -1,6 +1,6 @@ - TEMPLATE = app - TARGET = browser --QT += webkit network mediaservices -+QT += webkit network mediaservices xmlpatterns - - CONFIG += qt warn_on - contains(QT_BUILD_PARTS, tools):!embedded: CONFIG += uitools -diff -uNr qt-everywhere-opensource-src-4.7.0-beta1.orig//examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro qt-everywhere-opensource-src-4.7.0-beta1/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro ---- qt-everywhere-opensource-src-4.7.0-beta1.orig//examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro 2010-05-04 02:43:18.000000000 +0200 -+++ qt-everywhere-opensource-src-4.7.0-beta1/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro 2010-06-26 13:17:42.000000000 +0200 -@@ -1,6 +1,6 @@ - - FORMS += forms/mainwindow.ui --QT += xmlpatterns webkit -+QT += xmlpatterns webkit mediaservices - SOURCES += qobjectxmlmodel.cpp main.cpp mainwindow.cpp ../shared/xmlsyntaxhighlighter.cpp - HEADERS += qobjectxmlmodel.h mainwindow.h ../shared/xmlsyntaxhighlighter.h - RESOURCES = queries.qrc diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/demos.browser.add.mediaservices.lib.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/demos.browser.add.mediaservices.lib.patch deleted file mode 100644 index 27c42dfcec..0000000000 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/demos.browser.add.mediaservices.lib.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: qt-everywhere-opensource-src-4.7.0-beta1/demos/browser/browser.pro -=================================================================== ---- qt-everywhere-opensource-src-4.7.0-beta1.orig/demos/browser/browser.pro -+++ qt-everywhere-opensource-src-4.7.0-beta1/demos/browser/browser.pro -@@ -1,6 +1,6 @@ - TEMPLATE = app - TARGET = browser --QT += webkit network -+QT += webkit network mediaservices - - CONFIG += qt warn_on - contains(QT_BUILD_PARTS, tools):!embedded: CONFIG += uitools diff --git a/recipes/qt4/qt-4.6.3+4.7.0-beta2.inc b/recipes/qt4/qt-4.6.3+4.7.0-beta2.inc new file mode 100644 index 0000000000..9c9554c198 --- /dev/null +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2.inc @@ -0,0 +1,73 @@ +DEFAULT_PREFERENCE = "-1" +LICENSE = "LGPLv2.1 GPLv3" + +FILESPATHPKG .= ":qt-${PV}" + +SRC_URI = "\ + ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${SRCVER}.tar.gz \ + file://0004-no-qmake.patch \ + file://hack-out-pg_config.patch \ + file://0006-freetype-host-includes.patch \ + file://0001-Added-Openembedded-crossarch-option.patch \ + file://0002-Disable-tools-assistant.patch \ + file://0003-Disable-examples-designer.patch \ + file://0004-Disable-exaqmples-dbus-remotecontrolledcar.patch \ + file://0005-Disable-examples-help.patch \ + file://0007-Disable-demos-qtdemos.patch \ + file://0008-Disable-examples-declarative.patch \ + file://demos.browser.add.mediaservices.lib.patch \ + file://add.xmlpatterns.lib.patch \ + file://g++.conf \ + file://linux.conf \ + " + +S = "${WORKDIR}/qt-everywhere-opensource-src-${SRCVER}" + +QT_LIB_NAMES += "QtDeclarative" +FILES_${QT_BASE_NAME}-tools += "${bindir}/qml" + +do_configure_prepend() { + for pro in $(find ${S} -name "*.pro") ; do + sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro + done + + sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf + sed -i \ + -e /QMAKE_MOC\ /d \ + -e /QMAKE_UIC\ /d \ + -e /QMAKE_UIC3\ /d \ + -e /QMAKE_RCC\ /d \ + ${S}/configure +} + +do_configure_append() { + sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile +} + +QT_GLFLAGS ?= "" +QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}" + +do_compile() { + # Fixup missing wsegl header in some SGX SDKs + if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then + cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/ + fi + + unset CFLAGS CXXFLAGS + install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc + install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc + install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic + install -m 0755 ${STAGING_BINDIR_NATIVE}/lrelease4 ${S}/bin/lrelease + + oe_runmake ${EXTRA_ENV} +} + +do_install_append() { + install -d ${D}${bindir} + for i in rcc uic moc ; do + install -m 0755 ${S}/bin/$i ${D}${bindir}/ + done +} + +SRC_URI[md5sum] = "1449443c2d33ab9fefbd37b7104d0cdf" +SRC_URI[sha256sum] = "e0196ee11f683a4ec2e3f85e52ab2f2455886a3bb3b711489176f97ecb9aacbf" diff --git a/recipes/qt4/qt-4.6.3+4.7.0-beta2/0001-Added-Openembedded-crossarch-option.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0001-Added-Openembedded-crossarch-option.patch new file mode 100644 index 0000000000..71a04a59d2 --- /dev/null +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0001-Added-Openembedded-crossarch-option.patch @@ -0,0 +1,44 @@ +From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Matthias=20G=C3=BCnther?= +Date: Wed, 12 May 2010 16:52:45 +0200 +Subject: [PATCH 1/9] Added Openembedded "-crossarch" option + +--- + configure | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index facd192..9d15136 100755 +--- a/configure ++++ b/configure +@@ -954,7 +954,7 @@ while [ "$#" -gt 0 ]; do + shift + VAL=$1 + ;; +- -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config) ++ -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-crossarch) + VAR=`echo $1 | sed "s,^-\(.*\),\1,"` + shift + VAL="$1" +@@ -1443,6 +1443,9 @@ while [ "$#" -gt 0 ]; do + xplatform) + XPLATFORM="$VAL" + ;; ++ crossarch) ++ CROSSARCH="$VAL" ++ ;; + debug-and-release) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_DEBUG_RELEASE="$VAL" +@@ -2918,6 +2921,8 @@ elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then + CFG_ARCH=$CFG_HOST_ARCH + fi + ++CFG_ARCH="$CROSSARCH" ++ + if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then + if [ "$OPT_VERBOSE" = "yes" ]; then + echo " '$CFG_ARCH' is supported" +-- +1.7.0.4 + diff --git a/recipes/qt4/qt-4.6.3+4.7.0-beta2/0002-Disable-tools-assistant.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0002-Disable-tools-assistant.patch new file mode 100644 index 0000000000..1a5da6793b --- /dev/null +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0002-Disable-tools-assistant.patch @@ -0,0 +1,25 @@ +From f107d9957f8382dfc2c7b28248eee2d628342a93 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Matthias=20G=C3=BCnther?= +Date: Wed, 12 May 2010 19:41:13 +0200 +Subject: [PATCH 2/9] Disable tools/assistant + +--- + tools/tools.pro | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/tools/tools.pro b/tools/tools.pro +index 7598962..1d35a3f 100644 +--- a/tools/tools.pro ++++ b/tools/tools.pro +@@ -9,7 +9,7 @@ TEMPLATE = subdirs + } else:wince* { + SUBDIRS = qtestlib designer + } else { +- SUBDIRS = assistant \ ++ SUBDIRS = \ + pixeltool \ + porting \ + qtestlib \ +-- +1.7.0.4 + diff --git a/recipes/qt4/qt-4.6.3+4.7.0-beta2/0003-Disable-examples-designer.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0003-Disable-examples-designer.patch new file mode 100644 index 0000000000..51fa4a6d6e --- /dev/null +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0003-Disable-examples-designer.patch @@ -0,0 +1,24 @@ +From 82aaf21a465d0d693916c4b82932371a090482a7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Matthias=20G=C3=BCnther?= +Date: Wed, 12 May 2010 20:33:11 +0200 +Subject: [PATCH 3/9] Disable examples/designer + +--- + examples/examples.pro | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/examples/examples.pro b/examples/examples.pro +index 43cad55..785c35c 100644 +--- a/examples/examples.pro ++++ b/examples/examples.pro +@@ -53,7 +53,6 @@ contains(QT_CONFIG, script): SUBDIRS += script + contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon + embedded:SUBDIRS += qws + !wince*:!symbian: { +- !contains(QT_EDITION, Console):!contains(QT_CONFIG, no-gui):contains(QT_BUILD_PARTS, tools):SUBDIRS += designer + contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib help + } else { + contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib +-- +1.7.0.4 + diff --git a/recipes/qt4/qt-4.6.3+4.7.0-beta2/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch new file mode 100644 index 0000000000..cef56ef29b --- /dev/null +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch @@ -0,0 +1,26 @@ +From 753cc5766d51c5b7d599fada569d6b262f2a3b1a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Matthias=20G=C3=BCnther?= +Date: Wed, 12 May 2010 20:49:30 +0200 +Subject: [PATCH 4/9] Disable exaqmples/dbus/remotecontrolledcar + +--- + examples/dbus/dbus.pro | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/examples/dbus/dbus.pro b/examples/dbus/dbus.pro +index e599334..daa89b0 100644 +--- a/examples/dbus/dbus.pro ++++ b/examples/dbus/dbus.pro +@@ -4,8 +4,7 @@ SUBDIRS = listnames \ + complexpingpong + + !contains(QT_CONFIG, no-gui) { +- SUBDIRS += dbus-chat \ +- remotecontrolledcar ++ SUBDIRS += dbus-chat + } + + # install +-- +1.7.0.4 + diff --git a/recipes/qt4/qt-4.6.3+4.7.0-beta2/0005-Disable-examples-help.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0005-Disable-examples-help.patch new file mode 100644 index 0000000000..026f2b08e9 --- /dev/null +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0005-Disable-examples-help.patch @@ -0,0 +1,25 @@ +From c7f749b564b473f0160a201c769153cfcaf3bc0b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Matthias=20G=C3=BCnther?= +Date: Thu, 13 May 2010 14:27:22 +0200 +Subject: [PATCH 5/9] Disable examples/help + +--- + examples/examples.pro | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/examples/examples.pro b/examples/examples.pro +index 785c35c..e37f580 100644 +--- a/examples/examples.pro ++++ b/examples/examples.pro +@@ -53,7 +53,7 @@ contains(QT_CONFIG, script): SUBDIRS += script + contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon + embedded:SUBDIRS += qws + !wince*:!symbian: { +- contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib help ++ contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib + } else { + contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib + } +-- +1.7.0.4 + diff --git a/recipes/qt4/qt-4.6.3+4.7.0-beta2/0006-Disable-demos-browser.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0006-Disable-demos-browser.patch new file mode 100644 index 0000000000..e863f12749 --- /dev/null +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0006-Disable-demos-browser.patch @@ -0,0 +1,24 @@ +From 11657d8c4b964b7c16b1d216522a92d6280007e1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Matthias=20G=C3=BCnther?= +Date: Thu, 13 May 2010 15:53:29 +0200 +Subject: [PATCH 6/9] Disable /demos/browser + +--- + demos/demos.pro | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/demos/demos.pro b/demos/demos.pro +index 5e8a4ea..8008ccb 100644 +--- a/demos/demos.pro ++++ b/demos/demos.pro +@@ -56,7 +56,6 @@ wince*:SUBDIRS += demos_sqlbrowser + } + } + contains(QT_CONFIG, phonon):!static:SUBDIRS += demos_mediaplayer +-contains(QT_CONFIG, webkit):contains(QT_CONFIG, svg):!symbian:SUBDIRS += demos_browser + contains(QT_CONFIG, multimedia):SUBDIRS += demos_multimedia + contains(QT_CONFIG, declarative):SUBDIRS += demos_declarative + +-- +1.7.0.4 + diff --git a/recipes/qt4/qt-4.6.3+4.7.0-beta2/0007-Disable-demos-qtdemos.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0007-Disable-demos-qtdemos.patch new file mode 100644 index 0000000000..6bef4c2dba --- /dev/null +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0007-Disable-demos-qtdemos.patch @@ -0,0 +1,25 @@ +From 6a4b829736399fef4a6f1d3223cf0d813caf7062 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Matthias=20G=C3=BCnther?= +Date: Thu, 13 May 2010 16:00:06 +0200 +Subject: [PATCH 7/9] Disable demos/qtdemos + +--- + demos/demos.pro | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/demos/demos.pro b/demos/demos.pro +index 8008ccb..a0691bc 100644 +--- a/demos/demos.pro ++++ b/demos/demos.pro +@@ -51,7 +51,7 @@ wince*|symbian|embedded|x11: SUBDIRS += demos_embedded + + !cross_compile:{ + contains(QT_BUILD_PARTS, tools):{ +-!wince*:SUBDIRS += demos_sqlbrowser demos_qtdemo ++!wince*:SUBDIRS += demos_sqlbrowser + wince*:SUBDIRS += demos_sqlbrowser + } + } +-- +1.7.0.4 + diff --git a/recipes/qt4/qt-4.6.3+4.7.0-beta2/0008-Disable-examples-declarative.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0008-Disable-examples-declarative.patch new file mode 100644 index 0000000000..06e15623f7 --- /dev/null +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0008-Disable-examples-declarative.patch @@ -0,0 +1,24 @@ +From 1b855a946a1d060c52ddb04f308fb25f1d391b6a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Matthias=20G=C3=BCnther?= +Date: Thu, 13 May 2010 19:49:45 +0200 +Subject: [PATCH 8/9] Disable examples/declarative + +--- + examples/examples.pro | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/examples/examples.pro b/examples/examples.pro +index e37f580..8681a41 100644 +--- a/examples/examples.pro ++++ b/examples/examples.pro +@@ -60,7 +60,6 @@ embedded:SUBDIRS += qws + contains(QT_CONFIG, opengl): SUBDIRS += opengl + contains(QT_CONFIG, openvg): SUBDIRS += openvg + contains(QT_CONFIG, dbus): SUBDIRS += dbus +-contains(QT_CONFIG, declarative): SUBDIRS += declarative + win32: SUBDIRS += activeqt + contains(QT_CONFIG, xmlpatterns):!contains(QT_CONFIG, no-gui): SUBDIRS += xmlpatterns + contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows +-- +1.7.0.4 + diff --git a/recipes/qt4/qt-4.6.3+4.7.0-beta2/add.xmlpatterns.lib.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/add.xmlpatterns.lib.patch new file mode 100644 index 0000000000..1f73f8950f --- /dev/null +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2/add.xmlpatterns.lib.patch @@ -0,0 +1,22 @@ +diff -uNr qt-everywhere-opensource-src-4.7.0-beta1.orig//demos/browser/browser.pro qt-everywhere-opensource-src-4.7.0-beta1/demos/browser/browser.pro +--- qt-everywhere-opensource-src-4.7.0-beta1.orig//demos/browser/browser.pro 2010-06-26 13:15:06.000000000 +0200 ++++ qt-everywhere-opensource-src-4.7.0-beta1/demos/browser/browser.pro 2010-06-26 13:18:17.000000000 +0200 +@@ -1,6 +1,6 @@ + TEMPLATE = app + TARGET = browser +-QT += webkit network mediaservices ++QT += webkit network mediaservices xmlpatterns phonon + + CONFIG += qt warn_on + contains(QT_BUILD_PARTS, tools):!embedded: CONFIG += uitools +diff -uNr qt-everywhere-opensource-src-4.7.0-beta1.orig//examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro qt-everywhere-opensource-src-4.7.0-beta1/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro +--- qt-everywhere-opensource-src-4.7.0-beta1.orig//examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro 2010-05-04 02:43:18.000000000 +0200 ++++ qt-everywhere-opensource-src-4.7.0-beta1/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro 2010-06-26 13:17:42.000000000 +0200 +@@ -1,6 +1,6 @@ + + FORMS += forms/mainwindow.ui +-QT += xmlpatterns webkit ++QT += xmlpatterns webkit mediaservices phonon + SOURCES += qobjectxmlmodel.cpp main.cpp mainwindow.cpp ../shared/xmlsyntaxhighlighter.cpp + HEADERS += qobjectxmlmodel.h mainwindow.h ../shared/xmlsyntaxhighlighter.h + RESOURCES = queries.qrc diff --git a/recipes/qt4/qt-4.6.3+4.7.0-beta2/demos.browser.add.mediaservices.lib.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/demos.browser.add.mediaservices.lib.patch new file mode 100644 index 0000000000..27c42dfcec --- /dev/null +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2/demos.browser.add.mediaservices.lib.patch @@ -0,0 +1,12 @@ +Index: qt-everywhere-opensource-src-4.7.0-beta1/demos/browser/browser.pro +=================================================================== +--- qt-everywhere-opensource-src-4.7.0-beta1.orig/demos/browser/browser.pro ++++ qt-everywhere-opensource-src-4.7.0-beta1/demos/browser/browser.pro +@@ -1,6 +1,6 @@ + TEMPLATE = app + TARGET = browser +-QT += webkit network ++QT += webkit network mediaservices + + CONFIG += qt warn_on + contains(QT_BUILD_PARTS, tools):!embedded: CONFIG += uitools diff --git a/recipes/qt4/qt4-embedded_4.7.0-beta1.bb b/recipes/qt4/qt4-embedded_4.7.0-beta1.bb deleted file mode 100644 index 1dbb4aa4bf..0000000000 --- a/recipes/qt4/qt4-embedded_4.7.0-beta1.bb +++ /dev/null @@ -1,16 +0,0 @@ -DEFAULT_PREFERENCE = "-1" - -require qt4-embedded.inc - -SRCVER = "4.7.0-beta1" -PV = "4.6.2+${SRCVER}" -PR = "${INC_PR}.0" - -QT_CONFIG_FLAGS_append_armv6 = " -no-neon " - -require qt-${PV}.inc - -QT_CONFIG_FLAGS += " \ - -exceptions \ -" - diff --git a/recipes/qt4/qt4-embedded_4.7.0-beta2.bb b/recipes/qt4/qt4-embedded_4.7.0-beta2.bb new file mode 100644 index 0000000000..481fabfccb --- /dev/null +++ b/recipes/qt4/qt4-embedded_4.7.0-beta2.bb @@ -0,0 +1,16 @@ +DEFAULT_PREFERENCE = "-1" + +require qt4-embedded.inc + +SRCVER = "4.7.0-beta2" +PV = "4.6.3+${SRCVER}" +PR = "${INC_PR}.0" + +QT_CONFIG_FLAGS_append_armv6 = " -no-neon " + +require qt-${PV}.inc + +QT_CONFIG_FLAGS += " \ + -exceptions \ +" + diff --git a/recipes/qt4/qt4-tools-native-4.6.2+4.7.0-beta1/fix.xlib-test.libs.patch b/recipes/qt4/qt4-tools-native-4.6.2+4.7.0-beta1/fix.xlib-test.libs.patch deleted file mode 100644 index d7613033df..0000000000 --- a/recipes/qt4/qt4-tools-native-4.6.2+4.7.0-beta1/fix.xlib-test.libs.patch +++ /dev/null @@ -1,9 +0,0 @@ -Index: qt-everywhere-opensource-src-4.7.0-beta1/config.tests/x11/xlib/xlib.pro -=================================================================== ---- qt-everywhere-opensource-src-4.7.0-beta1.orig/config.tests/x11/xlib/xlib.pro -+++ qt-everywhere-opensource-src-4.7.0-beta1/config.tests/x11/xlib/xlib.pro -@@ -1,3 +1,4 @@ - CONFIG += x11 - CONFIG -= qt - SOURCES = xlib.cpp -+LIBS += -lXau -lXdmcp diff --git a/recipes/qt4/qt4-tools-native-4.6.3+4.7.0-beta2/fix.xlib-test.libs.patch b/recipes/qt4/qt4-tools-native-4.6.3+4.7.0-beta2/fix.xlib-test.libs.patch new file mode 100644 index 0000000000..d7613033df --- /dev/null +++ b/recipes/qt4/qt4-tools-native-4.6.3+4.7.0-beta2/fix.xlib-test.libs.patch @@ -0,0 +1,9 @@ +Index: qt-everywhere-opensource-src-4.7.0-beta1/config.tests/x11/xlib/xlib.pro +=================================================================== +--- qt-everywhere-opensource-src-4.7.0-beta1.orig/config.tests/x11/xlib/xlib.pro ++++ qt-everywhere-opensource-src-4.7.0-beta1/config.tests/x11/xlib/xlib.pro +@@ -1,3 +1,4 @@ + CONFIG += x11 + CONFIG -= qt + SOURCES = xlib.cpp ++LIBS += -lXau -lXdmcp diff --git a/recipes/qt4/qt4-tools-native_4.7.0-beta1.bb b/recipes/qt4/qt4-tools-native_4.7.0-beta1.bb deleted file mode 100644 index 62b7863e58..0000000000 --- a/recipes/qt4/qt4-tools-native_4.7.0-beta1.bb +++ /dev/null @@ -1,22 +0,0 @@ -DEFAULT_PREFERENCE = "-1" - -require qt4-tools-native.inc -LICENSE = "LGPLv2.1 GPLv3" - -SRCVER = "4.7.0-beta1" -PV = "4.6.2+${SRCVER}" -PR = "${INC_PR}.0" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${SRCVER}.tar.gz \ - file://fix.xlib-test.libs.patch \ - file://qt-config.patch \ - file://g++.conf \ - file://linux.conf" -S = "${WORKDIR}/qt-everywhere-opensource-src-${SRCVER}" - -EXTRA_OECONF += " -no-fast -silent -no-rpath" - -TOBUILD := "src/tools/bootstrap ${TOBUILD}" - -SRC_URI[md5sum] = "1a863712da64dd2c1d08380075b74f39" -SRC_URI[sha256sum] = "32237307496b255bb95abdcd1754885947008a52c76f32c6843744d330f2b7b5" diff --git a/recipes/qt4/qt4-tools-native_4.7.0-beta2.bb b/recipes/qt4/qt4-tools-native_4.7.0-beta2.bb new file mode 100644 index 0000000000..0ebb65f34f --- /dev/null +++ b/recipes/qt4/qt4-tools-native_4.7.0-beta2.bb @@ -0,0 +1,22 @@ +DEFAULT_PREFERENCE = "-1" + +require qt4-tools-native.inc +LICENSE = "LGPLv2.1 GPLv3" + +SRCVER = "4.7.0-beta2" +PV = "4.6.3+${SRCVER}" +PR = "${INC_PR}.0" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${SRCVER}.tar.gz \ + file://fix.xlib-test.libs.patch \ + file://qt-config.patch \ + file://g++.conf \ + file://linux.conf" +S = "${WORKDIR}/qt-everywhere-opensource-src-${SRCVER}" + +EXTRA_OECONF += " -no-fast -silent -no-rpath" + +TOBUILD := "src/tools/bootstrap ${TOBUILD}" + +SRC_URI[md5sum] = "1449443c2d33ab9fefbd37b7104d0cdf" +SRC_URI[sha256sum] = "e0196ee11f683a4ec2e3f85e52ab2f2455886a3bb3b711489176f97ecb9aacbf" diff --git a/recipes/qt4/qt4-x11-free_4.7.0-beta1.bb b/recipes/qt4/qt4-x11-free_4.7.0-beta1.bb deleted file mode 100644 index c489a48d59..0000000000 --- a/recipes/qt4/qt4-x11-free_4.7.0-beta1.bb +++ /dev/null @@ -1,17 +0,0 @@ -DEFAULT_PREFERENCE = "-1" - -require qt4-x11-free.inc - -SRCVER = "4.7.0-beta1" -PV = "4.6.2+${SRCVER}" -PR = "${INC_PR}.1" - -QT_CONFIG_FLAGS_append_armv6 = " -no-neon " - -require qt-${PV}.inc - -QT_CONFIG_FLAGS += " \ - -no-embedded \ - -xrandr \ - -x11" - diff --git a/recipes/qt4/qt4-x11-free_4.7.0-beta2.bb b/recipes/qt4/qt4-x11-free_4.7.0-beta2.bb new file mode 100644 index 0000000000..f38688cccb --- /dev/null +++ b/recipes/qt4/qt4-x11-free_4.7.0-beta2.bb @@ -0,0 +1,17 @@ +DEFAULT_PREFERENCE = "-1" + +require qt4-x11-free.inc + +SRCVER = "4.7.0-beta2" +PV = "4.6.3+${SRCVER}" +PR = "${INC_PR}.0" + +QT_CONFIG_FLAGS_append_armv6 = " -no-neon " + +require qt-${PV}.inc + +QT_CONFIG_FLAGS += " \ + -no-embedded \ + -xrandr \ + -x11" + -- cgit v1.2.3 From 686b2384373eed723aab8851c64cfa46cda98967 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 12 Aug 2010 09:07:25 +0200 Subject: navit: bump SRCREV a bit Signed-off-by: Martin Jansa --- recipes/navit/files/navit.xml | 6 ++++++ recipes/navit/navit-icons_svn.bb | 2 +- recipes/navit/navit.inc | 6 +++--- recipes/navit/navit_svn.bb | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/recipes/navit/files/navit.xml b/recipes/navit/files/navit.xml index 79ee4618d4..58c8c226f2 100644 --- a/recipes/navit/files/navit.xml +++ b/recipes/navit/files/navit.xml @@ -8,6 +8,12 @@ + diff --git a/recipes/navit/navit-icons_svn.bb b/recipes/navit/navit-icons_svn.bb index a24c80590b..34c610982a 100644 --- a/recipes/navit/navit-icons_svn.bb +++ b/recipes/navit/navit-icons_svn.bb @@ -18,7 +18,7 @@ inherit autotools FILES_${PN} = " /usr/share/navit/xpm/" -SRCREV = "3357" +SRCREV = "3409" #use different URL than navit_svn does, to prevent upgrade/downgrade cycle in downloads dir SRC_URI = "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk/navit/navit;module=xpm;proto=https \ diff --git a/recipes/navit/navit.inc b/recipes/navit/navit.inc index 6f3e63e8c9..1ee130f2b1 100644 --- a/recipes/navit/navit.inc +++ b/recipes/navit/navit.inc @@ -1,10 +1,10 @@ DESCRIPTION = "Navit is a car navigation system with routing engine." LICENSE = "GPL" SECTION = "x11/applications" -DEPENDS = "glib-2.0 gtk+ qt4-x11-free" -DEPENDS_shr += " gd gypsy librsvg-native" +DEPENDS = "glib-2.0 gtk+ qt4-x11-free gd gypsy librsvg-native" RDEPENDS_${PN} = " navit-icons ${PN}-config " -RDEPENDS_append_shr = " fsoraw" +RDEPENDS_${PN}_append_shr = " fsoraw" +RDEPENDS_${PN}-gui-qml = "qt4-plugin-imageformat-svg" RRECOMMENDS_${PN} = "gpsd ${PN}-dbus ${PN}-speech-cmdline ${PN}-gui-internal ${PN}-graphics-gtk" RSUGGESTS_${PN} = "flite espeak ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-qt ${PN}-maptool" diff --git a/recipes/navit/navit_svn.bb b/recipes/navit/navit_svn.bb index abcbaf7084..6d090356e9 100644 --- a/recipes/navit/navit_svn.bb +++ b/recipes/navit/navit_svn.bb @@ -1,6 +1,6 @@ require navit.inc -SRCREV = "3358" +SRCREV = "3525" PV = "0.1.99+svnr${SRCPV}" PR = "${INC_PR}.9" -- cgit v1.2.3 From 1e3f1f12252958602934244bc9bbc6aada711165 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Thu, 12 Aug 2010 18:05:44 +0200 Subject: mythtv: upgraded to SRCREV 25609 This includes the 0.23.1 patches Signed-off-by: Frans Meulenbroeks --- recipes/mythtv/mythplugins_0.23+fixes.bb | 2 +- recipes/mythtv/myththemes_0.23+fixes.bb | 2 +- recipes/mythtv/mythtv_0.23+fixes.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/mythtv/mythplugins_0.23+fixes.bb b/recipes/mythtv/mythplugins_0.23+fixes.bb index 2ddf334470..202ead9016 100644 --- a/recipes/mythtv/mythplugins_0.23+fixes.bb +++ b/recipes/mythtv/mythplugins_0.23+fixes.bb @@ -14,7 +14,7 @@ RDEPENDS_mythweb_lighttpd = "lighttpd lighttpd-module-cgi lighttpd-module-fastcg PR = "svnr${SRCPV}+r0" PV = "0.23" -SRCREV = "25073" +SRCREV = "25609" SRC_URI = "svn://svn.mythtv.org/svn/branches/release-0-23-fixes;module=mythplugins;proto=http \ file://sysroot.patch \ file://mythplugins_wo_qtopengl.diff \ diff --git a/recipes/mythtv/myththemes_0.23+fixes.bb b/recipes/mythtv/myththemes_0.23+fixes.bb index e541b06c57..6469b4613a 100644 --- a/recipes/mythtv/myththemes_0.23+fixes.bb +++ b/recipes/mythtv/myththemes_0.23+fixes.bb @@ -4,7 +4,7 @@ inherit qmake2 PR = "svnr${SRCPV}+r0" PV = "0.23" -SRCREV = "25073" +SRCREV = "25609" SRC_URI = \ "svn://svn.mythtv.org/svn/branches/release-0-23-fixes;module=myththemes;proto=http" diff --git a/recipes/mythtv/mythtv_0.23+fixes.bb b/recipes/mythtv/mythtv_0.23+fixes.bb index 972c285a47..d5817cc37d 100644 --- a/recipes/mythtv/mythtv_0.23+fixes.bb +++ b/recipes/mythtv/mythtv_0.23+fixes.bb @@ -16,7 +16,7 @@ PV = "0.23" # but for packaging the real PV is needed REALPV = "0.23" -SRCREV = "25073" +SRCREV = "25609" SRC_URI = "svn://svn.mythtv.org/svn/branches/release-0-23-fixes;module=mythtv;proto=http" S = "${WORKDIR}/mythtv" -- cgit v1.2.3 From 157bb114df5863b59e979105efd4e0fffcf3c2cb Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 12 Aug 2010 09:44:19 -0700 Subject: binutils.inc: Drop spurious CC definition. There's always been a definition of CC here that gets out of sync with bitbake.conf. Drop. Signed-off-by: Tom Rini --- recipes/binutils/binutils.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes/binutils/binutils.inc b/recipes/binutils/binutils.inc index 75ee66a7c2..8589b92c8d 100644 --- a/recipes/binutils/binutils.inc +++ b/recipes/binutils/binutils.inc @@ -67,8 +67,6 @@ export CC_FOR_BUILD = "${BUILD_CC}" export CPP_FOR_BUILD = "${BUILD_CPP}" export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" -export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" - do_configure () { (cd ${S}; gnu-configize) || die "Failed to run gnu-configize" -- cgit v1.2.3 From 7245c191e28278fcb299981c03b4669b4dcb4b49 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 12 Aug 2010 10:00:47 -0700 Subject: bitbake.conf: Add ext[23].bz2 images Boards with small flash and large ram need all the compression they can get. Signed-off-by: Tom Rini --- conf/bitbake.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index abe500a099..677c76a2f7 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -364,8 +364,10 @@ IMAGE_CMD_yaffs2 = "mkyaffs2image ${EXTRA_IMAGECMD} ${IMAGE_ROOTFS} ${DEPLOY_DIR IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}" IMAGE_CMD_ext2 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}" IMAGE_CMD_ext2.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz" +IMAGE_CMD_ext2.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext2.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.bz2" IMAGE_CMD_ext3 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" IMAGE_CMD_ext3.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz" +IMAGE_CMD_ext3.bz2 = "install -d ${DEPLOY_DIR_IMAGE}/tmp.bz2 ; genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3; bzip2 -f -9 ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.bz2/${IMAGE_NAME}.rootfs.ext3.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.bz2" IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_squashfs-lzma = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend -comp lzma" IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ." @@ -395,8 +397,10 @@ IMAGE_DEPENDS_yaffs2 = "yaffs2-utils-native" IMAGE_DEPENDS_cramfs = "cramfs-native" IMAGE_DEPENDS_ext2 = "genext2fs-native" IMAGE_DEPENDS_ext2.gz = "genext2fs-native" +IMAGE_DEPENDS_ext2.bz2 = "genext2fs-native" IMAGE_DEPENDS_ext3 = "genext2fs-native e2fsprogs-native" IMAGE_DEPENDS_ext3.gz = "genext2fs-native e2fsprogs-native" +IMAGE_DEPENDS_ext3.bz2 = "genext2fs-native e2fsprogs-native" IMAGE_DEPENDS_cpio.gz.u-boot = "u-boot-mkimage-native" IMAGE_DEPENDS_cpio.lzma = "lzma-native" IMAGE_DEPENDS_squashfs = "squashfs-tools-native" -- cgit v1.2.3 From 60df02db6f7b0a4dfcb3f3ca9052460c58aecfb6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 12 Aug 2010 10:43:28 +0200 Subject: metacity: bump PR gnome-panel: bump PR --- recipes/gnome/gnome-panel_2.30.0.bb | 2 ++ recipes/gnome/metacity_2.30.0.bb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/recipes/gnome/gnome-panel_2.30.0.bb b/recipes/gnome/gnome-panel_2.30.0.bb index cfe2cfeaec..dd9ba5a9dd 100644 --- a/recipes/gnome/gnome-panel_2.30.0.bb +++ b/recipes/gnome/gnome-panel_2.30.0.bb @@ -3,6 +3,8 @@ LICENSE = "GPL" SECTION = "x11/gnome" DEPENDS = "libcanberra gconf librsvg libgweather startup-notification libwnck orbit2 gtk+ libbonoboui libglade libgnome libgnomeui gnome-desktop libglade gnome-menus orbit2-native" +PR = "r1" + inherit gnome pkgconfig SRC_URI += "file://idl-sysroot.patch" diff --git a/recipes/gnome/metacity_2.30.0.bb b/recipes/gnome/metacity_2.30.0.bb index d6028799aa..d208839b18 100644 --- a/recipes/gnome/metacity_2.30.0.bb +++ b/recipes/gnome/metacity_2.30.0.bb @@ -3,6 +3,8 @@ DESCRIPTION = "Metacity is the boring window manager for the adult in you." LICENSE = "GPL" DEPENDS = "libcanberra libwnck startup-notification gtk+ gconf gdk-pixbuf-csource-native" +PR = "r1" + inherit gnome update-alternatives SRC_URI += "file://crosscompile.patch " -- cgit v1.2.3 From 066d2f7b280c2905b0e8f703a4091877dec4fe23 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 12 Aug 2010 19:11:36 +0200 Subject: octave: check in WIP recipe for 3.2.4 --- recipes/octave/octave_3.2.4.bb | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 recipes/octave/octave_3.2.4.bb diff --git a/recipes/octave/octave_3.2.4.bb b/recipes/octave/octave_3.2.4.bb new file mode 100644 index 0000000000..d2d4d4f7e4 --- /dev/null +++ b/recipes/octave/octave_3.2.4.bb @@ -0,0 +1,28 @@ +DEFAULT_PREFERENCE = "-1" + +require octave.inc + +SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \ +" + +SRC_URI[md5sum] = "90c39fa9e241ad2e978bcee4682a2ba9" +SRC_URI[sha256sum] = "4c0a2cc595dd5218da3144e6599dbaae42a6c2f3188a5e0bc3cc5aaefcfc8fd0" + +PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \ + libcruft-dev liboctave-dev liboctinterp-dev \ + libcruft-dbg liboctave-dbg liboctinterp-dbg" + +FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft.so*" +FILES_libcruft-dbg += "${libdir}/${PN}-${PV}/.debug/libcruft*" + +FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave.so*" +FILES_liboctave-dbg += "${libdir}/${PN}-${PV}/.debug/liboctave*" + +FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp.so*" +FILES_liboctinterp-dbg += "${libdir}/${PN}-${PV}/.debug/liboctinterp*" + +# octave-oct provides subroutines in .oct file format +FILES_${PN}-oct = "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/*.oct" + +FILES_${PN}-dbg += "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/.debug" + -- cgit v1.2.3 From c9b7719013a39940ae4f185c654a5d5386d25e86 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 12 Aug 2010 12:31:43 -0700 Subject: klibc: Fix staging and PR Signed-off-by: Khem Raj --- recipes/klibc/klibc_1.5.18.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes/klibc/klibc_1.5.18.bb b/recipes/klibc/klibc_1.5.18.bb index a70405e025..880ed74763 100644 --- a/recipes/klibc/klibc_1.5.18.bb +++ b/recipes/klibc/klibc_1.5.18.bb @@ -1,5 +1,7 @@ +PR = "${INC_PR}.0" + do_install() { - oe_runmake DEST_DIR=${D} install + oe_runmake install install -d ${D}${base_bindir} install -m 755 usr/dash/sh.${KLIBC_UTILS_VARIANT} ${D}${base_bindir}/sh install -m 755 usr/kinit/kinit.${KLIBC_UTILS_VARIANT} ${D}${base_bindir}/kinit @@ -10,7 +12,7 @@ do_install() { install -m 755 klcc/klcc ${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}klcc } -export INST=${STAGING_DIR_TARGET} +export INST=${D} PACKAGES = "${PN} ${PN}-dev " FILES_${PN} = "${base_libdir}/klibc-*.so" -- cgit v1.2.3 From 04f85931f4d285b723d1d21bb5a0543597fd15ff Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 12 Aug 2010 12:43:11 -0700 Subject: initscripts-slugos: Switch to FILESPATHPKG =. Signed-off-by: Tom Rini --- recipes/initscripts/initscripts-slugos_1.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/initscripts/initscripts-slugos_1.0.bb b/recipes/initscripts/initscripts-slugos_1.0.bb index f4bf263ef3..74a7c792ed 100644 --- a/recipes/initscripts/initscripts-slugos_1.0.bb +++ b/recipes/initscripts/initscripts-slugos_1.0.bb @@ -24,7 +24,7 @@ PR := "${PR}.24" CONFFILES_${PN} = "" # We wish to search the same file paths as does the initscripts recipe. -FILESPATHPKG = "initscripts-${PV}:initscripts:files" +FILESPATHPKG =. "initscripts-${PV}:" PACKAGES = "${PN}-dbg ${PN}" -- cgit v1.2.3 From e592f51ed3efd3d16a3f054bb2608effea7c66a1 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 12 Aug 2010 12:43:48 -0700 Subject: openjdk-6-common.inc: Switch to FILESPATHPKG =. Signed-off-by: Tom Rini --- recipes/openjdk/openjdk-6-common.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/recipes/openjdk/openjdk-6-common.inc b/recipes/openjdk/openjdk-6-common.inc index ebabf6885b..4137e30ad0 100644 --- a/recipes/openjdk/openjdk-6-common.inc +++ b/recipes/openjdk/openjdk-6-common.inc @@ -46,9 +46,7 @@ DEPENDS = "giflib libpng jpeg cups \ DEPENDS_append_arm = " qemu-native " -FILESPATHPKG = "openjdk-6-${PV}" - -FILESPATHPKG_append = ":files" +FILESPATHPKG =. "openjdk-6-${PV}:" # No package should directly depend on this (it should require # java2-runtime instead). -- cgit v1.2.3 From ede632c6dfdfb41e5b77d68e3a1e421d8f326dc2 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 12 Aug 2010 12:44:12 -0700 Subject: squashfs-tools.inc: Switch to FILESPATHPKG =. Signed-off-by: Tom Rini --- recipes/squashfs-tools/squashfs-tools.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/squashfs-tools/squashfs-tools.inc b/recipes/squashfs-tools/squashfs-tools.inc index 44f6a4bc94..a1f778d3d5 100644 --- a/recipes/squashfs-tools/squashfs-tools.inc +++ b/recipes/squashfs-tools/squashfs-tools.inc @@ -7,7 +7,7 @@ INC_PR = "r4" S = "${WORKDIR}/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}/squashfs-tools" # required to share same place with -lzma specific packages -FILESPATHPKG = "squashfs-tools-${PV}:squashfs-tools:files" +FILESPATHPKG =. "squashfs-tools-${PV}:" SRC_URI ?= "${SOURCEFORGE_MIRROR}/squashfs/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}.tar.gz" -- cgit v1.2.3 From b3c61f19e8e35bc6631c15fa86a5a8669e9e29fa Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 12 Aug 2010 22:16:26 +0200 Subject: htop: RRECOMMENDS ncurses-terminfo Signed-off-by: Martin Jansa --- recipes/htop/htop_0.7.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/htop/htop_0.7.bb b/recipes/htop/htop_0.7.bb index 4474bea9ab..b42489f6f3 100644 --- a/recipes/htop/htop_0.7.bb +++ b/recipes/htop/htop_0.7.bb @@ -5,7 +5,10 @@ PRIORITY = "optional" LICENSE = "GPLv2" DEPENDS = "ncurses" +# actually RDEPENDS, but ncurses-terminfo is only in ncurses-5.7, so RRECOMMENDS for now +RRECOMMENDS_${PN} = "ncurses-terminfo" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/htop/htop-${PV}.tar.gz \ file://remove-proc-test.patch" -- cgit v1.2.3 From b3cd4647905aa5322128f9e7fb18b3df32d62f23 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 12 Aug 2010 22:16:39 +0200 Subject: joe: RRECOMMENDS ncurses-terminfo Signed-off-by: Martin Jansa --- recipes/joe/joe_3.1.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/joe/joe_3.1.bb b/recipes/joe/joe_3.1.bb index 36725d99c9..003721b4df 100644 --- a/recipes/joe/joe_3.1.bb +++ b/recipes/joe/joe_3.1.bb @@ -2,8 +2,11 @@ SECTION = "console/utils" DESCRIPTION = "Console text editor with good functionality, good choice for vi-haters." HOMEPAGE = "http://joe-editor.sourceforge.net/" LICENSE ="GPL" +# actually RDEPENDS, but ncurses-terminfo is only in ncurses-5.7, so RRECOMMENDS for now +RRECOMMENDS_${PN} = "ncurses-terminfo" + SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz" -PR = "r1" +PR = "r2" inherit autotools -- cgit v1.2.3 From 37df60115dbe95269d813cdd7a7c24dc763cc22b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 12 Aug 2010 22:16:49 +0200 Subject: nano: RRECOMMENDS ncurses-terminfo Signed-off-by: Martin Jansa --- recipes/nano/nano.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/nano/nano.inc b/recipes/nano/nano.inc index 5b59b68b07..41f21ecc72 100644 --- a/recipes/nano/nano.inc +++ b/recipes/nano/nano.inc @@ -5,8 +5,10 @@ HOMEPAGE = "http://www.nano-editor.org/" LICENSE = "GPLv2" SECTION = "console/utils" DEPENDS = "ncurses" +# actually RDEPENDS, but ncurses-terminfo is only in ncurses-5.7, so RRECOMMENDS for now +RRECOMMENDS_${PN} = "ncurses-terminfo" -INC_PR = "r0" +INC_PR = "r1" PV_MAJOR = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" -- cgit v1.2.3 From 925829fdf75571dcec821e4ec0c1596046e1f903 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 12 Aug 2010 22:16:59 +0200 Subject: procps: RRECOMMENDS ncurses-terminfo Signed-off-by: Martin Jansa --- recipes/procps/procps.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/procps/procps.inc b/recipes/procps/procps.inc index d158f9b8ec..d720310bdb 100644 --- a/recipes/procps/procps.inc +++ b/recipes/procps/procps.inc @@ -7,8 +7,10 @@ SECTION = "base" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "ncurses" +# actually RDEPENDS, but ncurses-terminfo is only in ncurses-5.7, so RRECOMMENDS for now +RRECOMMENDS_${PN} = "ncurses-terminfo" -INC_PR = "r10" +INC_PR = "r11" SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz;name=tarball \ file://sysctl.conf \ -- cgit v1.2.3 From ad112ee1ce53dfaf3fa2d7a10a79f724c8dd6335 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 12 Aug 2010 22:28:35 +0200 Subject: task-shr-feed: add supertux-qvga wesnoth Signed-off-by: Martin Jansa --- recipes/tasks/task-shr-feed.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb index 7886217053..bdc95c048f 100644 --- a/recipes/tasks/task-shr-feed.bb +++ b/recipes/tasks/task-shr-feed.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SHR Feed" -PR = "r66" +PR = "r67" PV = "1.0" LICENSE = "GPL" @@ -300,6 +300,8 @@ RDEPENDS_${PN} += "\ xfsdump \ numberx \ neomis \ + supertux-qvga \ + wesnoth \ " # this is only usefull on gta02 and on other devices it's trying to pull mesa-dri (not respecting DEFAULT_PROVIDER for virtual/libgl) -- cgit v1.2.3 From c5a493684671da97761bf3db53be386e75a1990c Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 12 Aug 2010 15:54:30 -0700 Subject: squashfs-tools: Switch to BBCLASSEXTEND, drop legacy staging, bump PR Signed-off-by: Tom Rini --- recipes/squashfs-tools/squashfs-tools-native_3.3.bb | 10 ---------- recipes/squashfs-tools/squashfs-tools-native_4.0.bb | 12 ------------ recipes/squashfs-tools/squashfs-tools.inc | 5 ++++- recipes/squashfs-tools/squashfs-tools_3.3.bb | 2 +- recipes/squashfs-tools/squashfs-tools_4.0.bb | 2 +- 5 files changed, 6 insertions(+), 25 deletions(-) delete mode 100644 recipes/squashfs-tools/squashfs-tools-native_3.3.bb delete mode 100644 recipes/squashfs-tools/squashfs-tools-native_4.0.bb diff --git a/recipes/squashfs-tools/squashfs-tools-native_3.3.bb b/recipes/squashfs-tools/squashfs-tools-native_3.3.bb deleted file mode 100644 index 1a82323951..0000000000 --- a/recipes/squashfs-tools/squashfs-tools-native_3.3.bb +++ /dev/null @@ -1,10 +0,0 @@ -require squashfs-tools_${PV}.bb -PR = "${INC_PR}.1" - -inherit native - -PACKAGES = "" - -do_stage () { - install -m 0755 mksquashfs ${STAGING_BINDIR}/ -} diff --git a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb deleted file mode 100644 index 17894179f2..0000000000 --- a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -require squashfs-tools_4.0.bb - -inherit native - -DEPENDS = "attr-native zlib-native" - -PACKAGES = "" - -do_stage () { - install -m 0755 mksquashfs ${STAGING_BINDIR}/ -} - diff --git a/recipes/squashfs-tools/squashfs-tools.inc b/recipes/squashfs-tools/squashfs-tools.inc index a1f778d3d5..ceb02562a3 100644 --- a/recipes/squashfs-tools/squashfs-tools.inc +++ b/recipes/squashfs-tools/squashfs-tools.inc @@ -2,10 +2,13 @@ DESCRIPTION = "Squashfs is a highly compressed read-only filesystem for Linux." SECTION = "base" LICENSE = "GPLv2" DEPENDS = "attr zlib" -INC_PR = "r4" +INC_PR = "r5" S = "${WORKDIR}/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}/squashfs-tools" +BBCLASSEXTEND = "native" +NATIVE_INSTALL_WORKS = "1" + # required to share same place with -lzma specific packages FILESPATHPKG =. "squashfs-tools-${PV}:" diff --git a/recipes/squashfs-tools/squashfs-tools_3.3.bb b/recipes/squashfs-tools/squashfs-tools_3.3.bb index 7883ca140d..fd2783f7b4 100644 --- a/recipes/squashfs-tools/squashfs-tools_3.3.bb +++ b/recipes/squashfs-tools/squashfs-tools_3.3.bb @@ -1,4 +1,4 @@ require squashfs-tools.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.0" SRC_URI += " file://Makefile.patch" diff --git a/recipes/squashfs-tools/squashfs-tools_4.0.bb b/recipes/squashfs-tools/squashfs-tools_4.0.bb index cf33c0d163..b476dc43e4 100644 --- a/recipes/squashfs-tools/squashfs-tools_4.0.bb +++ b/recipes/squashfs-tools/squashfs-tools_4.0.bb @@ -6,7 +6,7 @@ SRC_URI = "cvs://anonymous@squashfs.cvs.sourceforge.net/cvsroot/squashfs;module SRC_URI += " file://Makefile.patch" require squashfs-tools.inc -PR = "${INC_PR}.3" +PR = "${INC_PR}.0" S = "${WORKDIR}/squashfs/squashfs-tools" -- cgit v1.2.3 From 04a9722f7d1fbc227bb281aba1a90a035a4492f3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 8 Aug 2010 00:05:49 -0700 Subject: srctree.bbclass: Also account fot deptask * Use exec_func instead of exec_task * Use a new name for meta task Signed-off-by: Khem Raj --- classes/srctree.bbclass | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/classes/srctree.bbclass b/classes/srctree.bbclass index 7232c26b12..1a88613a0b 100644 --- a/classes/srctree.bbclass +++ b/classes/srctree.bbclass @@ -50,7 +50,7 @@ def merge_tasks(d): __gather_taskdeps(task, items) return items - newtask = "do_populate_sysroot" + newtask = "do_populate_sysroot_post" mergedtasks = gather_taskdeps(newtask) mergedtasks.pop() deltasks = gather_taskdeps("do_patch") @@ -83,17 +83,22 @@ def merge_tasks(d): d.setVarFlag(task, "deps", deps) # Pull cross recipe task deps over - depends = (d.getVarFlag(task, "depends") or "" - for task in mergedtasks[:-1] - if not task in deltasks) - d.setVarFlag("do_populate_sysroot", "depends", " ".join(depends)) + depends = [] + deptask = [] + for task in mergedtasks[:-1]: + if not task in deltasks: + depends.append(d.getVarFlag(task, "depends") or "") + deptask.append(d.getVarFlag(task, "deptask") or "") + + d.setVarFlag("do_populate_sysroot_post", "depends", " ".join(depends)) + d.setVarFlag("do_populate_sysroot_post", "deptask", " ".join(deptask)) python () { merge_tasks(d) } -# Manually run do_install & all of its deps, then do_stage -python do_populate_sysroot () { +# Manually run do_install & all of its deps +python do_populate_sysroot_post () { from os.path import exists from bb.build import exec_task, exec_func from bb import note @@ -105,11 +110,11 @@ python do_populate_sysroot () { if not dep in seen: rec_exec_task(dep, seen) seen.add(task) - #if not exists("%s.%s" % (stamp, task)): - note("%s: executing task %s" % (d.getVar("PF", True), task)) - exec_task(task, d) + if not exists("%s.%s" % (stamp, task)): + note("%s: executing task %s" % (d.getVar("PF", True), task)) + exec_func(task, d) - rec_exec_task("do_install", set()) - exec_func("do_stage", d) + rec_exec_task("do_populate_sysroot", set()) } -do_populate_sysroot[lockfiles] += "${S}/.lock" +addtask populate_sysroot_post after do_populate_sysroot +do_populate_sysroot_post[lockfiles] += "${S}/.lock" -- cgit v1.2.3 From 8786dbcabdb3f9c0dec743298af8b4e7005a3b0a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 13 Aug 2010 09:15:02 +0200 Subject: pidgin: 2.7.2->2.7.3 Signed-off-by: Martin Jansa --- recipes/pidgin/pidgin_2.7.2.bb | 22 ---------------------- recipes/pidgin/pidgin_2.7.3.bb | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 recipes/pidgin/pidgin_2.7.2.bb create mode 100644 recipes/pidgin/pidgin_2.7.3.bb diff --git a/recipes/pidgin/pidgin_2.7.2.bb b/recipes/pidgin/pidgin_2.7.2.bb deleted file mode 100644 index e5229a244a..0000000000 --- a/recipes/pidgin/pidgin_2.7.2.bb +++ /dev/null @@ -1,22 +0,0 @@ -require pidgin.inc -PR = "${INC_PR}.0" - -DEPENDS += "farsight2 libidn" - -SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ - file://sanitize-configure.ac.patch \ - file://pidgin.desktop-set-icon.patch \ - file://purple-OE-branding-25.patch \ - file://pidgin-cross-python-265.patch \ -" - -SRC_URI[md5sum] = "c23d85bb6a197dd841d1b5585148327d" -SRC_URI[sha256sum] = "8ab5f126f384197727db8f61306663325c2779c25e54e61ff95366448a0861c0" - -EXTRA_OECONF += "\ - --disable-gtkspell \ - --disable-meanwhile \ - --disable-nm \ - --disable-screensaver \ -" diff --git a/recipes/pidgin/pidgin_2.7.3.bb b/recipes/pidgin/pidgin_2.7.3.bb new file mode 100644 index 0000000000..606e453106 --- /dev/null +++ b/recipes/pidgin/pidgin_2.7.3.bb @@ -0,0 +1,22 @@ +require pidgin.inc +PR = "${INC_PR}.0" + +DEPENDS += "farsight2 libidn" + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ + file://sanitize-configure.ac.patch \ + file://pidgin.desktop-set-icon.patch \ + file://purple-OE-branding-25.patch \ + file://pidgin-cross-python-265.patch \ +" + +SRC_URI[md5sum] = "e4bbadadae85e5e008690b52dd51f102" +SRC_URI[sha256sum] = "8b5788aa7b8c3fa372e6c5f671592731c86e41322bcc09facb6bbe6127e323f2" + +EXTRA_OECONF += "\ + --disable-gtkspell \ + --disable-meanwhile \ + --disable-nm \ + --disable-screensaver \ +" -- cgit v1.2.3