From a41e3f74685a324e8891b5e52f5ee28f9c695bfd Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 2 Dec 2004 13:05:23 +0000 Subject: s/GPE_MACHINE_CLASS/GUI_MACHINE_CLASS BKrev: 41af1313bIHIjKXoMCGcKPx8G-pbSw --- conf/distro/opensimpad-0.9.0.conf | 299 ++++++++++++++++++++++++ conf/machine/h3900.conf | 2 +- conf/machine/ipaq-pxa-2.6.conf | 2 +- conf/machine/netvista.conf | 26 +++ conf/machine/ramses.conf | 2 +- conf/machine/simpad.conf | 2 +- conf/machine/tosa.conf | 2 +- conf/machine/zaurus-pxa.conf | 2 +- gpe-session-scripts/gpe-session-scripts_0.61.oe | 2 +- gpe-session-scripts/gpe-session-scripts_0.62.oe | 2 +- meta/gpe-image.oe | 6 +- nmap/nmap_3.77.oe | 4 +- orinoco/orinoco-modules_0.15rc2.oe | 2 + 13 files changed, 340 insertions(+), 13 deletions(-) diff --git a/conf/distro/opensimpad-0.9.0.conf b/conf/distro/opensimpad-0.9.0.conf index e69de29bb2..38d20082b9 100644 --- a/conf/distro/opensimpad-0.9.0.conf +++ b/conf/distro/opensimpad-0.9.0.conf @@ -0,0 +1,299 @@ +include conf/distro/opensimpad.conf +DISTRO = "opensimpad" +DISTRO_NAME = "OpenSIMpad" +DISTRO_VERSION = "0.9.0-rc1" + +FEED_URIS += " \ + upgrades##http://openzaurus.org/official/unstable/3.5.2/upgrades/ \ + base##http://openzaurus.org/official/unstable/3.5.2/feed/base/ \ + libs##http://openzaurus.org/official/unstable/3.5.2/feed/libs/ \ + console##http://openzaurus.org/official/unstable/3.5.2/feed/console \ + devel##http://openzaurus.org/official/unstable/3.5.2/feed/devel" + +CVSDATE = 20041127 +ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95" +PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie" +PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive" +PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-x11" +PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" + +OEINCLUDELOGS = "yes" +KERNEL_CONSOLE = "tty1" +TARGET_FPU = "soft" +#DEBUG_OPTIMIZATION = "-O -g3" +#DEBUG_BUILD = "1" +#INHIBIT_PACKAGE_STRIP = "1" +#ENABLE_SYSREQ = "yes" + +PREFERRED_VERSION_binutils-cross = "2.15.91.0.2" +PREFERRED_VERSION_libtool-native = "1.5.6" +PREFERRED_VERSION_libtool-cross= "1.5.6" +PREFERRED_VERSION_qte-for-opie = "2.3.7" +PREFERRED_VERSION_orinoco-modules = "0.13e" +PREFERRED_VERSION_glibc = "2.3.2+cvs20040726" +PREFERRED_VERSION_wlan-ng-modules = "0.2.1pre22" +PREFERRED_VERSION_bluez-utils-dbus = "2.11" + +# +# Opie +# + +OPIE_VERSION = "1.1.7" +PREFERRED_VERSION_libopie2 = "${OPIE_VERSION}" +PREFERRED_VERSION_libopieobex = "${OPIE_VERSION}" +PREFERRED_VERSION_libopietooth = "${OPIE_VERSION}" +PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}" +PREFERRED_VERSION_libqtaux2 = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-aboutapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-addressbook = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-advancedfm = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-alarm = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-appearance = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-aqpkg = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-autorotateapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-backgammon = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-backup = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-bartender = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-batteryapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-bluepin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-bluetoothapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-bluetoothmanager = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-bounce = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-brightnessapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-button-settings = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-buzzword = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-calculator = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-calibrate = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-camera = "1.0.3" +PREFERRED_VERSION_opie-cardmon = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-checkbook = "0.8.0" +PREFERRED_VERSION_opie-citytime = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-clipboardapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-clockapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-clock = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-confeditor = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-console = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-dagger = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-dasher = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-datebook = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-deco-flat = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-deco-liquid = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-deco-polished = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-doctab = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-drawpad = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-dvorak = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-embeddedkonsole = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-euroconv = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-examples-python = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-eye = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-fifteen = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-formatter = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-freetype = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-ftplib = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-ftp = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-go = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-gutenbrowser = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-handwriting = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-helpbrowser = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-help-en = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-homeapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-lrelease-native = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-lupdate-native = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-irc = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-irdaapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-jumpx = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-kbill = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-kcheckers = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-keyboard = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-keypebble = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-keytabs = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-keyview = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-kjumpx = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-kpacman = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-language = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-launcher-settings = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-libqrsync = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-light-and-power = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-login = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-logoutapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mailapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mail = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mediaplayer1-libmadplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mediaplayer1-libmodplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mediaplayer1-libtremorplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mediaplayer1-libwavplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mediaplayer1 = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mediummount = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-memoryapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mindbreaker = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-minesweep = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-mobilemsg = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-multikeyapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-multikey = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-networkapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-networksettings = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-notesapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-odict = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-osearch = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-oxygen = "1.0.0" +PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}" +# PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-pics = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-pimconverter = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-powerchord = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-pyquicklaunchapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-qasteroids = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-qcop = "1.0.0" +PREFERRED_VERSION_opie-quicklauncher = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-rdesktop = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-reader = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-recorder = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-remote = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-restartapplet2 = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-rotateapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-screenshotapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-search = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-security = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-sfcave = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-sheet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-sh = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-showimg = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-snake = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-solitaire = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-sshkeys = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-style-flat = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-style-fresh = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-style-liquid = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-style-metal = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-style-phase = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-style-web = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-sounds = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-suspendapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-symlinker = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-sysinfo = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-systemtime = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-tictac = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-tinykate = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-today-addressbookplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-today-datebookplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-today-fortuneplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-today-mailplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-today = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-today-stocktickerplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-today-todolistplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-today-weatherplugin = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-todo = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-tonleiter = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-unikeyboard = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-usermanager = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-vmemo = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-vmemo-settings = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-volumeapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-vtapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-wellenreiter = "1.0.3" +PREFERRED_VERSION_opie-wirelessapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-wordgame = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-write = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-zkbapplet = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}" +PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}" + +# +# GPE +# + +PREFERRED_VERSION_libmatchbox = "1.4" +PREFERRED_VERSION_matchbox = "0.8.1" +PREFERRED_VERSION_matchbox-common = "0.8" +PREFERRED_VERSION_matchbox-desktop = "0.8.1" +PREFERRED_VERSION_matchbox-wm = "0.8.4" +PREFERRED_VERSION_matchbox-panel = "0.8.3" +PREFERRED_VERSION_matchbox-applet-inputmanager = "0.5" +PREFERRED_VERSION_gtk+ = "2.4.13" +PREFERRED_VERSION_libgpewidget = "0.96" +PREFERRED_VERSION_libgpepimc = "0.3" +PREFERRED_VERSION_libgpevtype = "0.5" +PREFERRED_VERSION_libschedule = "0.13" +PREFERRED_VERSION_gpe-icons = "0.24" +PREFERRED_VERSION_libgsm = "1.0.10" +PREFERRED_VERSION_diet-x11 = "6.2.1" +PREFERRED_VERSION_xcursor-transparent-theme = "0.1.1" +PREFERRED_VERSION_rxvt-unicode = "3.7" +PREFERRED_VERSION_gtk2-theme-angelistic = "0.3" +PREFERRED_VERSION_xst = "0.14" +PREFERRED_VERSION_xprop = "0.0cvs${CVSDATE}" +PREFERRED_VERSION_xhost = "0.0cvs20040413" +PREFERRED_VERSION_xrdb = "0.0cvs${CVSDATE}" +PREFERRED_VERSION_gpe-login = "0.73" +PREFERRED_VERSION_gpe-session-scripts = "0.62" +PREFERRED_VERSION_gpe-soundserver = "0.4-1" +PREFERRED_VERSION_gpe-todo = "0.50" +PREFERRED_VERSION_gpe-calendar = "0.58" +PREFERRED_VERSION_gpe-sketchbox = "0.2.8" +PREFERRED_VERSION_gpe-contacts = "0.33" +PREFERRED_VERSION_gpe-today = "0.08" +PREFERRED_VERSION_matchbox-panel-manager = "0.1" +PREFERRED_VERSION_dbus = "0.22" +PREFERRED_VERSION_gpe-bluetooth = "0.37" +PREFERRED_VERSION_gpe-su = "0.18" +PREFERRED_VERSION_gpe-conf = "0.1.22" +PREFERRED_VERSION_gpe-clock = "0.14" +PREFERRED_VERSION_gpe-mininet = "0.4" +PREFERRED_VERSION_gpe-mixer = "0.40" +PREFERRED_VERSION_gpe-shield = "0.6" +PREFERRED_VERSION_gpe-wlancfg = "0.2.6" +PREFERRED_VERSION_gpe-taskmanager = "0.17" +PREFERRED_VERSION_keylaunch = "2.0.7" +PREFERRED_VERSION_minilite = "0.44" +PREFERRED_VERSION_xmonobut = "0.4" +PREFERRED_VERSION_gpe-edit = "0.28" +PREFERRED_VERSION_gpe-gallery = "0.95" +PREFERRED_VERSION_gpe-calculator = "0.2" +PREFERRED_VERSION_gpe-package = "0.0.12" +PREFERRED_VERSION_gpe-soundbite = "1.0.5" +PREFERRED_VERSION_gpe-terminal = "1.1" +PREFERRED_VERSION_gpe-watch = "0.10" +PREFERRED_VERSION_gpe-what = "0.31" +PREFERRED_VERSION_gpe-filemanager = "0.20" +PREFERRED_VERSION_gpe-go = "0.05" +PREFERRED_VERSION_gpe-irc = "0.07" +PREFERRED_VERSION_gpe-lights = "0.12" +PREFERRED_VERSION_gpe-nmf = "0.19" +PREFERRED_VERSION_gpe-othello = "0.2-1" +PREFERRED_VERSION_gpe-plucker = "0.1" +PREFERRED_VERSION_gpe-tetris = "0.6-2" +PREFERRED_VERSION_gsoko = "0.4.2-gpe5" +PREFERRED_VERSION_xdemineur = "2.1.1" +PREFERRED_VERSION_matchbox-panel-hacks = "0.3-1" +PREFERRED_VERSION_rosetta = "0.0cvs${CVSDATE}" +PREFERRED_VERSION_dillo2 = "0.6.6" +PREFERRED_VERSION_minimo = "0.0cvs${CVSDATE}" +PREFERRED_VERSION_linphone-hh = "0.12.2.hh1" +PREFERRED_VERSION_linphone = "0.12.2" +PREFERRED_VERSION_firefox = "1.0" + diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index 75151b0f83..32186963d5 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -28,7 +28,7 @@ USE_VT = "0" include conf/machine/ipaq-common.conf include conf/machine/handheld-common.conf -GPE_MACHINE_CLASS = "smallscreen" +GUI_MACHINE_CLASS = "smallscreen" # not using tune-xscale so as to retain backwards compatibility include conf/machine/tune-strongarm.conf diff --git a/conf/machine/ipaq-pxa-2.6.conf b/conf/machine/ipaq-pxa-2.6.conf index 7cde4217aa..68873bdb31 100644 --- a/conf/machine/ipaq-pxa-2.6.conf +++ b/conf/machine/ipaq-pxa-2.6.conf @@ -7,5 +7,5 @@ BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral module-init-tools" BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules modutils-collateral module-init-tools" include conf/machine/handheld-common.conf -GPE_MACHINE_CLASS = "smallscreen" +GUI_MACHINE_CLASS = "smallscreen" diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index e69de29bb2..567cee8ba1 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -0,0 +1,26 @@ +#@TYPE: Machine +#@NAME: IBM Netvista +#@DESCRIPTION: Machine configuration for the IBM Netvista thin client + +TARGET_ARCH = "i386" +IPKG_ARCHS = "all i386 ${MACHINE}" +PREFERRED_PROVIDER_xserver = "xserver-xorg" +PREFERRED_PROVIDER_virtual/kernel = "linux-netvista" +BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils module-init-tools strace" +BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils" +#BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules" +#IMAGE_FSTYPE = "cramfs" +EXTRA_IMAGEDEPENDS = "" +SERIAL_CONSOLE = "ttyS0 115200 vt100" + +TARGET_VENDOR = "-oe" +PREFERRED_PROVIDERS_append = " virtual/kernel:linux-netvista" +IMAGE_FSTYPE = "ext2" +GUI_MACHINE_CLASS = "bigscreen" + +#BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev module-init-tools strace" +#BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace +#udevdir = "/dev" + + +include conf/thinclient-common.conf diff --git a/conf/machine/ramses.conf b/conf/machine/ramses.conf index b0f1170ada..187ff8bf49 100644 --- a/conf/machine/ramses.conf +++ b/conf/machine/ramses.conf @@ -12,7 +12,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad=0x1ec0000 --eraseblock=0x40000" USE_DEVFS = "1" -GPE_MACHINE_CLASS = "smallscreen" +GUI_MACHINE_CLASS = "smallscreen" # For sysvinit: USE_VT = "0" diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index 96f39b3a8c..10c108fbc7 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -21,7 +21,7 @@ EXTRA_IMAGEDEPENDS = "" SERIAL_CONSOLE = "ttySA0 115200 vt100" USE_DEVFS = "1" -GPE_MACHINE_CLASS = "bigscreen" +GUI_MACHINE_CLASS = "bigscreen" USE_VT = "0" include conf/machine/handheld-common.conf diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index a705dcdb05..0868abf9a2 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -18,7 +18,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" -GPE_MACHINE_CLASS = "bigscreen" +GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS = "gaim" include conf/machine/handheld-common.conf diff --git a/conf/machine/zaurus-pxa.conf b/conf/machine/zaurus-pxa.conf index 62c8e1f7ba..94d63bf3a6 100644 --- a/conf/machine/zaurus-pxa.conf +++ b/conf/machine/zaurus-pxa.conf @@ -17,7 +17,7 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ ${T}/${IMAGE_NAME}.rootfs.jffs2 > \ ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img" -GPE_MACHINE_CLASS = "bigscreen" +GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS = "gaim sylpheed" GPE_EXTRA_INSTALL = "gaim sylpheed" diff --git a/gpe-session-scripts/gpe-session-scripts_0.61.oe b/gpe-session-scripts/gpe-session-scripts_0.61.oe index fb7d05ac9f..41c6501698 100644 --- a/gpe-session-scripts/gpe-session-scripts_0.61.oe +++ b/gpe-session-scripts/gpe-session-scripts_0.61.oe @@ -15,7 +15,7 @@ SRC_URI += "file://change-default-applets.patch;patch=1" do_install_append() { install -d ${D}/etc/gpe/xsettings-default.d - if [ "${GPE_MACHINE_CLASS}" != "bigscreen" ]; then + if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then echo "Gtk/ToolbarStyle:S:icons" > ${D}/etc/gpe/xsettings-default.d/toolbar fi } diff --git a/gpe-session-scripts/gpe-session-scripts_0.62.oe b/gpe-session-scripts/gpe-session-scripts_0.62.oe index e89d6f1842..4aa0ce01c1 100644 --- a/gpe-session-scripts/gpe-session-scripts_0.62.oe +++ b/gpe-session-scripts/gpe-session-scripts_0.62.oe @@ -20,7 +20,7 @@ do_install_append() { install ${WORKDIR}/zaurus.sh ${D}/etc/X11/Xinit.d/11zaurus install ${WORKDIR}/shepherd.xmodmap ${D}/etc/X11/shepherd.xmodmap install -d ${D}/etc/gpe/xsettings-default.d - if [ "${GPE_MACHINE_CLASS}" != "bigscreen" ]; then + if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then echo "Gtk/ToolbarStyle:S:icons" > ${D}/etc/gpe/xsettings-default.d/toolbar fi } diff --git a/meta/gpe-image.oe b/meta/gpe-image.oe index 2947396afb..eec57b72c9 100644 --- a/meta/gpe-image.oe +++ b/meta/gpe-image.oe @@ -10,10 +10,10 @@ PR = "r8" export IMAGE_BASENAME = "gpe-image" -GPE_MACHINE_CLASS ?= "none" +GUI_MACHINE_CLASS ?= "none" -GPE_EXTRA_DEPENDS += "${GPE_EXTRA_DEPENDS_${GPE_MACHINE_CLASS}}" -GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GPE_MACHINE_CLASS}}" +GPE_EXTRA_DEPENDS += "${GPE_EXTRA_DEPENDS_${GUI_MACHINE_CLASS}}" +GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}" #GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone" #GPE_EXTRA_INSTALL_bigscreen = "firefox linphone" diff --git a/nmap/nmap_3.77.oe b/nmap/nmap_3.77.oe index b3c13c7999..e1249a7229 100644 --- a/nmap/nmap_3.77.oe +++ b/nmap/nmap_3.77.oe @@ -1,14 +1,14 @@ -SECTION = "console/network" DESCRIPTION = "Nmap is a command line portscanner." HOMEPAGE = "http://www.insecure.org/nmap/" MAINTAINER = "Chris Larson " +SECTION = "console/network" LICENSE = "GPL" DEPENDS = "libpcap pcre" PR = "r1" inherit autotools -SRC_URI = "http://download.insecure.org/nmap/dist/nmap-${PV}.tgz \ +SRC_URI = "http://download.insecure.org/nmap/dist/nmap-${PV}.tar.bz2 \ file://autofoo.patch;patch=1" S = "${WORKDIR}/nmap-${PV}" diff --git a/orinoco/orinoco-modules_0.15rc2.oe b/orinoco/orinoco-modules_0.15rc2.oe index 2601fa1cb1..5d9c5bbfe3 100644 --- a/orinoco/orinoco-modules_0.15rc2.oe +++ b/orinoco/orinoco-modules_0.15rc2.oe @@ -10,6 +10,8 @@ PR = "r2" # seems to cause problems on arm DEFAULT_PREFERENCE_arm = "-1" +SELECTED_OPTIMIZATION = "-O -fno-strict-aliasing" + SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz \ file://list-move.patch;patch=1 \ file://spectrum-firmware.patch;patch=1 \ -- cgit 1.2.3-korg