diff options
| author |   Koen Kooi <koen@openembedded.org> | 2009-04-21 15:50:09 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-04-21 15:50:09 +0200 |
| commit | d8f34cd4400e9f0e5b5b221be531690a00dd127e (patch) | |
| tree | 085676b4a1aa722060bb020d87b9693d2fc7842a | |
| parent | 7519258e82608c8c7c6c66ad749dc82644afe6b2 (diff) | |
| parent | 4b410d68f722775e8627c175d5c623e7a7f5c928 (diff) | |
| download | openembedded-d8f34cd4400e9f0e5b5b221be531690a00dd127e.tar.gz | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 2 | ||||
| -rw-r--r-- | recipes/base-passwd/files/hipox/root-home.patch | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index a26a98729a..4456927508 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -241,3 +241,5 @@ DISTRO_EXTRA_RRECOMMENDS += " \ " SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}' +ARM_INSTRUCTION_SET_pn-uclibc = "arm" +ARM_INSTRUCTION_SET_pn-uclibc-initial = "arm" diff --git a/recipes/base-passwd/files/hipox/root-home.patch b/recipes/base-passwd/files/hipox/root-home.patch new file mode 100644 index 0000000000..14960496fa --- /dev/null +++ b/recipes/base-passwd/files/hipox/root-home.patch @@ -0,0 +1,8 @@ +--- 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:D5wG08PcdvCQ.:0:0:root:/home/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 |