From fb1cee2982dbd566111e6dcd5766b7721583513b Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sun, 24 Aug 2008 23:49:44 +0000 Subject: SlugOS 5 - replace "mount -U" with "mount UUID=" which works with both mount and busybox mount; also update boot/disk script to ensure that some key devices exist in the new /dev which will enable booting to a virgin nfsroot. --- packages/slugos-init/files/boot/disk | 9 +++++---- packages/slugos-init/files/functions | 13 +++++++++++++ packages/slugos-init/files/turnup | 6 +++--- packages/slugos-init/slugos-init_5.0.bb | 2 +- 4 files changed, 22 insertions(+), 8 deletions(-) (limited to 'packages') diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk index d47be54c37..63370ce340 100644 --- a/packages/slugos-init/files/boot/disk +++ b/packages/slugos-init/files/boot/disk @@ -38,12 +38,13 @@ then # is attempted. if test -n "$UUID" && mount "$@" UUID="$UUID" /mnt || - mount "$@" -U "$UUID" /mnt || mount "$@" "$device" /mnt then - # checkmount checks for sh, chroot, init - # and /mnt (i.e. /mnt/mnt in this case) - if checkmount /mnt + # checkmount checks for sh, chroot, init, /dev + # and /mnt (i.e. /mnt/mnt in this case). + # minimaldevnodes checks (and creates if required) + # a few mandatory /dev nodes we may need. + if checkmount /mnt && minimaldevnodes /mnt then # pivot to /initrd if available, else /mnt cd / diff --git a/packages/slugos-init/files/functions b/packages/slugos-init/files/functions index 18f4009ee7..5b6b40b091 100644 --- a/packages/slugos-init/files/functions +++ b/packages/slugos-init/files/functions @@ -173,6 +173,7 @@ checkmount(){ # basic test for init (the kernel will try to load this) # but require a shell in bin/sh too test \( -d "$1/mnt" \) -a \ + \( -d "$1/dev" \) -a \ \( -x "$1/bin/sh" -o -h "$1/bin/sh" \) -a \ \( -x "$1/usr/sbin/chroot" -o -h "$1/usr/sbin/chroot" -o \ -x "$1/sbin/chroot" -o -h "$1/sbin/chroot" \) -a \ @@ -181,6 +182,18 @@ checkmount(){ -x "$1/bin/init" -o -h "$1/bin/init" \) } # +# minimaldevnodes "mountpoint" +# tests an already mounted mountpoint to see if a very minimal +# set of devices exists or can be created in dev, and returns +# failure if not. This is required for booting to an nfsroot +# with an empty dev directory, as commonly occurs when the rootfs +# is created from a tar.gz image. This is also required for mdev. +minimaldevnodes(){ + [ -c "$1/dev/console" ] || mknod -m 600 "$1/dev/console" c 5 1 || return 1 + [ -c "$1/dev/null" ] || mknod -m 666 "$1/dev/null" c 1 3 || return 1 + return 0 +} +# # swivel "new root" "old root" # NOTE: the arguments must be paths relative to /, bad things # will happen if the arguments themselves start with / diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup index 4aa1fba3ed..2bbc9024ef 100644 --- a/packages/slugos-init/files/turnup +++ b/packages/slugos-init/files/turnup @@ -578,7 +578,7 @@ disk() { fso="$(fsoptions "$@")" if if test -n "$uuid" then - mount "$@" UUID="$uuid" "$new" || mount "$@" -U "$uuid" "$new" + mount "$@" UUID="$uuid" "$new" else mount "$@" "$device" "$new" fi @@ -591,7 +591,7 @@ disk() { if test -n "$fst" && if test -n "$uuid" then - mount -t "$fst" -o "$fso" UUID="$uuid" "$new" || mount -t "$fst" -o "$fso" -U "$uuid" "$new" + mount -t "$fst" -o "$fso" UUID="$uuid" "$new" else mount -t "$fst" -o "$fso" "$device" "$new" fi @@ -633,7 +633,7 @@ disk() { then echo " options used: -t $fst -o $fso [error in this script]" >&2 test -n "$uuid" && - echo " uuid: $uuid (passed with UUID= or -U)" >&2 + echo " uuid: $uuid (passed with UUID=)" >&2 fi fi diff --git a/packages/slugos-init/slugos-init_5.0.bb b/packages/slugos-init/slugos-init_5.0.bb index 9c50cd61f6..92ac7e30f3 100644 --- a/packages/slugos-init/slugos-init_5.0.bb +++ b/packages/slugos-init/slugos-init_5.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r0" +PR = "r1" SRC_URI = "file://boot/flash \ file://boot/disk \ -- cgit v1.2.3 From c765bc47121d95e8cbc0a6ad71a850e2bcb8f082 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 25 Aug 2008 00:59:48 +0000 Subject: meta-gpe-extras: replace the entries in RDEPENDS with something that at least exists --- packages/meta/meta-gpe-extras.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/meta/meta-gpe-extras.bb b/packages/meta/meta-gpe-extras.bb index b4425a682e..d966be5bf8 100644 --- a/packages/meta/meta-gpe-extras.bb +++ b/packages/meta/meta-gpe-extras.bb @@ -1,11 +1,11 @@ DESCRIPTION = "Meta-package of extra applications for the GPE Palmtop Environment" LICENSE = "MIT" -PR="r2" +PR="r3" RDEPENDS = "\ - gpe-task-apps-extra \ - gpe-task-games \ - gpe-task-web \ - gpe-task-desktopapps" + task-gpe-apps \ + task-gpe-games \ + task-gpe-web \ + task-gpe-desktopapps" inherit meta -- cgit v1.2.3 From 36c64170765ecb2b2437e9b58d9ff5e262b186a8 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Mon, 25 Aug 2008 06:23:27 +0000 Subject: SlugOS 5.0 - slugos-init: update to make nfs boot work correctly; cleanup of kexec stuff (although kexec won't work with the current kernel yet). --- packages/slugos-init/files/boot/kexec | 3 --- packages/slugos-init/files/boot/network | 12 ++++++++++-- packages/slugos-init/slugos-init_5.0.bb | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'packages') diff --git a/packages/slugos-init/files/boot/kexec b/packages/slugos-init/files/boot/kexec index dd757fd771..a60be03142 100644 --- a/packages/slugos-init/files/boot/kexec +++ b/packages/slugos-init/files/boot/kexec @@ -91,7 +91,6 @@ if [ -n "$1" -a -n "$2" ] ; then t=`basename "$kpath"` kexec_image="/mnt/$t" fi - umount /sys fi ;; @@ -105,7 +104,6 @@ if [ -n "$1" -a -n "$2" ] ; then t=`basename "$kpath"` kexec_image="/mnt/$t" fi - umount /sys fi ;; @@ -143,7 +141,6 @@ if [ -n "$1" -a -n "$2" ] ; then echo "Loading kexec kernel using tftp \"$kpath\"..." tftp -g -l "$kexec_image" -r "${kpath#*:}" "${kpath%%:*}" fi - umount /sys fi ;; diff --git a/packages/slugos-init/files/boot/network b/packages/slugos-init/files/boot/network index 8124f19ab2..48aa9dd7d5 100644 --- a/packages/slugos-init/files/boot/network +++ b/packages/slugos-init/files/boot/network @@ -24,8 +24,12 @@ ifconfig lo 127.0.0.1 up iface="$(config iface)" test -z "$iface" && exit 1 # -# Fire up a process in the background to load the firmware if necessary -sysf="/sys/class/firmware/firmware-$iface" +# Fire up a process in the background to load the firmware if necessary. +# If this system doesn't require the NPE-B firmware, no problem, the +# background process will simply go away in two seconds. If it requires +# some other firmware, then modification will be required. We probably +# should replace this with mdev or some other hotplug-based technique... +sysf="/sys/class/firmware/$iface" ( # Wait for the firware to be requested, if required [ -f $sysf/loading ] || sleep 1 @@ -39,5 +43,9 @@ sysf="/sys/class/firmware/firmware-$iface" # Trigger the firmware load proactively ifconfig "$iface" up # +# Unmount /sys and /proc before we leave +umount /sys +umount /proc +# ifup "$iface" # exit code is true only if the interface config has succeeded diff --git a/packages/slugos-init/slugos-init_5.0.bb b/packages/slugos-init/slugos-init_5.0.bb index 92ac7e30f3..9b7c2cd8d0 100644 --- a/packages/slugos-init/slugos-init_5.0.bb +++ b/packages/slugos-init/slugos-init_5.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r1" +PR = "r1.2" SRC_URI = "file://boot/flash \ file://boot/disk \ -- cgit v1.2.3 From 26e21165d3c5459d9f8b7f310c90e4c60b35f77a Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Mon, 25 Aug 2008 06:36:38 +0000 Subject: packages/perl/perl_5.8.8.bb : Change section to devel/perl to match python Bump PR --- packages/perl/perl_5.8.8.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/perl/perl_5.8.8.bb b/packages/perl/perl_5.8.8.bb index 328b4fb5df..c04485e886 100644 --- a/packages/perl/perl_5.8.8.bb +++ b/packages/perl/perl_5.8.8.bb @@ -1,11 +1,11 @@ DESCRIPTION = "Perl is a popular scripting language." HOMEPAGE = "http://www.perl.org/" -SECTION = "devel" +SECTION = "devel/perl" LICENSE = "Artistic|GPL" PRIORITY = "optional" # We need gnugrep (for -I) DEPENDS = "virtual/db perl-native grep-native" -PR = "r25" +PR = "r26" # Major part of version PVM = "5.8" -- cgit v1.2.3 From 17ab77b858c575424a6de3feedf89a4ee7edbaa2 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Mon, 25 Aug 2008 06:37:41 +0000 Subject: packages/spandsp/spandsp.inc : Change section from voip to libs Bump PR --- packages/spandsp/spandsp.inc | 2 +- packages/spandsp/spandsp_0.0.3.bb | 2 +- packages/spandsp/spandsp_0.0.4-pre16.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/spandsp/spandsp.inc b/packages/spandsp/spandsp.inc index 9f4e5e5fbc..ed5fe3b490 100644 --- a/packages/spandsp/spandsp.inc +++ b/packages/spandsp/spandsp.inc @@ -1,6 +1,6 @@ DESCRIPTION = "A library of many DSP functions for telephony." HOMEPAGE = "http://www.soft-switch.org" -SECTION = "voip" +SECTION = "libs" LICENSE = "GPL" DEPENDS = "tiff libxml2" diff --git a/packages/spandsp/spandsp_0.0.3.bb b/packages/spandsp/spandsp_0.0.3.bb index 2dc402ffcb..cb43962def 100644 --- a/packages/spandsp/spandsp_0.0.3.bb +++ b/packages/spandsp/spandsp_0.0.3.bb @@ -1,4 +1,4 @@ -PR = "r2" +PR = "r3" SRC_URI = "http://www.soft-switch.org/downloads/spandsp/spandsp-${PV}.tgz" diff --git a/packages/spandsp/spandsp_0.0.4-pre16.bb b/packages/spandsp/spandsp_0.0.4-pre16.bb index d1e717ecd4..cacdbc6ec7 100644 --- a/packages/spandsp/spandsp_0.0.4-pre16.bb +++ b/packages/spandsp/spandsp_0.0.4-pre16.bb @@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" SRC_URI = "http://www.soft-switch.org/downloads/spandsp/${PN}-0.0.4pre16.tgz" -- cgit v1.2.3 From ad284adbc15624a03ffa9d912bcd59d7ac5c4a0a Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 25 Aug 2008 09:05:18 +0000 Subject: mesa-full_7.0.2.bb: modified from mesa_7.0.2 but added libglut and demos. this recipe will also build glut and demos, xdemos, etc. new packages libglut and mesa-utils added. --- packages/mesa/mesa-full-7.0.2/.mtn2git_empty | 0 .../mesa/mesa-full-7.0.2/fix-host-compile.patch | 30 ++++++++++ .../mesa/mesa-full-7.0.2/fix-progs-makefile.patch | 65 ++++++++++++++++++++++ .../mesa/mesa-full-7.0.2/mklib-rpath-link.patch | 23 ++++++++ packages/mesa/mesa-full_7.0.2.bb | 20 +++++++ 5 files changed, 138 insertions(+) create mode 100644 packages/mesa/mesa-full-7.0.2/.mtn2git_empty create mode 100644 packages/mesa/mesa-full-7.0.2/fix-host-compile.patch create mode 100644 packages/mesa/mesa-full-7.0.2/fix-progs-makefile.patch create mode 100644 packages/mesa/mesa-full-7.0.2/mklib-rpath-link.patch create mode 100644 packages/mesa/mesa-full_7.0.2.bb (limited to 'packages') diff --git a/packages/mesa/mesa-full-7.0.2/.mtn2git_empty b/packages/mesa/mesa-full-7.0.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mesa/mesa-full-7.0.2/fix-host-compile.patch b/packages/mesa/mesa-full-7.0.2/fix-host-compile.patch new file mode 100644 index 0000000000..d24d03d379 --- /dev/null +++ b/packages/mesa/mesa-full-7.0.2/fix-host-compile.patch @@ -0,0 +1,30 @@ +--- /src/mesa/x86/orig-Makefile 2005-07-01 04:54:38.000000000 +0300 ++++ /src/mesa/x86/Makefile 2007-06-07 21:52:31.000000000 +0300 +@@ -5,6 +5,7 @@ + + + INCLUDE_DIRS = \ ++ -I/usr/include \ + -I$(TOP)/include/GL \ + -I$(TOP)/include \ + -I.. \ +@@ -13,6 +14,10 @@ + -I../glapi \ + -I../tnl + ++OPT_FLAGS_host = -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os ++ ++CFLAGS_host = -Wall -Wmissing-prototypes $(OPT_FLAGS_host) $(PIC_FLAGS) $(ARCH_FLAGS) \ ++ $(DEFINES) $(ASM_FLAGS) $(X11_INCLUDES) -std=c99 -ffast-math + + default: gen_matypes matypes.h + +@@ -21,7 +26,7 @@ + + + gen_matypes: gen_matypes.c +- $(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes ++ $(CC) $(INCLUDE_DIRS) $(CFLAGS_host) gen_matypes.c -o gen_matypes + + # need some special rules here, unfortunately + matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes diff --git a/packages/mesa/mesa-full-7.0.2/fix-progs-makefile.patch b/packages/mesa/mesa-full-7.0.2/fix-progs-makefile.patch new file mode 100644 index 0000000000..727ede0eb9 --- /dev/null +++ b/packages/mesa/mesa-full-7.0.2/fix-progs-makefile.patch @@ -0,0 +1,65 @@ +Index: Mesa-7.0.2/progs/demos/Makefile +=================================================================== +--- Mesa-7.0.2.orig/progs/demos/Makefile 2008-08-22 15:52:16.000000000 +0800 ++++ Mesa-7.0.2/progs/demos/Makefile 2008-08-22 15:52:33.000000000 +0800 +@@ -13,7 +13,7 @@ + + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) + +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) -lstdc++ + + PROGS = \ + arbfplight \ +Index: Mesa-7.0.2/progs/glsl/Makefile +=================================================================== +--- Mesa-7.0.2.orig/progs/glsl/Makefile 2008-08-22 15:56:37.000000000 +0800 ++++ Mesa-7.0.2/progs/glsl/Makefile 2008-08-22 15:56:52.000000000 +0800 +@@ -7,7 +7,7 @@ + + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) + +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) -lstdc++ + + PROGS = \ + brick \ +Index: Mesa-7.0.2/progs/redbook/Makefile +=================================================================== +--- Mesa-7.0.2.orig/progs/redbook/Makefile 2008-08-22 15:55:10.000000000 +0800 ++++ Mesa-7.0.2/progs/redbook/Makefile 2008-08-22 15:55:27.000000000 +0800 +@@ -7,7 +7,7 @@ + + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) + +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) -lstdc++ + + PROGS = aaindex aapoly aargb accanti accpersp alpha alpha3D anti \ + bezcurve bezmesh checker clip colormat cube depthcue dof \ +Index: Mesa-7.0.2/progs/samples/Makefile +=================================================================== +--- Mesa-7.0.2.orig/progs/samples/Makefile 2008-08-22 15:56:01.000000000 +0800 ++++ Mesa-7.0.2/progs/samples/Makefile 2008-08-22 15:56:13.000000000 +0800 +@@ -7,7 +7,7 @@ + + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) + +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) -lstdc++ + + PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \ + font line logo nurb olympic overlay point prim quad select \ +Index: Mesa-7.0.2/progs/xdemos/Makefile +=================================================================== +--- Mesa-7.0.2.orig/progs/xdemos/Makefile 2008-08-22 15:57:11.000000000 +0800 ++++ Mesa-7.0.2/progs/xdemos/Makefile 2008-08-22 15:57:22.000000000 +0800 +@@ -8,7 +8,7 @@ + + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) + +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) -lstdc++ + + PROGS = glthreads \ + glxdemo \ diff --git a/packages/mesa/mesa-full-7.0.2/mklib-rpath-link.patch b/packages/mesa/mesa-full-7.0.2/mklib-rpath-link.patch new file mode 100644 index 0000000000..618f5b57ed --- /dev/null +++ b/packages/mesa/mesa-full-7.0.2/mklib-rpath-link.patch @@ -0,0 +1,23 @@ +--- /tmp/mklib 2007-12-08 11:03:23.000000000 +0100 ++++ Mesa-7.0.2/bin/mklib 2007-12-08 11:04:02.509863000 +0100 +@@ -106,6 +106,9 @@ + -L*) + DEPS="$DEPS $1" + ;; ++ -Wl*) ++ DEPS="$DEPS $1" ++ ;; + -pthread) + # this is a special case (see bugzilla 10876) + DEPS="$DEPS $1" +--- /tmp/default 2007-12-08 11:04:17.000000000 +0100 ++++ Mesa-7.0.2/configs/default 2007-12-08 11:05:06.279863000 +0100 +@@ -76,7 +76,7 @@ + GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11 + + # Program dependencies - specific GL/glut libraries added in Makefiles +-APP_LIB_DEPS = -lm ++APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lm + + + diff --git a/packages/mesa/mesa-full_7.0.2.bb b/packages/mesa/mesa-full_7.0.2.bb new file mode 100644 index 0000000000..bac217b71d --- /dev/null +++ b/packages/mesa/mesa-full_7.0.2.bb @@ -0,0 +1,20 @@ +include mesa-mesa.inc + +SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \ + ${SOURCEFORGE_MIRROR}/mesa3d/MesaGLUT-${PV}.tar.bz2 \ + ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2 \ + file://mklib-rpath-link.patch;patch=1 \ + file://fix-host-compile.patch;patch=1 \ + file://fix-progs-makefile.patch;patch=1 \ + " + +do_install_append = "install -d ${D}${bindir}; \ + for f in glxgears glxheads glxdemo glxinfo; do \ + cp progs/xdemos/${f} ${D}${bindir}; \ + done" + +PACKAGES =+ "libglut libglut-dev mesa-utils" + +FILES_libglut = "${libdir}/libglut.so.*" +FILES_libglut-dev = "${libdir}/libglut.* ${includedir}/GL/glut*" +FILES_mesa-utils = "${bindir}/*" -- cgit v1.2.3