diff options
| author | John Lee <john_lee@openmoko.org> | 2008-03-07 12:40:47 +0000 |
|---|---|---|
| committer | John Lee <john_lee@openmoko.org> | 2008-03-07 12:40:47 +0000 |
| commit | b781aba534b1c5ba47a00fe9e2caaf8743536100 (patch) | |
| tree | 2f6d5f780d0aeea2118ca212bb905d445313ee95 /packages/images | |
| parent | bd4028cfd4a24a0c5875e7445bb115619830b947 (diff) | |
| parent | e906546390539db91733531aa8007a59fcc3b60f (diff) | |
merge of '211b2bf7086145ba83e7b54cebded9bb3025b075'
and 'cb58be96e7128aa032b10e0b9d369ca6f59af487'
Diffstat (limited to 'packages/images')
| -rw-r--r-- | packages/images/initramfs-bootmenu-image.bb | 3 | ||||
| -rw-r--r-- | packages/images/moko-underground-image.bb | 31 | ||||
| -rw-r--r-- | packages/images/unslung-image.bb | 2 |
3 files changed, 16 insertions, 20 deletions
diff --git a/packages/images/initramfs-bootmenu-image.bb b/packages/images/initramfs-bootmenu-image.bb index 6a4974fa9d..dd4f4d8ef6 100644 --- a/packages/images/initramfs-bootmenu-image.bb +++ b/packages/images/initramfs-bootmenu-image.bb @@ -4,9 +4,12 @@ IMAGE_INSTALL = "busybox-static initramfs-module-bootmenu initramfs-module-check-modules initramfs-module-kexecboot" IMAGE_LINGUAS = "" + # Remove any kernel-image that the kernel-module-* packages may have pulled in. PACKAGE_REMOVE = "kernel-image-* update-modules module-init-tools-depmod uclibc update-rc.d" ROOTFS_POSTPROCESS_COMMAND += "ipkg-cl ${IPKG_ARGS} -force-depends \ remove ${PACKAGE_REMOVE};" +IMAGE_FSTYPES += " cpio.gz " + inherit image diff --git a/packages/images/moko-underground-image.bb b/packages/images/moko-underground-image.bb index f86fcfba58..5752ce6037 100644 --- a/packages/images/moko-underground-image.bb +++ b/packages/images/moko-underground-image.bb @@ -4,38 +4,31 @@ IMAGE_LINGUAS = "" +ADD_INSTALL = "\ + fontconfig-utils \ + \ + ttf-dejavu-common \ + ttf-dejavu-sans \ + ttf-dejavu-serif \ + \ +" + + IMAGE_INSTALL = "\ ${MACHINE_TASK_PROVIDER} \ - task-base \ netbase \ sysfsutils \ - modutils-initscripts \ module-init-tools-depmod \ rsync \ screen \ fbset \ fbset-modes \ \ - matchbox-wm \ - ${XSERVER} \ - xserver-kdrive-common \ - xserver-nodm-init \ - xauth \ - xhost \ - xset \ - xrandr \ - \ - gsm0710muxd \ - pyneod \ - pyneog \ -" - -DEPENDS = "\ - ${MACHINE_TASK_PROVIDER} \ task-pyneo \ + \ + ${ADD_INSTALL} \ " - inherit image ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp' diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb index c258f4250a..cb2a20b75e 100644 --- a/packages/images/unslung-image.bb +++ b/packages/images/unslung-image.bb @@ -10,7 +10,7 @@ DEPENDS = "virtual/kernel \ ${UNSLUNG_EXTRA_DEPENDS}" IMAGE_INSTALL = "kernel update-modules unslung-rootfs \ - libc6-unslung slingbox ipkg libipkg \ + libc6-unslung slingbox ipkg libipkg libgcc \ kernel-module-netconsole \ ${UNSLUNG_EXTRA_INSTALL}" |