From: Kim Kibum Date: Sun, 29 Apr 2012 08:02:00 +0000 (+0900) Subject: upload tizen1.0 source X-Git-Tag: 2.0_alpha~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8f77984c146c848c3be7048d57a6aa37039e2268;p=adaptation%2Fsystem-plugin-slp.git upload tizen1.0 source --- diff --git a/bin/check-booting-mode.sh b/bin/check-booting-mode.sh new file mode 100755 index 0000000..4ec61dc --- /dev/null +++ b/bin/check-booting-mode.sh @@ -0,0 +1,13 @@ +#! /bin/sh +# Checking special mode booting. +# * Charging mode: Turn the phone on with the charger connection. +# * FOTA mode: Firmware update On-The-Air +# + +for i in `/bin/cat /proc/cmdline` ; do + echo $i + if [ "$i" = "charger_detect_boot" ] || [ "$i" = "fota_update_boot" ]; then + exit 0 + fi +done +exit 1 diff --git a/debian/changelog b/debian/changelog index 53fa76d..190b36e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +system-plugin-slp (0.0.1-6) unstable; urgency=low + + * Remove alsa scenario copy from rc.firstboot + + -- KwangHui Cho Fri, 16 Mar 2012 17:31:42 +0900 + system-plugin-slp (0.0.1-5) unstable; urgency=low * Modify license file diff --git a/debian/rules b/debian/rules index 05beb4b..5ea81dc 100755 --- a/debian/rules +++ b/debian/rules @@ -37,18 +37,19 @@ clean: rm -f $${f%.in}; \ done - dh_clean + dh_clean install: build dh_testdir dh_testroot - dh_clean -k + dh_clean -k dh_installdirs mkdir -p $(CURDIR)/debian/tmp$(PREFIX) mkdir -p debian/tmp/usr/share/system-plugin-slp cp -a $(CURDIR)/etc debian/tmp/usr/share/system-plugin-slp cp -a $(CURDIR)/usr debian/tmp + cp -a $(CURDIR)/bin debian/tmp cp -a $(CURDIR)/lib debian/tmp # Build architecture-independent files here. diff --git a/etc/fstab b/etc/fstab index 63d5d5d..82918cf 100755 --- a/etc/fstab +++ b/etc/fstab @@ -7,8 +7,9 @@ none /sys sysfs defaults 0 0 # For new partition - 2011/10/06 /dev/mmcblk0p1 /csa ext4 defaults 0 0 -/dev/mmcblk0p2 /boot ext4,vfat defaults 0 0 +/dev/mmcblk0p2 /boot ext4 defaults 0 0 /dev/mmcblk0p5 / ext4 defaults 0 0 /dev/mmcblk0p6 /opt ext4 defaults 0 0 /dev/mmcblk0p7 /mnt/csc ext4 defaults,noauto 0 0 /dev/mmcblk0p8 /opt/media vfat uid=0,gid=0,dmask=0000,fmask=0000,iocharset=iso8859-1,utf8,shortname=mixed 0 0 +/boot/modules.img /lib/modules ext4 loop 0 0 diff --git a/etc/fta_version.txt b/etc/fta_version.txt new file mode 100644 index 0000000..0a7cc87 --- /dev/null +++ b/etc/fta_version.txt @@ -0,0 +1,2 @@ +FTA HW VERSION : REV0.0 +FTA SW VERSION : TRAST.001 diff --git a/etc/mdev.conf b/etc/mdev.conf deleted file mode 100644 index 8376ef3..0000000 --- a/etc/mdev.conf +++ /dev/null @@ -1,22 +0,0 @@ -audio 0:5 0666 -console 0:5 0600 -controlC[0-9] 0:0 0660 @cp -R /dev/$MDEV /dev/snd/ -dsp 0:5 0666 -event[0-9] 0:0 0600 -fb 0:5 0666 -nfs 0:5 0770 -null 0:0 0777 -pcmC[0-1]D[0-9][a-z] 0:0 0660 @mv /dev/$MDEV /dev/snd/ -timer 0:0 0660 @mv /dev/$MDEV /dev/snd/ -rtc 0:0 0666 -tty 0:5 0660 -tty0* 0:5 0660 -tty1* 0:5 0660 -tty2* 0:5 0660 -tty3* 0:5 0660 -tty4* 0:5 0660 -tty5* 0:5 0660 -tty6* 0:5 0660 -ttyS* 0:5 0640 -urandom 0:0 0444 -zero 0:0 0666 diff --git a/etc/rc.d/rc.firstboot b/etc/rc.d/rc.firstboot index 87e7947..0700fc1 100755 --- a/etc/rc.d/rc.firstboot +++ b/etc/rc.d/rc.firstboot @@ -6,21 +6,8 @@ # for /etc/.info/system.info /bin/sysinfo -# Check 3-touchkey firmware -/lib/firmware/firmware_upgrade_touchkey.sh - ln -s /opt/etc/X11/xorg.conf.d.default /opt/etc/X11/xorg.conf.d -# Copy alsa scenario file for sound path temporary -if [ ! -e /opt/etc/sound ]; then - mkdir -p /opt/etc/sound -fi -cp -r /usr/share/ascenario/default /opt/etc/sound/default -cp -r /usr/share/ascenario/default.conf /opt/etc/sound/default.conf - -chown root:soundpath /opt/etc/sound/default.conf -chown -R root:soundpath /opt/etc/sound/default - if [ -e /opt/system/csc/.factoryreset ]; then rm -f /opt/system/csc/.factoryreset fi diff --git a/etc/rc.d/rc.sysinit b/etc/rc.d/rc.sysinit index 9f7c1f6..79353fc 100755 --- a/etc/rc.d/rc.sysinit +++ b/etc/rc.d/rc.sysinit @@ -20,14 +20,12 @@ mount -t tmpfs none /dev/shm mount -t devpts devpts /dev/pts mount -t debugfs none /sys/kernel/debug -echo -e "[${_G}prepare device node${C_}]" -if [ ! -e /dev/snd ]; then - mkdir /dev/snd -fi +mknod /dev/null c 1 3 + +echo -e "[${_G}udev start${C_}]" +/sbin/udevd --daemon +/sbin/udevadm trigger -mdev -s -mknod /dev/ttySAC1 c 204 65 # UART1 device node for GPS (requested by youngae.kang) -mknod /dev/ttySAC2 c 204 66 # check special booting mode. /bin/check-booting-mode.sh @@ -43,9 +41,17 @@ fi # mount mount -a -echo -e "[${_G}udev start${C_}]" -/sbin/udevd --daemon -/sbin/udevadm trigger --subsystem-match=iio +if [ ! -e /opt/etc/.firstboot ]; then + ext4_parts=`grep ext4 /etc/fstab | grep mmcblk0 | awk '{print $1};'` + for part in $ext4_parts; do + echo "resize $part" + resize2fs $part + done + echo -e "[${_Y}rc.firstboot${C_}]" + /etc/rc.d/rc.firstboot + touch /opt/etc/.firstboot + sync +fi echo -e "[${_G}create base directory in /opt, /var${C_}]" # construct directory hierarchy @@ -58,12 +64,6 @@ ln -s /opt/var/cache /var/cache # for apt mkdir -p /var/run -if [ ! -e /opt/etc/.firstboot ]; then - echo -e "[${_Y}rc.firstboot${C_}]" - /etc/rc.d/rc.firstboot - touch /opt/etc/.firstboot -fi - echo -e "[${_G}set device node perm & security${C_}]" # Set device node permissions for security chown 0:6501 /dev/video1 diff --git a/packaging/system-plugin-slp.spec b/packaging/system-plugin-slp.spec index c674256..4f07ec3 100755 --- a/packaging/system-plugin-slp.spec +++ b/packaging/system-plugin-slp.spec @@ -1,7 +1,7 @@ Name: system-plugin-slp Summary: system-plugin for Clean SDK Version: 0.0.1 -License: TO BE FILLED IN +License: Apache-2.0 Group: System/Base Release: 60 ExclusiveArch: %arm @@ -21,24 +21,21 @@ Startup files rm -rf %{buildroot} mkdir -p %{buildroot} -cp -a etc usr bin %{buildroot} - +cp -a etc usr bin lib %{buildroot} +%post +mkdir -p /lib/modules %files -/bin/change-booting-mode.sh /etc/fstab -/etc/init.d/csa-tools +/etc/fta_version.txt /etc/inittab -/etc/mdev.conf /etc/mtools.conf -/etc/rc.d/rc5.d/S99zzzbackup_csa /etc/rc.d/rc.firstboot /etc/rc.d/rc.shutdown /etc/rc.d/rc.sysinit -/usr/bin/mount_slp.sh /usr/bin/save_blenv +/bin/check-booting-mode.sh /lib/udev/rules.d/99-serial-console.rules /lib/systemd/system/mnt-csc.automount /lib/systemd/system/local-fs.target.wants/mnt-csc.automount -