diff options
| author | Koen Kooi <koen@openembedded.org> | 2005-07-28 10:39:30 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-28 10:39:30 +0000 |
| commit | 2a59190121b4935e0ffae9f3972a395e93e15a5a (patch) | |
| tree | 2d908e8f5bd299ab694800560689fa5a32cfbff9 | |
| parent | 0a18998c76e3fd1822ab8a8ee9af603f378f9833 (diff) | |
| parent | 2cbbcd4672da6b992f2ee51cf9e66692ed8d290d (diff) | |
merge of 38c59f83153253c1fabaad0222e0d23afef45135
and b88b6c8b65aeead6d10de926c2e99ffbcd6ca5fe
| -rw-r--r-- | packages/inkscape/inkscape_0.42.bb | 2 | ||||
| -rw-r--r-- | packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/packages/inkscape/inkscape_0.42.bb b/packages/inkscape/inkscape_0.42.bb index b6fbcde316..e97d862812 100644 --- a/packages/inkscape/inkscape_0.42.bb +++ b/packages/inkscape/inkscape_0.42.bb @@ -1,3 +1,5 @@ +DEFAULT_PREFERENCE = "-1" + SECTION = "x11/utils" DESCRIPTION = "Inkscape is an SVG-based graphics editor featuring alpha \ blending, node editing, SVG to PNG export, and more. Its goal is for features \ diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb index 3aaed3b607..31c2b8fdf8 100644 --- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb +++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb @@ -56,11 +56,10 @@ inherit kernel CMDLINE_MTDPARTS_spitz = "mtdparts=sharpsl-nand:7168k@0k(smf),5120k@7168k(root),-(home)" CMDLINE_SHARP_spitz = "RTC_RESET=1 EQUIPMENT=4 LOGOLANG=1 DEFYEAR=2005 LOGO=1 LAUNCH=q" -CMDLINE_MTDPARTS_akita = "mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home)" -CMDLINE_SHARP_akita = "EQUIPMENT=0 LOGOLANG=1 DEFYEAR=2005 LOGO=1 LAUNCH=q" - -CMDLINE_ROOT = "root=/dev/mtdblock2 jffs2_orphaned_inodes=delete" -CMDLINE = "${CMDLINE_CONSOLE} ${CMDLINE_MTDPARTS} ${CMDLINE_ROOT} ${CMDLINE_SHARP}" +CMDLINE_ROOT = "root=/dev/mtdblock2 jffs2_orphaned_inodes=delete LOGOLANG=1 DEFYEAR=2006 LOGO=1 LAUNCH=q" +# CMDLINE_INIT = "init=/bin/busybox ash" +CMDLINE_INIT = " " +CMDLINE = "${CMDLINE_MTDPARTS} ${CMDLINE_ROOT} ${CMDLINE_CONSOLE} ${CMDLINE_INIT}" # # Compensate for sucky bootloader on all Sharp Zaurus models |