summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/altboot/altboot_0.0.0.bb2
-rw-r--r--packages/altboot/altboot_1.1.0-wip.bb2
-rw-r--r--packages/altboot/files/init.altboot23
-rw-r--r--packages/pcmciautils/pcmciautils-014/.mtn2git_empty0
-rw-r--r--packages/pcmciautils/pcmciautils-014/makefile_fix.patch15
-rw-r--r--packages/pcmciautils/pcmciautils-014/version_workaround.patch16
-rw-r--r--packages/pcmciautils/pcmciautils_014.bb33
-rw-r--r--packages/tasks/task-base.bb4
8 files changed, 86 insertions, 9 deletions
diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb
index 7130af5a33..06cf246e63 100644
--- a/packages/altboot/altboot_0.0.0.bb
+++ b/packages/altboot/altboot_0.0.0.bb
@@ -20,7 +20,7 @@ RDEPENDS_${PN} = "${PN}-conf"
######################################################################################
-PR = "r46"
+PR = "r47"
######################################################################################
diff --git a/packages/altboot/altboot_1.1.0-wip.bb b/packages/altboot/altboot_1.1.0-wip.bb
index a60e735f0c..38912dcf2c 100644
--- a/packages/altboot/altboot_1.1.0-wip.bb
+++ b/packages/altboot/altboot_1.1.0-wip.bb
@@ -23,7 +23,7 @@ RDEPENDS_${PN}-conf = "${PN}"
######################################################################################
-WIP_DATE = "20061028"
+WIP_DATE = "20061029"
PR = "${WIP_DATE}-r0"
######################################################################################
diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot
index dc3ff07ad8..b872af2d20 100644
--- a/packages/altboot/files/init.altboot
+++ b/packages/altboot/files/init.altboot
@@ -6,7 +6,7 @@
#
test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!"
-
+
CURRENT_ENV="`set`"
VERSION="DEVELOPER SNAPSHOT"
@@ -17,8 +17,21 @@ REAL_INIT="/sbin/init.sysvinit"
INIT_RUNLEVEL="`cat /etc/inittab | sed -n "/^id\:/s/id\:\([0-9]\)\:.*$/\1/p"`"
test -z "$INIT_RUNLEVEL" && INIT_RUNLEVEL=5
+# If this step fails the results are fatal. Seen on Collie / kernel 2.4 (where else...)
OUT_TTY="`tty`" ; test -z "$OUT_TTY" && OUT_TTY="/dev/tty1"
+if test -z "$OUT_TTY"
+then
+ OUT_TTY="/dev/tty1"
+ echo "WARNING: Assgnment of OUT_TTY failed!" > "$OUT_TTY"
+fi
+
+if ( echo "$OUT_TTY" | grep -q "not" )
+then
+ OUT_TTY="/dev/tty1"
+ echo "WARNING: Assignment of OUT_TTY failed (2)!" > "$OUT_TTY"
+fi
+
case "`uname -r`" in
2.6*) ALTBOOT_CFG_FILE="/etc/altboot-2.6.cfg";;
2.4*) ALTBOOT_CFG_FILE="/etc/altboot-2.4.cfg";;
@@ -34,6 +47,8 @@ then
rm "${ALTBOOT_CFG_FILE}.next-reboot"
fi
+test "$ENABLE_DEBUGGING" = "yes" && ENABLE_DEBUG="yes"
+
C_RED="\033[31m"
C_YELLOW="\033[33m"
C_BLUE="\033[34m"
@@ -167,9 +182,7 @@ show_sub_menu() {
#echo "[$d_entries]"
echo -e "\naltboot v$VERSION: $dirname menu\n"
-
- #debug_echo "show_sub_menu(): ping"
-
+
for d_entry in $d_entries
do
d_entry_number="`echo "$d_entry"| sed -n "s/\(.*\)\#\#\(.*\)\#\#\#/\1/p"`"
@@ -416,7 +429,7 @@ else
exec $REAL_INIT $INIT_RUNLEVEL
exit 0
fi
-
+
# Execute scripts in /etc/altboot.rc before doing anything else.
# Required in special situations, like booting spitz
RC_FILES=`ls /etc/altboot.rc | grep \.sh$`
diff --git a/packages/pcmciautils/pcmciautils-014/.mtn2git_empty b/packages/pcmciautils/pcmciautils-014/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pcmciautils/pcmciautils-014/.mtn2git_empty
diff --git a/packages/pcmciautils/pcmciautils-014/makefile_fix.patch b/packages/pcmciautils/pcmciautils-014/makefile_fix.patch
new file mode 100644
index 0000000000..fed5d37bf8
--- /dev/null
+++ b/packages/pcmciautils/pcmciautils-014/makefile_fix.patch
@@ -0,0 +1,15 @@
+Hardcoded paths are bad...
+
+Index: pcmciautils-014/Makefile
+===================================================================
+--- pcmciautils-014.orig/Makefile 2006-06-01 11:07:52.000000000 +0200
++++ pcmciautils-014/Makefile 2006-10-29 13:50:25.000000000 +0100
+@@ -69,7 +69,7 @@
+ mandir = ${prefix}/usr/share/man
+ srcdir = .
+
+-INSTALL = /usr/bin/install -c
++INSTALL = install -c
+ INSTALL_PROGRAM = ${INSTALL}
+ INSTALL_DATA = ${INSTALL} -m 644
+ INSTALL_SCRIPT = ${INSTALL_PROGRAM}
diff --git a/packages/pcmciautils/pcmciautils-014/version_workaround.patch b/packages/pcmciautils/pcmciautils-014/version_workaround.patch
new file mode 100644
index 0000000000..962aa4e246
--- /dev/null
+++ b/packages/pcmciautils/pcmciautils-014/version_workaround.patch
@@ -0,0 +1,16 @@
+PCMCIAUTILS_VERSION is specified on the commandline but doesn't compile properly
+under arm gcc 3.4.x so we work around it.
+
+Index: pcmciautils-013/src/pccardctl.c
+===================================================================
+--- pcmciautils-013.orig/src/pccardctl.c 2006-03-26 11:56:41.000000000 +0100
++++ pcmciautils-013/src/pccardctl.c 2006-05-09 22:11:09.000000000 +0100
+@@ -350,7 +350,7 @@
+ }
+
+ static void print_header(void) {
+- printf("pcmciautils %s\n", PCMCIAUTILS_VERSION);
++ printf("pcmciautils 014\n");
+ printf("Copyright (C) 2004-2005 Dominik Brodowski, (C) 1999 David A. Hinds\n");
+ printf("Report errors and bugs to <linux-pcmcia@lists.infradead.org>, please.\n");
+ }
diff --git a/packages/pcmciautils/pcmciautils_014.bb b/packages/pcmciautils/pcmciautils_014.bb
new file mode 100644
index 0000000000..3dde683012
--- /dev/null
+++ b/packages/pcmciautils/pcmciautils_014.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Linux Kernel 2.6 Userland Utilities for the PCMCIA Subsystem"
+DEPENDS = "sysfsutils udev module-init-tools"
+RDEPENDS = "udev module-init-tools"
+HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
+SECTION = "kernel/userland"
+PRIORITY = "optional"
+
+SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2 \
+ file://makefile_fix.patch;patch=1 \
+ file://version_workaround.patch;patch=1"
+S = "${WORKDIR}/pcmciautils-${PV}"
+
+PR = "r0"
+
+export HOSTCC = "${BUILD_CC}"
+export etcdir = "${sysconfdir}"
+export sbindir = "${base_sbindir}"
+export pcmciaconfdir = "${sysconfdir}/pcmcia"
+export udevrulesdir = "${sysconfdir}/udev/rules.d"
+export UDEV = 1
+LD = "${CC}"
+CFLAGS =+ "-I${S}/src"
+CFLAGS =+ '-DPCMCIAUTILS_VERSION=013'
+
+PARALLEL_MAKE = ""
+EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs'"
+
+do_install () {
+ oe_runmake 'DESTDIR=${D}' install
+}
+
+CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts"
+RCONFLICTS_${PN} += "pcmcia-cs"
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 4336f967a3..9b1f22f2d3 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r11"
+PR = "r12"
PACKAGES = "task-base \
task-base-minimal \
@@ -219,7 +219,7 @@ task-base-irda-rrecommends = "\
kernel-module-ircomm \
kernel-module-ircomm-tty \
kernel-module-irlan \
- kernel-module-irnet \
+ ${@base_contains("DISTRO_FEATURES", "ppp", "kernel-module-irnet", "",d)} \
kernel-module-irport \
kernel-module-irtty \
${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-ir-usb", "",d)} "
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 23:55:35 +0000