From a587bd1605a3cd9379ce5cb3954977722f001db8 Mon Sep 17 00:00:00 2001
From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Date: Thu, 5 Mar 2009 00:45:29 +0100
Subject: om-3d7k.conf: fix serial console UART
---
conf/machine/om-3d7k.conf | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/conf/machine/om-3d7k.conf b/conf/machine/om-3d7k.conf
index 7f2cc875b9..95bfd40b23 100644
--- a/conf/machine/om-3d7k.conf
+++ b/conf/machine/om-3d7k.conf
@@ -21,7 +21,12 @@ MACHINE_EXTRA_RRECOMMENDS = "\
kernel-modules \
"
-SERIAL_CONSOLE = "115200 ttySAC2"
+# device has 4 UARTS:
+# ttySAC0: mc75 GSM modem
+# ttySAC1: NC
+# ttySAC2: NC
+# ttySAC3: serial console
+SERIAL_CONSOLE = "115200 ttySAC3"
USE_VT = "0"
# used by some images
--
cgit v1.2.3
From c2f21de4041e962705e2e31dc7c50fed7877547a Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 4 Mar 2009 16:14:27 -0800
Subject: coreutils-6.0: Make the install utility to honor STRIP environment
variable
---
.../coreutils-install-use-STRIP.patch | 29 ++++++++++++++++++++++
packages/coreutils/coreutils_6.0.bb | 3 ++-
2 files changed, 31 insertions(+), 1 deletion(-)
create mode 100644 packages/coreutils/coreutils-6.0/coreutils-install-use-STRIP.patch
diff --git a/packages/coreutils/coreutils-6.0/coreutils-install-use-STRIP.patch b/packages/coreutils/coreutils-6.0/coreutils-install-use-STRIP.patch
new file mode 100644
index 0000000000..1af9fb97b6
--- /dev/null
+++ b/packages/coreutils/coreutils-6.0/coreutils-install-use-STRIP.patch
@@ -0,0 +1,29 @@
+Index: coreutils-6.0/src/install.c
+===================================================================
+--- coreutils-6.0.orig/src/install.c 2009-03-04 15:37:45.000000000 -0800
++++ coreutils-6.0/src/install.c 2009-03-04 15:38:57.000000000 -0800
+@@ -526,7 +526,14 @@
+ strip (char const *name)
+ {
+ int status;
+- pid_t pid = fork ();
++ pid_t pid;
++ char *strip_name;
++
++ strip_name = getenv ("STRIP");
++ if (strip_name == NULL)
++ strip_name = "strip";
++
++ pid = fork ();
+
+ switch (pid)
+ {
+@@ -534,7 +541,7 @@
+ error (EXIT_FAILURE, errno, _("fork system call failed"));
+ break;
+ case 0: /* Child. */
+- execlp ("strip", "strip", name, NULL);
++ execlp (strip_name, "strip", name, NULL);
+ error (EXIT_FAILURE, errno, _("cannot run strip"));
+ break;
+ default: /* Parent. */
diff --git a/packages/coreutils/coreutils_6.0.bb b/packages/coreutils/coreutils_6.0.bb
index 4d4c049465..d0d082bc63 100644
--- a/packages/coreutils/coreutils_6.0.bb
+++ b/packages/coreutils/coreutils_6.0.bb
@@ -1,12 +1,13 @@
require coreutils.inc
-PR = "r2"
+PR = "r3"
SRC_URI = "\
ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \
file://man.patch;patch=1 \
file://oe-old-tools.patch;patch=1 \
file://futimens.patch;patch=1 \
+ file://coreutils-install-use-STRIP.patch;patch=1 \
file://onceonly.m4 \
"
--
cgit v1.2.3
From cfc39def4cf85916517feb9b7e9d8ae721aa0eb3 Mon Sep 17 00:00:00 2001
From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Date: Thu, 5 Mar 2009 01:53:38 +0100
Subject: samsung-soc-utils: new directory (renamed from s3c24xx-utils)
s3c64xx-gpio: new recipe; gpio utility for the s3c64xx platform
---
conf/distro/include/sane-srcrevs.inc | 3 +-
.../s3c24xx-utils/s3c2410-boot-usb-native_svn.bb | 31 ---------------------
packages/s3c24xx-utils/s3c24xx-gpio_svn.bb | 18 ------------
packages/s3c24xx-utils/sjf2410-linux-native_svn.bb | 32 ----------------------
.../s3c2410-boot-usb-native_svn.bb | 31 +++++++++++++++++++++
packages/samsung-soc-utils/s3c24xx-gpio_svn.bb | 18 ++++++++++++
packages/samsung-soc-utils/s3c64xx-gpio_svn.bb | 18 ++++++++++++
.../samsung-soc-utils/sjf2410-linux-native_svn.bb | 32 ++++++++++++++++++++++
8 files changed, 101 insertions(+), 82 deletions(-)
delete mode 100644 packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb
delete mode 100644 packages/s3c24xx-utils/s3c24xx-gpio_svn.bb
delete mode 100644 packages/s3c24xx-utils/sjf2410-linux-native_svn.bb
create mode 100644 packages/samsung-soc-utils/s3c2410-boot-usb-native_svn.bb
create mode 100644 packages/samsung-soc-utils/s3c24xx-gpio_svn.bb
create mode 100644 packages/samsung-soc-utils/s3c64xx-gpio_svn.bb
create mode 100644 packages/samsung-soc-utils/sjf2410-linux-native_svn.bb
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index d629c4adc4..e6557d794b 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -212,7 +212,8 @@ SRCREV_pn-qemu ?= "${QEMUSRCREV}"
SRCREV_pn-qi ?= "3b8513d8b3d9615ebda605de4bda18371aa3f359"
SRCREV_pn-remoko ?= "121"
SRCREV_pn-remoko-server ?= "121"
-SRCREV_pn-s3c24xx-gpio ?= "4130"
+SRCREV_pn-s3c24xx-gpio ?= "4949"
+SRCREV_pn-s3c64xx-gpio ?= "4949"
SRCREV_pn-serial-forward ?= "4907"
SRCREV_pn-settings-daemon ?= "2006"
SRCREV_pn-sjf2410-linux-native ?= "4268"
diff --git a/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb b/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb
deleted file mode 100644
index 675d07c910..0000000000
--- a/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "Boots a S3C2410 device with a user supplied kernel zImage"
-DEPENDS = "libusb-native"
-SECTION = "devel"
-AUTHOR = "Harald Welte <laforge@openmoko.org>"
-LICENSE = "GPL"
-PV = "0.1.0+svnr${SRCREV}"
-PR = "r1"
-
-SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=s3c2410_boot_usb;proto=https"
-S = "${WORKDIR}/s3c2410_boot_usb"
-
-inherit native
-
-do_compile() {
- ${CC} ${CFLAGS} ${LDFLAGS} -lusb -o s3c2410-boot-usb boot_usb.c
-}
-
-do_deploy() {
- install -d ${DEPLOY_DIR_TOOLS}
- install -m 0755 s3c2410-boot-usb ${DEPLOY_DIR_TOOLS}/s3c2410-boot-usb-${PV}
-}
-
-do_stage() {
- :
-}
-
-do_install() {
- :
-}
-
-addtask deploy before do_build after do_compile
diff --git a/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb b/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb
deleted file mode 100644
index 0a57d2c0e6..0000000000
--- a/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "A user-space tool to show and modify the state of GPIOs on the S3c24xx platform"
-SECTION = "console/utils"
-AUTHOR = "Werner Almesberger <werner@openmoko.org>"
-LICENSE = "GPL"
-PV = "1.0+svnr${SRCREV}"
-PR = "r2"
-
-SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;proto=http"
-S = "${WORKDIR}/gpio"
-
-do_compile() {
- ${CC} ${CFLAGS} ${LDFLAGS} -static -o ${PN} gpio.c
-}
-
-do_install() {
- install -d ${D}${sbindir}
- install -m 0755 ${PN} ${D}${sbindir}
-}
diff --git a/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb b/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb
deleted file mode 100644
index fcfbba923d..0000000000
--- a/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "JTAG utility to interface w/ a S3C2410 device"
-SECTION = "devel"
-AUTHOR = "Harald Welte <laforge@openmoko.org>"
-LICENSE = "GPL"
-PV = "0.1+svnr${SRCREV}"
-PR = "r0"
-
-SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;proto=https"
-S = "${WORKDIR}/sjf2410-linux"
-
-inherit native
-
-CFLAGS += "-DLINUX_PPDEV"
-
-do_compile() {
- oe_runmake
-}
-
-do_deploy() {
- install -d ${DEPLOY_DIR_TOOLS}
- install -m 0755 sjf2410 ${DEPLOY_DIR_TOOLS}/sjf2410-${PV}
-}
-
-do_stage() {
- :
-}
-
-do_install() {
- :
-}
-
-addtask deploy before do_package after do_install
diff --git a/packages/samsung-soc-utils/s3c2410-boot-usb-native_svn.bb b/packages/samsung-soc-utils/s3c2410-boot-usb-native_svn.bb
new file mode 100644
index 0000000000..675d07c910
--- /dev/null
+++ b/packages/samsung-soc-utils/s3c2410-boot-usb-native_svn.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Boots a S3C2410 device with a user supplied kernel zImage"
+DEPENDS = "libusb-native"
+SECTION = "devel"
+AUTHOR = "Harald Welte <laforge@openmoko.org>"
+LICENSE = "GPL"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r1"
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=s3c2410_boot_usb;proto=https"
+S = "${WORKDIR}/s3c2410_boot_usb"
+
+inherit native
+
+do_compile() {
+ ${CC} ${CFLAGS} ${LDFLAGS} -lusb -o s3c2410-boot-usb boot_usb.c
+}
+
+do_deploy() {
+ install -d ${DEPLOY_DIR_TOOLS}
+ install -m 0755 s3c2410-boot-usb ${DEPLOY_DIR_TOOLS}/s3c2410-boot-usb-${PV}
+}
+
+do_stage() {
+ :
+}
+
+do_install() {
+ :
+}
+
+addtask deploy before do_build after do_compile
diff --git a/packages/samsung-soc-utils/s3c24xx-gpio_svn.bb b/packages/samsung-soc-utils/s3c24xx-gpio_svn.bb
new file mode 100644
index 0000000000..0a57d2c0e6
--- /dev/null
+++ b/packages/samsung-soc-utils/s3c24xx-gpio_svn.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "A user-space tool to show and modify the state of GPIOs on the S3c24xx platform"
+SECTION = "console/utils"
+AUTHOR = "Werner Almesberger <werner@openmoko.org>"
+LICENSE = "GPL"
+PV = "1.0+svnr${SRCREV}"
+PR = "r2"
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;proto=http"
+S = "${WORKDIR}/gpio"
+
+do_compile() {
+ ${CC} ${CFLAGS} ${LDFLAGS} -static -o ${PN} gpio.c
+}
+
+do_install() {
+ install -d ${D}${sbindir}
+ install -m 0755 ${PN} ${D}${sbindir}
+}
diff --git a/packages/samsung-soc-utils/s3c64xx-gpio_svn.bb b/packages/samsung-soc-utils/s3c64xx-gpio_svn.bb
new file mode 100644
index 0000000000..92110691cf
--- /dev/null
+++ b/packages/samsung-soc-utils/s3c64xx-gpio_svn.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "A user-space tool to show and modify the state of GPIOs on the S3c64xx platform"
+SECTION = "console/utils"
+AUTHOR = "Werner Almesberger <werner@openmoko.org>"
+LICENSE = "GPL"
+PV = "1.0+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;proto=http"
+S = "${WORKDIR}/gpio"
+
+do_compile() {
+ ${CC} ${CFLAGS} ${LDFLAGS} -static -o ${PN} gpio-s3c6410.c
+}
+
+do_install() {
+ install -d ${D}${sbindir}
+ install -m 0755 ${PN} ${D}${sbindir}
+}
diff --git a/packages/samsung-soc-utils/sjf2410-linux-native_svn.bb b/packages/samsung-soc-utils/sjf2410-linux-native_svn.bb
new file mode 100644
index 0000000000..fcfbba923d
--- /dev/null
+++ b/packages/samsung-soc-utils/sjf2410-linux-native_svn.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "JTAG utility to interface w/ a S3C2410 device"
+SECTION = "devel"
+AUTHOR = "Harald Welte <laforge@openmoko.org>"
+LICENSE = "GPL"
+PV = "0.1+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;proto=https"
+S = "${WORKDIR}/sjf2410-linux"
+
+inherit native
+
+CFLAGS += "-DLINUX_PPDEV"
+
+do_compile() {
+ oe_runmake
+}
+
+do_deploy() {
+ install -d ${DEPLOY_DIR_TOOLS}
+ install -m 0755 sjf2410 ${DEPLOY_DIR_TOOLS}/sjf2410-${PV}
+}
+
+do_stage() {
+ :
+}
+
+do_install() {
+ :
+}
+
+addtask deploy before do_package after do_install
--
cgit v1.2.3
From e0890f15eea858e7eb1e6e7c17c1b34ad8126c72 Mon Sep 17 00:00:00 2001
From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Date: Thu, 5 Mar 2009 01:55:15 +0100
Subject: angstrom-{2008.1|2007-for-openmoko}: remove my name
---
conf/distro/angstrom-2008.1.conf | 1 -
conf/distro/include/angstrom-2007-for-openmoko.inc | 1 -
2 files changed, 2 deletions(-)
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 27545cebde..cde01e155f 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -3,7 +3,6 @@
#@NAME: Angstrom <http://www.angstrom-distribution.org>
#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices
#@MAINTAINER: Koen Kooi <koen@openembedded.org>
-#@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille-media.de>
#@--------------------------------------------------------------------
# This is a aimed to be the next stable angstrom release.
diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc
index 5675e75723..daf4dd01bb 100644
--- a/conf/distro/include/angstrom-2007-for-openmoko.inc
+++ b/conf/distro/include/angstrom-2007-for-openmoko.inc
@@ -3,7 +3,6 @@
#@NAME: Angstrom <http://www.angstrom-distribution.org>
#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices
#@MAINTAINER: Koen Kooi <koen@openembedded.org>
-#@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de>
#@--------------------------------------------------------------------
DISTRO_VERSION = "2007.11RC3"
--
cgit v1.2.3