diff options
83 files changed, 429 insertions, 994 deletions
diff --git a/openembedded/classes/package.bbclass b/openembedded/classes/package.bbclass index db479d5847..fd8d1b7b09 100644 --- a/openembedded/classes/package.bbclass +++ b/openembedded/classes/package.bbclass @@ -81,6 +81,53 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst bb.data.setVar('PACKAGES', ' '.join(packages), d) +# Function to strip a single file, called from RUNSTRIP below +# A working 'file' (one which works on the target architecture) +# is necessary for this stuff to work. +PACKAGE_DEPENDS ?= "file-native" +DEPENDS_prepend =+ "${PACKAGE_DEPENDS} " +#FIXME: this should be "" when any errors are gone! +IGNORE_STRIP_ERRORS ?= "1" + +runstrip() { + local ro st + st=0 + if { file "$1" || { + oewarn "file $1: failed (forced strip)" >&2 + echo 'not stripped' + } + } | grep -q 'not stripped' + then + oenote "${STRIP} $1" + ro= + test -w "$1" || { + ro=1 + chmod +w "$1" + } + '${STRIP}' "$1" + st=$? + test -n "$ro" && chmod -w "$1" + if test $st -ne 0 + then + oewarn "runstrip: ${STRIP} $1: strip failed" >&2 + if [ x${IGNORE_STRIP_ERRORS} == x1 ] + then + #FIXME: remove this, it's for error detection + if file "$1" 2>/dev/null >&2 + then + (oefatal "${STRIP} $1: command failed" >/dev/tty) + else + (oefatal "file $1: command failed" >/dev/tty) + fi + st=0 + fi + fi + else + oenote "runstrip: skip $1" + fi + return $st +} + python populate_packages () { import glob, stat, errno, re @@ -166,14 +213,14 @@ python populate_packages () { dpath = os.path.dirname(fpath) bb.mkdirhier(dpath) if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, 1) != '1') and not os.path.islink(file) and isexec(file): - stripfunc += "${STRIP} %s || : ;\n" % fpath + stripfunc += "\trunstrip %s || st=1\n" % fpath ret = bb.movefile(file,fpath) if ret is None or ret == 0: raise bb.build.FuncFailed("File population failed") if not stripfunc == "": from bb import build # strip - bb.data.setVar('RUNSTRIP', '%s\nreturn 0' % stripfunc, localdata) + bb.data.setVar('RUNSTRIP', '\tlocal st\n\tst=0\n%s\treturn $st' % stripfunc, localdata) bb.data.setVarFlag('RUNSTRIP', 'func', 1, localdata) bb.build.exec_func('RUNSTRIP', localdata) del localdata diff --git a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc index f8af96435b..933195977d 100644 --- a/openembedded/conf/distro/preferred-gpe-versions-2.7.inc +++ b/openembedded/conf/distro/preferred-gpe-versions-2.7.inc @@ -20,13 +20,15 @@ PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" PREFERRED_VERSION_atk ?= "1.9.0" PREFERRED_VERSION_cairo ?= "0.5.2" PREFERRED_VERSION_glib-2.0 ?= "2.6.4" -PREFERRED_VERSION_gtk+ ?= "2.6.7" +PREFERRED_VERSION_gtk+ ?= "2.6.10" PREFERRED_VERSION_pango ?= "1.8.1" PREFERRED_VERSION_librsvg ?= "2.6.5" -PREFERRED_VERSION_libgpewidget ?= "0.105" +PREFERRED_VERSION_libgpewidget ?= "0.109" PREFERRED_VERSION_libgpepimc ?= "0.5" PREFERRED_VERSION_libgpevtype ?= "0.14" PREFERRED_VERSION_libschedule ?= "0.15" +PREFERRED_VERSION_libcontactsdb ?= "0.3" +PREFERRED_VERSION_libtododb ?= "0.09" PREFERRED_VERSION_gpe-icons ?= "0.25" PREFERRED_VERSION_libgsm ?= "1.0.10" PREFERRED_VERSION_diet-x11 ?= "6.2.1" @@ -43,23 +45,23 @@ PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_gpe-login ?= "0.83" PREFERRED_VERSION_gpe-session-scripts ?= "0.66" PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" -PREFERRED_VERSION_gpe-todo ?= "0.54" -PREFERRED_VERSION_gpe-calendar ?= "0.66" -PREFERRED_VERSION_gpe-sketchbox ?= "0.2.8" -PREFERRED_VERSION_gpe-contacts ?= "0.42" +PREFERRED_VERSION_gpe-todo ?= "0.55" +PREFERRED_VERSION_gpe-calendar ?= "0.70" +PREFERRED_VERSION_gpe-sketchbook ?= "0.2.9" +PREFERRED_VERSION_gpe-contacts ?= "0.43" PREFERRED_VERSION_gpe-today ?= "0.10" PREFERRED_VERSION_matchbox-panel-manager ?= "0.1" PREFERRED_VERSION_dbus ?= "0.23.4" PREFERRED_VERSION_gpe-beam ?= "0.2.8" -PREFERRED_VERSION_gpe-bluetooth ?= "0.47" +PREFERRED_VERSION_gpe-bluetooth ?= "0.51" PREFERRED_VERSION_gpe-su ?= "0.19" -PREFERRED_VERSION_gpe-conf ?= "0.1.26" -PREFERRED_VERSION_gpe-clock ?= "0.21" -PREFERRED_VERSION_gpe-mininet ?= "0.5" +PREFERRED_VERSION_gpe-conf ?= "0.1.29" +PREFERRED_VERSION_gpe-clock ?= "0.23" +PREFERRED_VERSION_gpe-mininet ?= "0.7" PREFERRED_VERSION_gpe-mixer ?= "0.42" PREFERRED_VERSION_gpe-shield ?= "0.8" PREFERRED_VERSION_gpe-wlancfg ?= "0.2.6" -PREFERRED_VERSION_gpe-taskmanager ?= "0.18" +PREFERRED_VERSION_gpe-taskmanager ?= "0.19" PREFERRED_VERSION_keylaunch ?= "2.0.7" PREFERRED_VERSION_minilite ?= "0.49" PREFERRED_VERSION_xmonobut ?= "0.4" @@ -70,7 +72,7 @@ PREFERRED_VERSION_gpe-package ?= "0.3" PREFERRED_VERSION_gpe-soundbite ?= "1.0.6" PREFERRED_VERSION_gpe-terminal ?= "1.1" PREFERRED_VERSION_gpe-watch ?= "0.10" -PREFERRED_VERSION_gpe-what ?= "0.33" +PREFERRED_VERSION_gpe-what ?= "0.42" PREFERRED_VERSION_gpe-filemanager ?= "0.23" PREFERRED_VERSION_gpe-go ?= "0.05" PREFERRED_VERSION_gpe-irc ?= "0.07" @@ -84,11 +86,11 @@ PREFERRED_VERSION_xdemineur ?= "2.1.1" PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1" PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_dillo2 ?= "0.6.6" -PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}" +PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" PREFERRED_VERSION_linphone ?= "0.12.2" PREFERRED_VERSION_firefox ?= "1.0" -PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904" +PREFERRED_VERSION_gaim ?= "2.0.0+cvs20050904-mco1" PREFERRED_VERSION_poppler ?= "0.3.3" PREFERRED_VERSION_evince ?= "0.3.2" -PREFERRED_VERSION_gpe_mini_browser ?= "0.17" +PREFERRED_VERSION_gpe_mini_browser ?= "0.19" diff --git a/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf b/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf index 007750a39b..271a6ca3e7 100644 --- a/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf +++ b/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf @@ -3,10 +3,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils spectrum-fw orinoco-conf \ -pcmciautils apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \ -ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils module-init-tools alsa-lib" - BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ pcmciautils apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf" @@ -36,12 +32,13 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage # Wireless Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \ kernel-module-hermes kernel-module-orinoco \ - kernel-module-orinoco-cs kernel-module-spectrum-cs" + kernel-module-orinoco-cs kernel-module-spectrum-cs \ + hostap-conf orinoco-conf" # Sound Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \ kernel-module-snd-pcm kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss \ - kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s" + kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s" BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += " kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 " BOOTSTRAP_EXTRA_RDEPENDS_append_akita += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " diff --git a/openembedded/packages/base-files/base-files/openslug/fstab b/openembedded/packages/base-files/base-files/openslug/fstab deleted file mode 100644 index 0ac6b1460c..0000000000 --- a/openembedded/packages/base-files/base-files/openslug/fstab +++ /dev/null @@ -1,5 +0,0 @@ -rootfs / jffs2 defaults 1 1 -proc /proc proc defaults 0 0 -tmpfs /var tmpfs defaults 0 0 -tmpfs /media/ram tmpfs defaults 0 0 -usbfs /proc/bus/usb usbfs defaults 0 0 diff --git a/openembedded/packages/base-files/base-files/tosa/fstab b/openembedded/packages/base-files/base-files/tosa/fstab index 886b065b52..fb37e07aec 100644 --- a/openembedded/packages/base-files/base-files/tosa/fstab +++ b/openembedded/packages/base-files/base-files/tosa/fstab @@ -9,4 +9,4 @@ tmpfs /media/ram tmpfs defaults 0 0 # SD/MMC in kernel 2.4 /dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 # SD/MMC in kernel 2.6 -/dev/mmcblk0p1 /media/card auto defaults,sync,auto 0 0 +/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 diff --git a/openembedded/packages/base-files/base-files_3.0.14.bb b/openembedded/packages/base-files/base-files_3.0.14.bb index d23c43046a..0689cfa0f3 100644 --- a/openembedded/packages/base-files/base-files_3.0.14.bb +++ b/openembedded/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r45" +PR = "r47" LICENSE = "GPL" SRC_URI = " \ @@ -46,7 +46,7 @@ conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ ${sysconfdir}/default" hostname = "openembedded" -hostname_openslug = "openslug" +hostname_slugos = "nslu2" hostname_mnci = "MNCI" PACKAGE_ARCH_mnci = "mnci" hostname_rt3000 = "MNRT" @@ -121,7 +121,7 @@ do_install_append_nylon() { ln -sf /var/tmp ${D}/tmp } -do_install_append_openslug() { +do_install_append_slugos() { printf "" "" >${D}${sysconfdir}/resolv.conf rm -r ${D}/mnt/* rmdir ${D}/home/root @@ -146,5 +146,5 @@ FILES_${PN}-unslung = "" CONFFILES_${PN} = "${sysconfdir}/fstab ${sysconfdir}/hostname" CONFFILES_${PN}_nylon = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname" -CONFFILES_${PN}_openslug = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname" +CONFFILES_${PN}_slugos = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname" diff --git a/openembedded/packages/base-passwd/base-passwd-3.5.9/openslug/README b/openembedded/packages/base-passwd/base-passwd-3.5.9/openslug/README deleted file mode 100644 index 05c2e419f5..0000000000 --- a/openembedded/packages/base-passwd/base-passwd-3.5.9/openslug/README +++ /dev/null @@ -1,13 +0,0 @@ -This patch overrides the root-home.patch for DISTRO=openslug - -The patch sets a root password on /etc/passwd, this password is - -opeNSLUg - -This allows ssh (dropbear) login to an OpenSlug NSLU2 using that -password. - -The password is NO MORE SECURE than the previous empty string, -however, because ssh logins can now succeed the NSLU2 is LESS -secure! This password must be changed as soon as possible after -initial configuration of the NSLU2. diff --git a/openembedded/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch b/openembedded/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch deleted file mode 100644 index 97dab68f33..0000000000 --- a/openembedded/packages/base-passwd/base-passwd-3.5.9/openslug/root-home.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- base-passwd/passwd.master.orig 2005-07-08 06:26:22.000000000 +0200 -+++ base-passwd/passwd.master 2005-07-08 06:31:58.000000000 +0200 -@@ -1,4 +1,4 @@ --root::0:0:root:/root:/bin/sh -+root:Xm./49bYkrkuo:0:0:root:/root:/bin/sh - daemon:*:1:1:daemon:/usr/sbin:/bin/sh - bin:*:2:2:bin:/bin:/bin/sh - sys:*:3:3:sys:/dev:/bin/sh diff --git a/openembedded/packages/busybox/busybox-1.00/openslug/defconfig b/openembedded/packages/busybox/busybox-1.00/openslug/defconfig deleted file mode 100644 index 7debaeced2..0000000000 --- a/openembedded/packages/busybox/busybox-1.00/openslug/defconfig +++ /dev/null @@ -1,461 +0,0 @@ -# -# Automatically generated make config: don't edit -# -HAVE_DOT_CONFIG=y - -# -# General Configuration -# -# CONFIG_FEATURE_BUFFERS_USE_MALLOC |