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>

9 files changed, 6 insertions, 151 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;"
diff --git a/recipes/images/shr-image/boot/append-GTA02 b/recipes/images/shr-image/boot/append-GTA02
deleted file mode 100644
index 4901a091e7..0000000000
--- a/recipes/images/shr-image/boot/append-GTA02
+++ /dev/null
@@ -1,2 +0,0 @@
-loglevel=1 quiet splash 
-
diff --git a/recipes/images/shr-image/etc/htoprc b/recipes/images/shr-image/etc/htoprc
deleted file mode 100644
index e7bb5b7879..0000000000
--- a/recipes/images/shr-image/etc/htoprc
+++ /dev/null
@@ -1,21 +0,0 @@
-# Beware! This file is rewritten every time htop exits.
-# The parser is also very primitive, and not human-friendly.
-# (I know, it's in the todo list).
-fields=39 46 47 49 1 
-sort_key=46
-sort_direction=1
-hide_threads=0
-hide_kernel_threads=1
-hide_userland_threads=0
-shadow_other_users=0
-highlight_base_name=0
-highlight_megabytes=1
-tree_view=0
-header_margin=0
-detailed_cpu_time=1
-color_scheme=0
-delay=15
-left_meters=AllCPUs Memory 
-left_meter_modes=1 1 
-right_meters=Tasks LoadAverage Uptime 
-right_meter_modes=2 2 2
diff --git a/recipes/images/shr-image/etc/logrotate.d/50freesmartphone b/recipes/images/shr-image/etc/logrotate.d/50freesmartphone
deleted file mode 100644
index 2d3fb8196f..0000000000
--- a/recipes/images/shr-image/etc/logrotate.d/50freesmartphone
+++ /dev/null
@@ -1,11 +0,0 @@
-/var/log/frameworkd.log { 
-    rotate 5 
-    weekly 
-    compress 
-} 
-
-/var/log/ophonekitd.log { 
-    rotate 5 
-    weekly 
-    compress 
-} 
diff --git a/recipes/images/shr-image/etc/profile.d/elementary.sh b/recipes/images/shr-image/etc/profile.d/elementary.sh
deleted file mode 100755
index da435964a7..0000000000
--- a/recipes/images/shr-image/etc/profile.d/elementary.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-export ELM_ENGINE=x11
-export ELM_THEME=default
-export ELM_SCALE=2
-export ELM_FINGER_SIZE=70
diff --git a/recipes/images/shr-lite-image/boot/append-GTA02 b/recipes/images/shr-lite-image/boot/append-GTA02
deleted file mode 100644
index 4901a091e7..0000000000
--- a/recipes/images/shr-lite-image/boot/append-GTA02
+++ /dev/null
@@ -1,2 +0,0 @@
-loglevel=1 quiet splash 
-
diff --git a/recipes/images/shr-lite-image/etc/htoprc b/recipes/images/shr-lite-image/etc/htoprc
deleted file mode 100644
index e7bb5b7879..0000000000
--- a/recipes/images/shr-lite-image/etc/htoprc
+++ /dev/null
@@ -1,21 +0,0 @@
-# Beware! This file is rewritten every time htop exits.
-# The parser is also very primitive, and not human-friendly.
-# (I know, it's in the todo list).
-fields=39 46 47 49 1 
-sort_key=46
-sort_direction=1
-hide_threads=0
-hide_kernel_threads=1
-hide_userland_threads=0
-shadow_other_users=0
-highlight_base_name=0
-highlight_megabytes=1
-tree_view=0
-header_margin=0
-detailed_cpu_time=1
-color_scheme=0
-delay=15
-left_meters=AllCPUs Memory 
-left_meter_modes=1 1 
-right_meters=Tasks LoadAverage Uptime 
-right_meter_modes=2 2 2
diff --git a/recipes/images/shr-lite-image/etc/logrotate.d/50freesmartphone b/recipes/images/shr-lite-image/etc/logrotate.d/50freesmartphone
deleted file mode 100644
index 2d3fb8196f..0000000000
--- a/recipes/images/shr-lite-image/etc/logrotate.d/50freesmartphone
+++ /dev/null
@@ -1,11 +0,0 @@
-/var/log/frameworkd.log { 
-    rotate 5 
-    weekly 
-    compress 
-} 
-
-/var/log/ophonekitd.log { 
-    rotate 5 
-    weekly 
-    compress 
-} 
diff --git a/recipes/images/shr-lite-image/etc/profile.d/elementary.sh b/recipes/images/shr-lite-image/etc/profile.d/elementary.sh
deleted file mode 100755
index da435964a7..0000000000
--- a/recipes/images/shr-lite-image/etc/profile.d/elementary.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-export ELM_ENGINE=x11
-export ELM_THEME=default
-export ELM_SCALE=2
-export ELM_FINGER_SIZE=70