diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-04-27 16:28:30 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-04-30 10:06:29 +0200 |
commit | 8fe3d92f94147373e10ca7f41fc53462de9077a8 (patch) | |
tree | 0ae5baf2831972f97c47cf813d88c523f50f4abd /recipes/images/shr-image.inc | |
parent | a003dba3b4cc7ffb175c951bf1422cc7332d35ea (diff) |
shr-image: drop all tweaks
* they should really be applied in recipes where they belong
* one of reasons why reflashed image can behave different than older
after opkg upgrade
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/images/shr-image.inc')
-rw-r--r-- | recipes/images/shr-image.inc | 81 |
1 files changed, 6 insertions, 75 deletions
diff --git a/recipes/images/shr-image.inc b/recipes/images/shr-image.inc index 4668f155e4..160593b77f 100644 --- a/recipes/images/shr-image.inc +++ b/recipes/images/shr-image.inc @@ -30,88 +30,19 @@ IMAGE_INSTALL += "\ inherit image -# perform some SHR convenience tweaks to the rootfs -shr_rootfs_postprocess() { - dirs=`find ${FILESDIR} -type d -printf "%P\n" | grep -v "^.$" | grep -v ".git"` - for dir in $dirs; do - mkdir -p ${IMAGE_ROOTFS}/$dir - done - files=`find ${FILESDIR} -type f -printf "%P\n" | grep -v ".git"` - for file in $files; do - cp -f ${FILESDIR}/$file ${IMAGE_ROOTFS}/$file - done - - curdir=$PWD - cd ${IMAGE_ROOTFS} - # date/time - date "+%m%d%H%M%Y" >./etc/timestamp - # alias foo - echo "alias pico=nano" >>./etc/profile - echo "alias fso='cd /local/pkg/fso'" >>./etc/profile - echo "alias ipkg='opkg'" >>./etc/profile - # dns - echo "nameserver 208.67.222.222" >./etc/resolv.conf - echo "nameserver 208.67.220.220" >>./etc/resolv.conf - # nfs - mkdir -p ./local/pkg - echo >>./etc/fstab - echo "# NFS Host" >>./etc/fstab - echo "192.168.0.200:/local/pkg /local/pkg nfs noauto,nolock,soft,rsize=32768,wsize=32768 0 0" >>./etc/fstab - - # minimal gtk theme foo - # this should be set in postinst phase of installed gtk-theme package - #mkdir -p ./etc/gtk-2.0/ - #echo 'gtk-font-name = "Sans 5"' >> ./etc/gtk-2.0/gtkrc.default - #echo 'gtk-theme-name = "shr-theme-gtk-e17lookalike"' >> ./etc/gtk-2.0/gtkrc.default - #echo 'gtk-icon-theme-name = "openmoko-standard"' >> ./etc/gtk-2.0/gtkrc.default - #echo 'style "treeview"' >> ./etc/gtk-2.0/gtkrc.default - #echo '{ ' >> ./etc/gtk-2.0/gtkrc.default - #echo ' GtkTreeView::expander-size = 40' >> ./etc/gtk-2.0/gtkrc.default - #echo '}' >> ./etc/gtk-2.0/gtkrc.default - #echo 'widget_class "*TreeView*" style "treeview"' >> ./etc/gtk-2.0/gtkrc.default - #update-alternatives --install /etc/gtk-2.0/gtkrc gtk-theme /etc/gtk-2.0/gtkrc.default 1 - - # elementary theme foo - ELM_PROFILE_SCR=./etc/profile.d/elementary.sh - echo 'export ELM_ENGINE=x11' > ${ELM_PROFILE_SCR} - echo 'export ELM_THEME=gry' >> ${ELM_PROFILE_SCR} - echo 'export ELM_SCALE=2' >> ${ELM_PROFILE_SCR} - echo 'export ELM_FINGER_SIZE=70' >> ${ELM_PROFILE_SCR} - chmod +x ${ELM_PROFILE_SCR} - - echo '' >> ./etc/ld.so.conf - # fix strange iconv/gconf bug - ln -s libc.so.6 ./lib/libc.so - - #font cache optimization, persistent cache - sed -i "s/<cachedir>.*\/var\/cache\/\(.*\)<\/cachedir>/<cachedir>\/var\/local\/\1<\/cachedir>/g" ./etc/fonts/fonts.conf - - # Add some missing entries to the passwd and group file; but do so carefully - # since this will be fixed upstream at some point. - grep -q '^tss:' ./etc/passwd || echo 'tss:x:93:93:Linux TSS User:/bin:/bin/sh' >>./etc/passwd - grep -q '^scanner:' ./etc/group || echo 'scanner:*:91:' >>./etc/group - grep -q '^nvram:' ./etc/group || echo 'nvram:*:92:' >>./etc/group - grep -q '^tss:' ./etc/group || echo 'tss:*:93:' >>./etc/group - grep -q '^fuse:' ./etc/group || echo 'fuse:*:94:' >>./etc/group - grep -q '^kvm:' ./etc/group || echo 'kvm:*:95:' >>./etc/group - grep -q '^rdma:' ./etc/group || echo 'rdma:*:96:' >>./etc/group - - cd $curdir -} - shr_rootfs_gta02_postprocess() { curdir=$PWD - cd ${IMAGE_ROOTFS} cd ${IMAGE_ROOTFS}/boot ln -s uImage uImage-GTA02.bin + echo 'loglevel=1 quiet splash' > append-GTA02 cd $curdir } shr_rootfs_gta01_postprocess() { curdir=$PWD - cd ${IMAGE_ROOTFS} cd ${IMAGE_ROOTFS}/boot ln -s uImage uImage-GTA01.bin + echo 'loglevel=1 quiet splash' > append-GTA01 cd $curdir } @@ -120,8 +51,8 @@ IMAGE_CMD_jffs2 = "mv ${IMAGE_ROOTFS}/boot ${IMAGE_ROOTFS}-boot && mkfs.jffs2 -x IMAGE_CMD_ubi = "mv ${IMAGE_ROOTFS}/boot ${IMAGE_ROOTFS}-boot && echo \[ubifs\] > ubinize.cfg ; echo mode=ubi >> ubinize.cfg ; echo image=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs >> ubinize.cfg ; echo vol_id=0 >> ubinize.cfg ; echo vol_type=dynamic >> ubinize.cfg ; echo vol_name=${UBI_VOLNAME} >> ubinize.cfg ; echo vol_flags=autoresize >> ubinize.cfg;mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg && mv ${IMAGE_ROOTFS}-boot ${IMAGE_ROOTFS}/boot" IMAGE_CMD_ubifs = "mv ${IMAGE_ROOTFS}/boot ${IMAGE_ROOTFS}-boot && mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS} && mv ${IMAGE_ROOTFS}-boot ${IMAGE_ROOTFS}/boot" -ROOTFS_POSTPROCESS_COMMAND += " shr_rootfs_postprocess" -ROOTFS_POSTPROCESS_COMMAND += " install_linguas" +ROOTFS_POSTPROCESS_COMMAND += " rootfs_update_timestamp;" +ROOTFS_POSTPROCESS_COMMAND += " install_linguas;" -ROOTFS_POSTPROCESS_COMMAND_append_om-gta02 = ";shr_rootfs_gta02_postprocess" -ROOTFS_POSTPROCESS_COMMAND_append_om-gta01 = ";shr_rootfs_gta01_postprocess" +ROOTFS_POSTPROCESS_COMMAND_append_om-gta02 = " shr_rootfs_gta02_postprocess;" +ROOTFS_POSTPROCESS_COMMAND_append_om-gta01 = " shr_rootfs_gta01_postprocess;" |