summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/angstrom-2007.1.conf4
-rw-r--r--conf/distro/include/preferred-xorg-versions.inc111
-rw-r--r--conf/distro/include/slugos.inc2
-rw-r--r--conf/machine/akita.conf4
-rw-r--r--conf/machine/c7x0.conf4
-rw-r--r--conf/machine/include/poodle-2.6.conf2
-rw-r--r--conf/machine/include/zaurus-2.6.inc (renamed from conf/machine/include/zaurus-2.6.conf)27
-rw-r--r--conf/machine/include/zaurus-clamshell.inc (renamed from conf/machine/include/zaurus-clamshell.conf)0
-rw-r--r--conf/machine/poodle.conf2
-rw-r--r--conf/machine/spitz.conf4
-rw-r--r--conf/machine/tosa.conf2
11 files changed, 150 insertions, 12 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index e83ef90280..0ef38f2f86 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -233,7 +233,7 @@ PREFERRED_VERSION_wpa-supplicant = "0.5.5"
#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
require conf/distro/include/preferred-gpe-versions-2.8.inc
require conf/distro/include/preferred-e-versions.inc
-require conf/distro/include/preferred-xorg-versions-X11R7.2.inc
+require conf/distro/include/preferred-xorg-versions.inc
# Virtuals:
@@ -261,7 +261,7 @@ PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules"
PREFERRED_PROVIDER_virtual/db ?= "db"
PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
diff --git a/conf/distro/include/preferred-xorg-versions.inc b/conf/distro/include/preferred-xorg-versions.inc
new file mode 100644
index 0000000000..0681b01d3d
--- /dev/null
+++ b/conf/distro/include/preferred-xorg-versions.inc
@@ -0,0 +1,111 @@
+PREFERRED_VERSION_applewmproto = "1.0.3"
+PREFERRED_VERSION_bigreqsproto = "1.0.2"
+PREFERRED_VERSION_bigreqsproto-native = "1.0.2"
+PREFERRED_VERSION_compositeproto = "0.4"
+PREFERRED_VERSION_damageproto = "1.1.0"
+PREFERRED_VERSION_diet-x11 = "1.1.2"
+PREFERRED_VERSION_dmxproto = "2.2.2"
+PREFERRED_VERSION_evieext = "1.0.2"
+PREFERRED_VERSION_fixesproto = "4.0"
+PREFERRED_VERSION_fontcacheproto = "0.1.2"
+PREFERRED_VERSION_fontcacheproto-native = "0.1.2"
+PREFERRED_VERSION_fontsproto = "2.0.2"
+PREFERRED_VERSION_fontsproto-native = "2.0.2"
+PREFERRED_VERSION_gccmakedep = "1.0.2"
+PREFERRED_VERSION_glproto = "1.4.8"
+PREFERRED_VERSION_imake = "1.0.2"
+PREFERRED_VERSION_inputproto = "1.4.2"
+PREFERRED_VERSION_inputproto-native = "1.4.1"
+PREFERRED_VERSION_kbproto = "1.0.3"
+PREFERRED_VERSION_kbproto-native = "1.0.2"
+PREFERRED_VERSION_libapplewm = "1.0.0"
+PREFERRED_VERSION_libdmx = "1.0.2"
+PREFERRED_VERSION_libfontenc = "1.0.4"
+PREFERRED_VERSION_libfontenc-native = "1.0.4"
+PREFERRED_VERSION_libfs = "1.0.0"
+PREFERRED_VERSION_libice = "1.0.3"
+PREFERRED_VERSION_liblbxutil = "1.0.1"
+PREFERRED_VERSION_liboldx = "1.0.1"
+PREFERRED_VERSION_libsm = "1.0.3"
+PREFERRED_VERSION_libwindowswm = "1.0.0"
+PREFERRED_VERSION_libx11 = "1.1.2"
+PREFERRED_VERSION_libx11-native = "1.0.1"
+PREFERRED_VERSION_libxau = "1.0.3"
+PREFERRED_VERSION_libxau-native = "1.0.3"
+PREFERRED_VERSION_libxaw = "1.0.3"
+PREFERRED_VERSION_libxcomposite = "0.4.0"
+PREFERRED_VERSION_libxcursor = "1.1.8"
+PREFERRED_VERSION_libxdamage = "1.1.1"
+PREFERRED_VERSION_libxdmcp = "1.0.2"
+PREFERRED_VERSION_libxdmcp-native = "1.0.2"
+PREFERRED_VERSION_libxevie = "1.0.2"
+PREFERRED_VERSION_libxext = "1.0.3"
+PREFERRED_VERSION_libxfixes = "4.0.3"
+PREFERRED_VERSION_libxfont = "1.3.0"
+PREFERRED_VERSION_libxfont-native = "1.3.0"
+PREFERRED_VERSION_libxfontcache = "1.0.4"
+PREFERRED_VERSION_libxft = "2.1.12"
+PREFERRED_VERSION_libxi = "1.1.2"
+PREFERRED_VERSION_libxinerama = "1.0.2"
+PREFERRED_VERSION_libxkbfile = "1.0.4"
+PREFERRED_VERSION_libxkbui = "1.0.2"
+PREFERRED_VERSION_libxmu = "1.0.3"
+PREFERRED_VERSION_libxp = "1.0.0"
+PREFERRED_VERSION_libxpm = "3.5.6"
+PREFERRED_VERSION_libxprintapputil = "1.0.1"
+PREFERRED_VERSION_libxprintutil = "1.0.1"
+PREFERRED_VERSION_libxrandr = "1.2.1"
+PREFERRED_VERSION_libxrender = "0.9.2"
+PREFERRED_VERSION_libxres = "1.0.3"
+PREFERRED_VERSION_libxscrnsaver = "1.1.2"
+PREFERRED_VERSION_libxt = "1.0.5"
+PREFERRED_VERSION_libxtrap = "1.0.0"
+PREFERRED_VERSION_libxtst = "1.0.2"
+PREFERRED_VERSION_libxv = "1.0.3"
+PREFERRED_VERSION_libxvmc = "1.0.4"
+PREFERRED_VERSION_libxxf86dga = "1.0.1"
+PREFERRED_VERSION_libxxf86misc = "1.0.1"
+PREFERRED_VERSION_libxxf86vm = "1.0.1"
+PREFERRED_VERSION_lndir = "1.0.1"
+PREFERRED_VERSION_makedepend = "1.0.1"
+PREFERRED_VERSION_makedepend-native = "1.0.1"
+PREFERRED_VERSION_printproto = "1.0.3"
+PREFERRED_VERSION_randrproto = "1.2.1"
+PREFERRED_VERSION_recordproto = "1.13.2"
+PREFERRED_VERSION_renderproto = "0.9.2"
+PREFERRED_VERSION_resourceproto = "1.0.2"
+PREFERRED_VERSION_scrnsaverproto = "1.1.0"
+PREFERRED_VERSION_trapproto = "3.4.3"
+PREFERRED_VERSION_util-macros = "1.1.5"
+PREFERRED_VERSION_util-macros-native = "1.1.5"
+PREFERRED_VERSION_videoproto = "2.2.2"
+PREFERRED_VERSION_windowswmproto = "1.0.3"
+PREFERRED_VERSION_xauth = "1.0.2"
+PREFERRED_VERSION_xcmiscproto = "1.1.2"
+PREFERRED_VERSION_xcmiscproto-native = "1.1.2"
+PREFERRED_VERSION_xdpyinfo = "1.0.2"
+PREFERRED_VERSION_xextproto = "7.0.2"
+PREFERRED_VERSION_xextproto-native = "7.0.2"
+PREFERRED_VERSION_xf86bigfontproto = "1.1.2"
+PREFERRED_VERSION_xf86bigfontproto-native = "1.1.2"
+PREFERRED_VERSION_xf86dgaproto = "2.0.2"
+PREFERRED_VERSION_xf86driproto = "2.0.3"
+PREFERRED_VERSION_xf86miscproto = "0.9.2"
+PREFERRED_VERSION_xf86rushproto = "1.1.2"
+PREFERRED_VERSION_xf86vidmodeproto = "2.2.2"
+PREFERRED_VERSION_xhost = "1.0.2"
+PREFERRED_VERSION_xineramaproto = "1.1.2"
+PREFERRED_VERSION_xmodmap = "1.0.2"
+PREFERRED_VERSION_xorg-cf-files = "1.0.2"
+PREFERRED_VERSION_xproto = "7.0.10"
+PREFERRED_VERSION_xproto-native = "7.0.10"
+PREFERRED_VERSION_xproxymanagementprotocol = "1.0.2"
+PREFERRED_VERSION_xrandr = "1.2.2"
+PREFERRED_VERSION_xrdb = "1.0.3"
+PREFERRED_VERSION_xserver-kdrive = "1.3.0.0"
+PREFERRED_VERSION_xserver-xorg = "1.1.0"
+PREFERRED_VERSION_xset = "1.0.2"
+PREFERRED_VERSION_xtrans = "1.0.3"
+PREFERRED_VERSION_xtrans-native = "1.0.3"
+PREFERRED_VERSION_xinit = "1.0.4"
+PREFERRED_VERSION_xev = "1.0.2"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index bb1605e41b..00b9440b1f 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -16,7 +16,7 @@
#TARGET_OS "linux" or "linux-uclibc"
# The following may be overridden to make sub-versions
-SLUGOS_VERSION = "4.4"
+SLUGOS_VERSION = "4.5"
DISTRO_REVISION ?= ""
DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
# For release (only):
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index fad73c53bf..de94f560f9 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -2,8 +2,8 @@
#@NAME: Sharp Zaurus SL-C1000
#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
-require conf/machine/include/zaurus-2.6.conf
-require conf/machine/include/zaurus-clamshell.conf
+require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus-clamshell.inc
PACKAGE_EXTRA_ARCHS += "iwmmxt"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 098d0526f0..6862a8095f 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -2,8 +2,8 @@
#@NAME: Sharp Zaurus SL-C7x0
#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
-require conf/machine/include/zaurus-2.6.conf
-require conf/machine/include/zaurus-clamshell.conf
+require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus-clamshell.inc
IMAGE_FSTYPES ?= "jffs2"
diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf
index 01a06b7c27..fa24a3281b 100644
--- a/conf/machine/include/poodle-2.6.conf
+++ b/conf/machine/include/poodle-2.6.conf
@@ -1 +1 @@
-require conf/machine/include/zaurus-2.6.conf
+require conf/machine/include/zaurus-2.6.inc
diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.inc
index ada838f0d6..a9702cfce2 100644
--- a/conf/machine/include/zaurus-2.6.conf
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -40,3 +40,30 @@ MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
GUI_MACHINE_CLASS = "bigscreen"
GUI_MACHINE_CLASS_poodle = "smallscreen"
+
+MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
+
+zaurus_make_installkit () {
+ cd ${DEPLOY_DIR_IMAGE}
+ rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+ mkdir ${IMAGE_NAME}-installkit/
+
+ # Get the latest kernel using the zImage-<machine>.bin symlink
+ cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
+
+ if [ "${MACHINE}" = "spitz" ]; then
+ cp gnu-tar ${IMAGE_NAME}-installkit/
+ cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz
+ else
+ cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
+ fi
+
+ # All zaurus machines except collie need updater.sh
+ if [ "${MACHINE}" != "collie" ]; then
+ cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
+ fi
+
+ tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/
+ md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
+ rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+}
diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.inc
index f66502eff1..f66502eff1 100644
--- a/conf/machine/include/zaurus-clamshell.conf
+++ b/conf/machine/include/zaurus-clamshell.inc
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index a548f513d3..eee1edd53e 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -2,6 +2,6 @@
#@NAME: Sharp Zaurus SL-B500, Sharp Zaurus SL-5600
#@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices
-require conf/machine/include/zaurus-2.6.conf
+require conf/machine/include/zaurus-2.6.inc
ROOT_FLASH_SIZE = "22"
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 81c789dcc4..3199065606 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -2,8 +2,8 @@
#@NAME: Sharp Zaurus SL-C3000
#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device
-require conf/machine/include/zaurus-2.6.conf
-require conf/machine/include/zaurus-clamshell.conf
+require conf/machine/include/zaurus-2.6.inc
+require conf/machine/include/zaurus-clamshell.inc
PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index ddaf6e03c9..83227ee0c4 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -2,7 +2,7 @@
#@NAME: Sharp Zaurus SL-6000
#@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device
-require conf/machine/include/zaurus-2.6.conf
+require conf/machine/include/zaurus-2.6.inc
# newer kernels does not build
PREFERRED_VERSION_linux-rp = "2.6.17"
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-04 19:14:18 +0000