diff options
| author | Richard Purdie <richard@openedhand.com> | 2005-09-15 09:49:09 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2005-09-15 09:49:09 +0000 |
| commit | 72d61f6fdd08a41b66554e05855e6043d8291344 (patch) | |
| tree | 02dac6afe342a60ab85dbc1fdbd344b3406310db | |
| parent | 6fa80cb0bfdea71e52f22fff010fb7691bea5af4 (diff) | |
| download | poky-72d61f6fdd08a41b66554e05855e6043d8291344.tar.gz | |
Remove avahi from the image until ipkg can handle it correctly. Tweak spitz kernel generation.
git-svn-id: https://svn.o-hand.com/repos/poky@23 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | openembedded/packages/linux/linux-openzaurus_2.6.13-mm1.bb | 2 | ||||
| -rw-r--r-- | openembedded/packages/meta/meta-oh.bb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/openembedded/packages/linux/linux-openzaurus_2.6.13-mm1.bb b/openembedded/packages/linux/linux-openzaurus_2.6.13-mm1.bb index e11e1fc8bc..3a5284e069 100644 --- a/openembedded/packages/linux/linux-openzaurus_2.6.13-mm1.bb +++ b/openembedded/packages/linux/linux-openzaurus_2.6.13-mm1.bb | |||
| @@ -143,7 +143,7 @@ COMPATIBLE_HOST = "arm.*-linux" | |||
| 143 | CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" | 143 | CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" |
| 144 | CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2 " | 144 | CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2 " |
| 145 | CMDLINE_ROOT_poodle = "root=/dev/mtdblock1 rootfstype=jffs2 " | 145 | CMDLINE_ROOT_poodle = "root=/dev/mtdblock1 rootfstype=jffs2 " |
| 146 | CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 " | 146 | CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rw " |
| 147 | 147 | ||
| 148 | ############################################################## | 148 | ############################################################## |
| 149 | # Configure memory/ramdisk split for collie | 149 | # Configure memory/ramdisk split for collie |
diff --git a/openembedded/packages/meta/meta-oh.bb b/openembedded/packages/meta/meta-oh.bb index b6e440b84a..152d3e2f78 100644 --- a/openembedded/packages/meta/meta-oh.bb +++ b/openembedded/packages/meta/meta-oh.bb | |||
| @@ -18,13 +18,13 @@ oh-task-base = "\ | |||
| 18 | xcursor-transparent-theme \ | 18 | xcursor-transparent-theme \ |
| 19 | xserver-kdrive-common \ | 19 | xserver-kdrive-common \ |
| 20 | gtk+ \ | 20 | gtk+ \ |
| 21 | avahi-daemon \ | ||
| 22 | avahi-dnsconfd \ | ||
| 23 | rxvt \ | 21 | rxvt \ |
| 24 | xhost \ | 22 | xhost \ |
| 25 | ttf-bitstream-vera \ | 23 | ttf-bitstream-vera \ |
| 26 | xauth" | 24 | xauth" |
| 27 | 25 | ||
| 26 | # avahi-daemon \ | ||
| 27 | # avahi-dnsconfd \ | ||
| 28 | # teleport \ | 28 | # teleport \ |
| 29 | # xst \ | 29 | # xst \ |
| 30 | # libgtkstylus \ | 30 | # libgtkstylus \ |
