diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-04-03 08:24:44 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-04-03 08:24:44 +0000 |
| commit | b285869f974288b9c4d3397df996239392994312 (patch) | |
| tree | f9df4dad7c7980401765e12b4155ee44b9e56ab3 | |
| parent | ec9aedf2932d5208e3a00fd3ec40942ffa32f797 (diff) | |
| parent | dbd10f28acdcd147b3ad6f6b9cbc7f688ead8b47 (diff) | |
merge of '5d9a3dbda7c7be2f89b97ce73d4362d2ca2a846e'
and 'c3a4380d6020add9c6a5ed01f5c9ae268d1aa541'
| -rw-r--r-- | conf/distro/generic.conf | 2 | ||||
| -rw-r--r-- | conf/machine/netvista.conf | 4 | ||||
| -rw-r--r-- | packages/xserver-common/xserver-common_1.16.bb | 18 |
3 files changed, 22 insertions, 2 deletions
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index 17d7d657b1..a9d667372f 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -25,7 +25,7 @@ INHERIT += "debian multimachine" # Packaging and output format # INHERIT += "package_ipk" -IMAGE_FSTYPES = "tar.gz ext2.gz jffs2" +IMAGE_FSTYPES ?= "tar.gz ext2.gz jffs2" # # Kernel diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index 25bf6649bd..65a797c680 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -7,6 +7,8 @@ TARGET_ARCH = "i486" # TARGET_VENDOR = "-oe" PACKAGE_EXTRA_ARCHS = "netvista" PREFERRED_PROVIDER_virtual/kernel = "linux-x86" +XSERVER = "xserver-kdrive-vesa" + # todo: convert to task-base # BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" @@ -14,7 +16,7 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" MACHINE_TASK_PROVIDER = "task-base" MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen keyboard irda apm alsa" -ROOT_FLASH_SIZE = "32" +ROOT_FLASH_SIZE = "64" GUI_MACHINE_CLASS = "bigscreen" udevdir = "/dev" diff --git a/packages/xserver-common/xserver-common_1.16.bb b/packages/xserver-common/xserver-common_1.16.bb new file mode 100644 index 0000000000..48320ba006 --- /dev/null +++ b/packages/xserver-common/xserver-common_1.16.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Common X11 scripts and support files" +LICENSE = "GPL" +SECTION = "x11" +RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" +PR = "r2" + +PACKAGE_ARCH = "all" + +# we are using a gpe-style Makefile +inherit gpe + +SRC_URI_append = " file://setDPI.sh \ + file://xserver-imageon.patch;patch=1 \ + file://calibrate-only-if-ts.patch;patch=1" + +do_install_append() { + install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" +} |