diff options
Diffstat (limited to 'packages/angstrom')
| -rw-r--r-- | packages/angstrom/angstrom-bootmanager.bb | 2 | ||||
| -rw-r--r-- | packages/angstrom/angstrom-bootstrap-image.bb | 2 | ||||
| -rw-r--r-- | packages/angstrom/angstrom-gpe-image.bb | 8 | ||||
| -rw-r--r-- | packages/angstrom/angstrom-version.bb | 2 | ||||
| -rw-r--r-- | packages/angstrom/task-angstrom.bb | 40 |
5 files changed, 39 insertions, 15 deletions
diff --git a/packages/angstrom/angstrom-bootmanager.bb b/packages/angstrom/angstrom-bootmanager.bb index 3f7abe5c4b..a863256910 100644 --- a/packages/angstrom/angstrom-bootmanager.bb +++ b/packages/angstrom/angstrom-bootmanager.bb @@ -3,7 +3,7 @@ AUTHOR = "Michael 'Mickey' Lauer <mickey@Vanille.de>" MAINTAINER = "${AUTHOR}" SECTION = "base" DEPENDS = "evas-fb ecore-fb esmart-fb imlib2-fb edje efl++-fb" -RDEPENDS = "libefl++0" +#RDEPENDS = "libefl++0" ALLOW_EMPTY = "1" diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb index b2b5565eb6..88ace3c1ba 100644 --- a/packages/angstrom/angstrom-bootstrap-image.bb +++ b/packages/angstrom/angstrom-bootstrap-image.bb @@ -1,7 +1,7 @@ #Angstrom bootstrap image LICENSE = MIT MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" -PR = "r0" +PR = "r2" DEPENDS = "task-angstrom" RDEPENDS = "angstrom-base-depends" diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb index e6dc88dffb..4eea0ab1bb 100644 --- a/packages/angstrom/angstrom-gpe-image.bb +++ b/packages/angstrom/angstrom-gpe-image.bb @@ -1,12 +1,13 @@ #Angstrom GPE image LICENSE = MIT MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" -PR = "r1" +PR = "r3" PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" PREFERRED_PROVIDER_tslib ?= "tslib" PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" ANGSTROM_EXTRA_INSTALL ?= "" XSERVER ?= "xserver-kdrive-fbdev" @@ -18,7 +19,7 @@ RDEPENDS = "\ ${XSERVER} \ angstrom-base-depends \ angstrom-x11-base-depends \ - angsgrom-gpe-task-base \ + angstrom-gpe-task-base \ angstrom-gpe-task-settings \ angstrom-gpe-task-pim \ ${ANGSTROM_EXTRA_INSTALL}" @@ -26,6 +27,7 @@ RDEPENDS = "\ export IPKG_INSTALL = "${RDEPENDS}" -#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " +#zap root password for release images +ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' inherit image_ipk diff --git a/packages/angstrom/angstrom-version.bb b/packages/angstrom/angstrom-version.bb index f4322e06f1..34422da237 100644 --- a/packages/angstrom/angstrom-version.bb +++ b/packages/angstrom/angstrom-version.bb @@ -1,4 +1,4 @@ -MAINTAINER = "Koen Kooi <koen@handhelds.org>" +MAINTAINER = "Koen Kooi <koen@linuxtogo.org>" PV = ${DISTRO_VERSION} do_compile() { diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb index d050add3a5..c8c84c3e5e 100644 --- a/packages/angstrom/task-angstrom.bb +++ b/packages/angstrom/task-angstrom.bb @@ -1,18 +1,24 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r4" +PR = "r17" ALLOW_EMPTY = "1" +PACKAGE_ARCH = "${MACHINE_ARCH}" + BOOTMODULES_RRECOMMENDS ?= "" +DEBUG_APPS ?= "" +DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace gdb procps",d)}' +EXTRA_STUFF ?= "" +PCMCIA_MANAGER ?= "pcmciautils" PACKAGES = "\ angstrom-base-depends \ angstrom-base-wifi \ angstrom-x11-base-depends \ - angsgrom-gpe-task-base \ + angstrom-gpe-task-base \ angstrom-gpe-task-settings \ angstrom-gpe-task-pim \ angstrom-gpe-task-apps \ - angstgrom-gpe-task-games \ + angstrom-gpe-task-games \ angstrom-task-office \ angstrom-task-printing \ angstrom-task-sectest" @@ -22,15 +28,29 @@ RDEPENDS_angstrom-base-depends = "\ base-passwd tinylogin \ busybox \ udev \ - update-modules module-init-tools \ + update-modules module-init-tools modutils-initscripts \ sysvinit initscripts sysvinit-pidof \ netbase dropbear \ angstrom-version \ - ipkg \ - " + ipkg ipkg-collateral \ + wireless-tools \ + tslib-tests tslib-calibrate \ + util-linux-mount util-linux-umount \ + ${EXTRA_STUFF} \ + ${DEBUG_APPS} \ + ${PCMCIA_MANAGER} \ +" + +RDEPENDS_angstrom-base-depends_append_ipaq-pxa270 = " tiinit acx-firmware " + RRECOMMENDS_angstrom-base-depends = "\ ${BOOTMODULES_RRECOMMENDS} \ + kernel-module-evdev \ + kernel-module-uinput \ + kernel-module-g-ether \ + kernel-module-hostap-cs \ + kernel-module-af-packet \ " RDEPENDS_angstrom-base-wifi = "\ @@ -44,8 +64,11 @@ RDEPENDS_angstrom-base-wifi = "\ " RDEPENDS_angstrom-x11-base-depends := "\ - libx11 \ - virtual/xserver" + virtual/libx11 \ + virtual/xserver \ + ttf-dejavu-sans \ + ttf-dejavu-sans-mono \ + " RDEPENDS_angstrom-gpe-task-base := "\ matchbox \ @@ -56,7 +79,6 @@ RDEPENDS_angstrom-gpe-task-base := "\ xhost \ xrdb \ gpe-soundserver \ - ttf-dejavu \ gpe-dm \ gpe-login \ gpe-session-scripts \ |