From b50f52ea84fac8ad1ca6400e4ed3f810951c639f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 10 Oct 2007 09:39:14 +0000 Subject: angstrom images: rename, it's safe now since reenoo stopped sending me hatemail --- packages/angstrom/altboot-console-image.bb | 6 +++++ packages/angstrom/altboot-x11-image.bb | 4 +++ .../angstrom/angstrom-altboot-console-image.bb | 6 ----- packages/angstrom/angstrom-altboot-x11-image.bb | 4 --- packages/angstrom/angstrom-bootmanager-image.bb | 11 -------- packages/angstrom/angstrom-console-image.bb | 18 ------------- packages/angstrom/angstrom-gateway-image.bb | 20 --------------- packages/angstrom/angstrom-mokogateway-image.bb | 17 ------------ packages/angstrom/angstrom-x11-gpe-image.bb | 26 ------------------- packages/angstrom/angstrom-x11-image.bb | 22 ---------------- packages/angstrom/angstrom-x11-office-image.bb | 30 ---------------------- packages/angstrom/angstrom-x11-pimlico-image.bb | 26 ------------------- packages/angstrom/bootmanager-image.bb | 11 ++++++++ packages/angstrom/console-image.bb | 18 +++++++++++++ packages/angstrom/gateway-image.bb | 20 +++++++++++++++ packages/angstrom/mokogateway-image.bb | 17 ++++++++++++ packages/angstrom/x11-gpe-image.bb | 26 +++++++++++++++++++ packages/angstrom/x11-image.bb | 22 ++++++++++++++++ packages/angstrom/x11-office-image.bb | 30 ++++++++++++++++++++++ packages/angstrom/x11-pimlico-image.bb | 26 +++++++++++++++++++ 20 files changed, 180 insertions(+), 180 deletions(-) create mode 100644 packages/angstrom/altboot-console-image.bb create mode 100644 packages/angstrom/altboot-x11-image.bb delete mode 100644 packages/angstrom/angstrom-altboot-console-image.bb delete mode 100644 packages/angstrom/angstrom-altboot-x11-image.bb delete mode 100644 packages/angstrom/angstrom-bootmanager-image.bb delete mode 100644 packages/angstrom/angstrom-console-image.bb delete mode 100644 packages/angstrom/angstrom-gateway-image.bb delete mode 100644 packages/angstrom/angstrom-mokogateway-image.bb delete mode 100644 packages/angstrom/angstrom-x11-gpe-image.bb delete mode 100644 packages/angstrom/angstrom-x11-image.bb delete mode 100644 packages/angstrom/angstrom-x11-office-image.bb delete mode 100644 packages/angstrom/angstrom-x11-pimlico-image.bb create mode 100644 packages/angstrom/bootmanager-image.bb create mode 100644 packages/angstrom/console-image.bb create mode 100644 packages/angstrom/gateway-image.bb create mode 100644 packages/angstrom/mokogateway-image.bb create mode 100644 packages/angstrom/x11-gpe-image.bb create mode 100644 packages/angstrom/x11-image.bb create mode 100644 packages/angstrom/x11-office-image.bb create mode 100644 packages/angstrom/x11-pimlico-image.bb diff --git a/packages/angstrom/altboot-console-image.bb b/packages/angstrom/altboot-console-image.bb new file mode 100644 index 0000000000..32a1564afe --- /dev/null +++ b/packages/angstrom/altboot-console-image.bb @@ -0,0 +1,6 @@ +require angstrom-console-image.bb + +ANGSTROM_EXTRA_INSTALL += " altboot " + +export IMAGE_BASENAME = "altboot-console-image" + diff --git a/packages/angstrom/altboot-x11-image.bb b/packages/angstrom/altboot-x11-image.bb new file mode 100644 index 0000000000..ce3fd820c3 --- /dev/null +++ b/packages/angstrom/altboot-x11-image.bb @@ -0,0 +1,4 @@ +require angstrom-x11-image.bb + +ANGSTROM_EXTRA_INSTALL += " altboot " +export IMAGE_BASENAME = "altboot-x11-image" diff --git a/packages/angstrom/angstrom-altboot-console-image.bb b/packages/angstrom/angstrom-altboot-console-image.bb deleted file mode 100644 index 32a1564afe..0000000000 --- a/packages/angstrom/angstrom-altboot-console-image.bb +++ /dev/null @@ -1,6 +0,0 @@ -require angstrom-console-image.bb - -ANGSTROM_EXTRA_INSTALL += " altboot " - -export IMAGE_BASENAME = "altboot-console-image" - diff --git a/packages/angstrom/angstrom-altboot-x11-image.bb b/packages/angstrom/angstrom-altboot-x11-image.bb deleted file mode 100644 index ce3fd820c3..0000000000 --- a/packages/angstrom/angstrom-altboot-x11-image.bb +++ /dev/null @@ -1,4 +0,0 @@ -require angstrom-x11-image.bb - -ANGSTROM_EXTRA_INSTALL += " altboot " -export IMAGE_BASENAME = "altboot-x11-image" diff --git a/packages/angstrom/angstrom-bootmanager-image.bb b/packages/angstrom/angstrom-bootmanager-image.bb deleted file mode 100644 index d829590188..0000000000 --- a/packages/angstrom/angstrom-bootmanager-image.bb +++ /dev/null @@ -1,11 +0,0 @@ -#Angstrom bootmanager image - -DEPENDS = "task-angstrom" -IMAGE_INSTALL = "angstrom-base-depends angstrom-bootmanager" - -export IMAGE_BASENAME = "bootmanager-image" - -inherit image - - - diff --git a/packages/angstrom/angstrom-console-image.bb b/packages/angstrom/angstrom-console-image.bb deleted file mode 100644 index 1684716187..0000000000 --- a/packages/angstrom/angstrom-console-image.bb +++ /dev/null @@ -1,18 +0,0 @@ -#Angstrom bootstrap image - -ANGSTROM_EXTRA_INSTALL ?= "" - -DEPENDS = "task-base-extended \ - ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \ - " - -IMAGE_INSTALL = "task-base-extended \ - ${ANGSTROM_EXTRA_INSTALL} \ - ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \ - " - -export IMAGE_BASENAME = "console-image" -IMAGE_LINGUAS = "" - -inherit image - diff --git a/packages/angstrom/angstrom-gateway-image.bb b/packages/angstrom/angstrom-gateway-image.bb deleted file mode 100644 index ee9d1d97fc..0000000000 --- a/packages/angstrom/angstrom-gateway-image.bb +++ /dev/null @@ -1,20 +0,0 @@ -#Angstrom gateway image -#gives you a gateway with SMB, ssh and dnsmasqs - -ANGSTROM_EXTRA_INSTALL ?= "" -DISTRO_SSH_DAEMON ?= "dropbear" - -IMAGE_INSTALL = "task-boot \ - ${DISTRO_SSH_DAEMON} \ - iptables \ - samba swat \ - dnsmasq \ -# vsftpd \ - angstrom-version \ - " - -export IMAGE_BASENAME = "gateway-image" -IMAGE_LINGUAS = "" - -inherit image - diff --git a/packages/angstrom/angstrom-mokogateway-image.bb b/packages/angstrom/angstrom-mokogateway-image.bb deleted file mode 100644 index a8c59f2075..0000000000 --- a/packages/angstrom/angstrom-mokogateway-image.bb +++ /dev/null @@ -1,17 +0,0 @@ -#Angstrom moko gateway image -# tries to be a companion for openmoko based phones - -ANGSTROM_EXTRA_INSTALL ?= "" - -DEPENDS = "task-base" -IMAGE_INSTALL = " \ - task-boot \ - task-base-bluetooth \ - bluez-utils \ - blueprobe \ - " -export IMAGE_BASENAME = "mokogateway-image" -IMAGE_LINGUAS = "" - -inherit image - diff --git a/packages/angstrom/angstrom-x11-gpe-image.bb b/packages/angstrom/angstrom-x11-gpe-image.bb deleted file mode 100644 index ffd401b6a8..0000000000 --- a/packages/angstrom/angstrom-x11-gpe-image.bb +++ /dev/null @@ -1,26 +0,0 @@ -#Angstrom X11 image, with apps and kernel modules included - -ANGSTROM_EXTRA_INSTALL += " \ - ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ - " -XSERVER ?= "xserver-kdrive-fbdev" - -export IMAGE_BASENAME = "x11-gpe-image" - -DEPENDS = "task-base" -IMAGE_INSTALL = "\ - ${XSERVER} \ - task-base-extended \ - angstrom-x11-base-depends \ - angstrom-gpe-task-base \ - angstrom-gpe-task-settings \ - kernel-modules \ - hal \ - angstrom-gpe-task-pim \ - ${ANGSTROM_EXTRA_INSTALL}" - - -#zap root password for release images -ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' - -inherit image diff --git a/packages/angstrom/angstrom-x11-image.bb b/packages/angstrom/angstrom-x11-image.bb deleted file mode 100644 index e430590a7f..0000000000 --- a/packages/angstrom/angstrom-x11-image.bb +++ /dev/null @@ -1,22 +0,0 @@ -#Angstrom X11 image - -ANGSTROM_EXTRA_INSTALL += " \ - ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ - " -XSERVER ?= "xserver-kdrive-fbdev" - -export IMAGE_BASENAME = "x11-image" - -DEPENDS = "task-base" -IMAGE_INSTALL = "\ - ${XSERVER} \ - task-base-extended \ - angstrom-x11-base-depends \ - angstrom-gpe-task-base \ - angstrom-gpe-task-settings \ - ${ANGSTROM_EXTRA_INSTALL}" - -#zap root password for release images -ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' - -inherit image diff --git a/packages/angstrom/angstrom-x11-office-image.bb b/packages/angstrom/angstrom-x11-office-image.bb deleted file mode 100644 index f9dcb8cf43..0000000000 --- a/packages/angstrom/angstrom-x11-office-image.bb +++ /dev/null @@ -1,30 +0,0 @@ -#Angstrom X11 image, with apps and kernel modules included - -ANGSTROM_EXTRA_INSTALL += " \ - ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ - " -XSERVER ?= "xserver-kdrive-fbdev" - -export IMAGE_BASENAME = "x11-office-image" - -DEPENDS = "task-base" -IMAGE_INSTALL = "\ - ${XSERVER} \ - task-base-extended \ - angstrom-x11-base-depends \ - angstrom-gpe-task-base \ - angstrom-gpe-task-settings \ - kernel-modules \ - hal \ - abiword \ - gnumeric \ - cups \ - claws-mail claws-mail claws-plugin-maildir claws-plugin-mailmbox claws-plugin-rssyl \ - midori minimo \ - gphoto2 \ - ${ANGSTROM_EXTRA_INSTALL}" - -#zap root password for release images -ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' - -inherit image diff --git a/packages/angstrom/angstrom-x11-pimlico-image.bb b/packages/angstrom/angstrom-x11-pimlico-image.bb deleted file mode 100644 index c7acedfa0d..0000000000 --- a/packages/angstrom/angstrom-x11-pimlico-image.bb +++ /dev/null @@ -1,26 +0,0 @@ -#Angstrom X11 image, with apps and kernel modules included - -ANGSTROM_EXTRA_INSTALL += " \ - ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ - " -XSERVER ?= "xserver-kdrive-fbdev" - -export IMAGE_BASENAME = "x11-pimlico-image" - -DEPENDS = "task-base" -IMAGE_INSTALL = "\ - ${XSERVER} \ - task-base-extended \ - angstrom-x11-base-depends \ - angstrom-gpe-task-base \ - angstrom-gpe-task-settings \ - kernel-modules \ - hal \ - angstrom-ohand-task-pim \ - ${ANGSTROM_EXTRA_INSTALL}" - - -#zap root password for release images -ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' - -inherit image diff --git a/packages/angstrom/bootmanager-image.bb b/packages/angstrom/bootmanager-image.bb new file mode 100644 index 0000000000..d829590188 --- /dev/null +++ b/packages/angstrom/bootmanager-image.bb @@ -0,0 +1,11 @@ +#Angstrom bootmanager image + +DEPENDS = "task-angstrom" +IMAGE_INSTALL = "angstrom-base-depends angstrom-bootmanager" + +export IMAGE_BASENAME = "bootmanager-image" + +inherit image + + + diff --git a/packages/angstrom/console-image.bb b/packages/angstrom/console-image.bb new file mode 100644 index 0000000000..1684716187 --- /dev/null +++ b/packages/angstrom/console-image.bb @@ -0,0 +1,18 @@ +#Angstrom bootstrap image + +ANGSTROM_EXTRA_INSTALL ?= "" + +DEPENDS = "task-base-extended \ + ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \ + " + +IMAGE_INSTALL = "task-base-extended \ + ${ANGSTROM_EXTRA_INSTALL} \ + ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \ + " + +export IMAGE_BASENAME = "console-image" +IMAGE_LINGUAS = "" + +inherit image + diff --git a/packages/angstrom/gateway-image.bb b/packages/angstrom/gateway-image.bb new file mode 100644 index 0000000000..ee9d1d97fc --- /dev/null +++ b/packages/angstrom/gateway-image.bb @@ -0,0 +1,20 @@ +#Angstrom gateway image +#gives you a gateway with SMB, ssh and dnsmasqs + +ANGSTROM_EXTRA_INSTALL ?= "" +DISTRO_SSH_DAEMON ?= "dropbear" + +IMAGE_INSTALL = "task-boot \ + ${DISTRO_SSH_DAEMON} \ + iptables \ + samba swat \ + dnsmasq \ +# vsftpd \ + angstrom-version \ + " + +export IMAGE_BASENAME = "gateway-image" +IMAGE_LINGUAS = "" + +inherit image + diff --git a/packages/angstrom/mokogateway-image.bb b/packages/angstrom/mokogateway-image.bb new file mode 100644 index 0000000000..a8c59f2075 --- /dev/null +++ b/packages/angstrom/mokogateway-image.bb @@ -0,0 +1,17 @@ +#Angstrom moko gateway image +# tries to be a companion for openmoko based phones + +ANGSTROM_EXTRA_INSTALL ?= "" + +DEPENDS = "task-base" +IMAGE_INSTALL = " \ + task-boot \ + task-base-bluetooth \ + bluez-utils \ + blueprobe \ + " +export IMAGE_BASENAME = "mokogateway-image" +IMAGE_LINGUAS = "" + +inherit image + diff --git a/packages/angstrom/x11-gpe-image.bb b/packages/angstrom/x11-gpe-image.bb new file mode 100644 index 0000000000..ffd401b6a8 --- /dev/null +++ b/packages/angstrom/x11-gpe-image.bb @@ -0,0 +1,26 @@ +#Angstrom X11 image, with apps and kernel modules included + +ANGSTROM_EXTRA_INSTALL += " \ + ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ + " +XSERVER ?= "xserver-kdrive-fbdev" + +export IMAGE_BASENAME = "x11-gpe-image" + +DEPENDS = "task-base" +IMAGE_INSTALL = "\ + ${XSERVER} \ + task-base-extended \ + angstrom-x11-base-depends \ + angstrom-gpe-task-base \ + angstrom-gpe-task-settings \ + kernel-modules \ + hal \ + angstrom-gpe-task-pim \ + ${ANGSTROM_EXTRA_INSTALL}" + + +#zap root password for release images +ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' + +inherit image diff --git a/packages/angstrom/x11-image.bb b/packages/angstrom/x11-image.bb new file mode 100644 index 0000000000..e430590a7f --- /dev/null +++ b/packages/angstrom/x11-image.bb @@ -0,0 +1,22 @@ +#Angstrom X11 image + +ANGSTROM_EXTRA_INSTALL += " \ + ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ + " +XSERVER ?= "xserver-kdrive-fbdev" + +export IMAGE_BASENAME = "x11-image" + +DEPENDS = "task-base" +IMAGE_INSTALL = "\ + ${XSERVER} \ + task-base-extended \ + angstrom-x11-base-depends \ + angstrom-gpe-task-base \ + angstrom-gpe-task-settings \ + ${ANGSTROM_EXTRA_INSTALL}" + +#zap root password for release images +ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' + +inherit image diff --git a/packages/angstrom/x11-office-image.bb b/packages/angstrom/x11-office-image.bb new file mode 100644 index 0000000000..f6a8d0af1d --- /dev/null +++ b/packages/angstrom/x11-office-image.bb @@ -0,0 +1,30 @@ +#Angstrom X11 image, with apps and kernel modules included + +ANGSTROM_EXTRA_INSTALL += " \ + ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ + " +XSERVER ?= "xserver-kdrive-fbdev" + +export IMAGE_BASENAME = "x11-office-image" + +DEPENDS = "task-base" +IMAGE_INSTALL = "\ + ${XSERVER} \ + task-base-extended \ + angstrom-x11-base-depends \ + angstrom-gpe-task-base \ + angstrom-gpe-task-settings \ + kernel-modules \ + hal \ + abiword \ + gnumeric \ + cups \ + claws-mail claws-mail claws-plugin-mailmbox claws-plugin-rssyl \ + midori minimo \ + gphoto2 \ + ${ANGSTROM_EXTRA_INSTALL}" + +#zap root password for release images +ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' + +inherit image diff --git a/packages/angstrom/x11-pimlico-image.bb b/packages/angstrom/x11-pimlico-image.bb new file mode 100644 index 0000000000..c7acedfa0d --- /dev/null +++ b/packages/angstrom/x11-pimlico-image.bb @@ -0,0 +1,26 @@ +#Angstrom X11 image, with apps and kernel modules included + +ANGSTROM_EXTRA_INSTALL += " \ + ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ + " +XSERVER ?= "xserver-kdrive-fbdev" + +export IMAGE_BASENAME = "x11-pimlico-image" + +DEPENDS = "task-base" +IMAGE_INSTALL = "\ + ${XSERVER} \ + task-base-extended \ + angstrom-x11-base-depends \ + angstrom-gpe-task-base \ + angstrom-gpe-task-settings \ + kernel-modules \ + hal \ + angstrom-ohand-task-pim \ + ${ANGSTROM_EXTRA_INSTALL}" + + +#zap root password for release images +ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' + +inherit image -- cgit v1.2.3