From fe1f0eb79c621452c2a897956a44bf7b92e882a4 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 28 Apr 2015 16:00:31 +0200 Subject: base-files: consolidate fstab/profile There are no more differences in fstab between machines, hence use the same common file. The default profile has some differences, however we can seperate them out and create a file which will be installed in profile.d. missing --- recipes/base-files/base-files/apalis-imx6/fstab | 14 -------- recipes/base-files/base-files/apalis-imx6/profile | 35 -------------------- recipes/base-files/base-files/apalis-t30/fstab | 14 -------- recipes/base-files/base-files/apalis-t30/profile | 38 ---------------------- recipes/base-files/base-files/colibri-imx6/fstab | 14 -------- recipes/base-files/base-files/colibri-imx6/profile | 35 -------------------- recipes/base-files/base-files/colibri-t20/fstab | 14 -------- recipes/base-files/base-files/colibri-t20/profile | 35 -------------------- recipes/base-files/base-files/colibri-t30/fstab | 14 -------- recipes/base-files/base-files/colibri-t30/profile | 38 ---------------------- recipes/base-files/base-files/colibri-vf/fstab | 14 -------- recipes/base-files/base-files/colibri-vf/profile | 35 -------------------- recipes/base-files/base-files/fstab | 14 ++++++++ recipes/base-files/base-files/profile | 35 ++++++++++++++++++++ .../base-files/base-files/tegra3/fw_unlock_mmc.sh | 6 ++++ recipes/base-files/base-files_3.0.14.bbappend | 9 ++++- 16 files changed, 63 insertions(+), 301 deletions(-) delete mode 100644 recipes/base-files/base-files/apalis-imx6/fstab delete mode 100644 recipes/base-files/base-files/apalis-imx6/profile delete mode 100644 recipes/base-files/base-files/apalis-t30/fstab delete mode 100644 recipes/base-files/base-files/apalis-t30/profile delete mode 100644 recipes/base-files/base-files/colibri-imx6/fstab delete mode 100644 recipes/base-files/base-files/colibri-imx6/profile delete mode 100644 recipes/base-files/base-files/colibri-t20/fstab delete mode 100644 recipes/base-files/base-files/colibri-t20/profile delete mode 100644 recipes/base-files/base-files/colibri-t30/fstab delete mode 100644 recipes/base-files/base-files/colibri-t30/profile delete mode 100644 recipes/base-files/base-files/colibri-vf/fstab delete mode 100644 recipes/base-files/base-files/colibri-vf/profile create mode 100644 recipes/base-files/base-files/fstab create mode 100644 recipes/base-files/base-files/profile create mode 100644 recipes/base-files/base-files/tegra3/fw_unlock_mmc.sh diff --git a/recipes/base-files/base-files/apalis-imx6/fstab b/recipes/base-files/base-files/apalis-imx6/fstab deleted file mode 100644 index 8c4880f..0000000 --- a/recipes/base-files/base-files/apalis-imx6/fstab +++ /dev/null @@ -1,14 +0,0 @@ -# stock fstab - you probably want to override this with a machine specific one - -/dev/root / auto defaults 1 1 -proc /proc proc defaults 0 0 -debugfs /sys/kernel/debug debugfs defaults 0 0 -devpts /dev/pts devpts mode=0620,gid=5 0 0 -usbfs /proc/bus/usb usbfs defaults 0 0 -tmpfs /var/volatile tmpfs defaults 0 0 -tmpfs /dev/shm tmpfs mode=0777 0 0 -tmpfs /media/ram tmpfs defaults 0 0 - -# uncomment this if your device has a SD/MMC/Transflash slot -#/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 - diff --git a/recipes/base-files/base-files/apalis-imx6/profile b/recipes/base-files/base-files/apalis-imx6/profile deleted file mode 100644 index c1ee240..0000000 --- a/recipes/base-files/base-files/apalis-imx6/profile +++ /dev/null @@ -1,35 +0,0 @@ -# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) -# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). - -PATH="/usr/local/bin:/usr/bin:/bin" -EDITOR="/bin/vi" # needed for packages like cron -test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc. - -if [ ! -e /etc/localtime ]; then - TZ="UTC" # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html - # for an explanation of how to set this to your local timezone. - export TZ -fi - -if [ "$HOME" = "/home/root" ]; then - PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin -fi -if [ "$PS1" ]; then -# works for bash and ash (no other shells known to be in use here) - PS1='\u@\h:\w\$ ' -fi - -if [ -d /etc/profile.d ]; then - for i in /etc/profile.d/* ; do - . $i - done - unset i -fi - -test -z "$DISPLAY" && DISPLAY=":0.0" # have the X display defined, unless it is already set, e.g. by a ssh connection -export DISPLAY - -export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM - -umask 022 - diff --git a/recipes/base-files/base-files/apalis-t30/fstab b/recipes/base-files/base-files/apalis-t30/fstab deleted file mode 100644 index 8c4880f..0000000 --- a/recipes/base-files/base-files/apalis-t30/fstab +++ /dev/null @@ -1,14 +0,0 @@ -# stock fstab - you probably want to override this with a machine specific one - -/dev/root / auto defaults 1 1 -proc /proc proc defaults 0 0 -debugfs /sys/kernel/debug debugfs defaults 0 0 -devpts /dev/pts devpts mode=0620,gid=5 0 0 -usbfs /proc/bus/usb usbfs defaults 0 0 -tmpfs /var/volatile tmpfs defaults 0 0 -tmpfs /dev/shm tmpfs mode=0777 0 0 -tmpfs /media/ram tmpfs defaults 0 0 - -# uncomment this if your device has a SD/MMC/Transflash slot -#/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 - diff --git a/recipes/base-files/base-files/apalis-t30/profile b/recipes/base-files/base-files/apalis-t30/profile deleted file mode 100644 index 8380341..0000000 --- a/recipes/base-files/base-files/apalis-t30/profile +++ /dev/null @@ -1,38 +0,0 @@ -# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) -# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). - -PATH="/usr/local/bin:/usr/bin:/bin" -EDITOR="/bin/vi" # needed for packages like cron -test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc. - -if [ ! -e /etc/localtime ]; then - TZ="UTC" # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html - # for an explanation of how to set this to your local timezone. - export TZ -fi - -if [ "$HOME" = "/home/root" ]; then - PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin -fi -if [ "$PS1" ]; then -# works for bash and ash (no other shells known to be in use here) - PS1='\u@\h:\w\$ ' -fi - -if [ -d /etc/profile.d ]; then - for i in /etc/profile.d/* ; do - . $i - done - unset i -fi - -test -z "$DISPLAY" && DISPLAY=":0.0" # have the X display defined, unless it is already set, e.g. by a ssh connection -export DISPLAY - -# temporary workaround to give fw_setenv mmcblk0boot1 write permissions -function fw_setenv() { echo 0 > /sys/block/mmcblk0boot1/force_ro; /sbin/fw_setenv "$@"; echo 1 > /sys/block/mmcblk0boot1/force_ro; } - -export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM - -umask 022 - diff --git a/recipes/base-files/base-files/colibri-imx6/fstab b/recipes/base-files/base-files/colibri-imx6/fstab deleted file mode 100644 index 8c4880f..0000000 --- a/recipes/base-files/base-files/colibri-imx6/fstab +++ /dev/null @@ -1,14 +0,0 @@ -# stock fstab - you probably want to override this with a machine specific one - -/dev/root / auto defaults 1 1 -proc /proc proc defaults 0 0 -debugfs /sys/kernel/debug debugfs defaults 0 0 -devpts /dev/pts devpts mode=0620,gid=5 0 0 -usbfs /proc/bus/usb usbfs defaults 0 0 -tmpfs /var/volatile tmpfs defaults 0 0 -tmpfs /dev/shm tmpfs mode=0777 0 0 -tmpfs /media/ram tmpfs defaults 0 0 - -# uncomment this if your device has a SD/MMC/Transflash slot -#/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 - diff --git a/recipes/base-files/base-files/colibri-imx6/profile b/recipes/base-files/base-files/colibri-imx6/profile deleted file mode 100644 index c1ee240..0000000 --- a/recipes/base-files/base-files/colibri-imx6/profile +++ /dev/null @@ -1,35 +0,0 @@ -# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) -# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). - -PATH="/usr/local/bin:/usr/bin:/bin" -EDITOR="/bin/vi" # needed for packages like cron -test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc. - -if [ ! -e /etc/localtime ]; then - TZ="UTC" # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html - # for an explanation of how to set this to your local timezone. - export TZ -fi - -if [ "$HOME" = "/home/root" ]; then - PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin -fi -if [ "$PS1" ]; then -# works for bash and ash (no other shells known to be in use here) - PS1='\u@\h:\w\$ ' -fi - -if [ -d /etc/profile.d ]; then - for i in /etc/profile.d/* ; do - . $i - done - unset i -fi - -test -z "$DISPLAY" && DISPLAY=":0.0" # have the X display defined, unless it is already set, e.g. by a ssh connection -export DISPLAY - -export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM - -umask 022 - diff --git a/recipes/base-files/base-files/colibri-t20/fstab b/recipes/base-files/base-files/colibri-t20/fstab deleted file mode 100644 index 8c4880f..0000000 --- a/recipes/base-files/base-files/colibri-t20/fstab +++ /dev/null @@ -1,14 +0,0 @@ -# stock fstab - you probably want to override this with a machine specific one - -/dev/root / auto defaults 1 1 -proc /proc proc defaults 0 0 -debugfs /sys/kernel/debug debugfs defaults 0 0 -devpts /dev/pts devpts mode=0620,gid=5 0 0 -usbfs /proc/bus/usb usbfs defaults 0 0 -tmpfs /var/volatile tmpfs defaults 0 0 -tmpfs /dev/shm tmpfs mode=0777 0 0 -tmpfs /media/ram tmpfs defaults 0 0 - -# uncomment this if your device has a SD/MMC/Transflash slot -#/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 - diff --git a/recipes/base-files/base-files/colibri-t20/profile b/recipes/base-files/base-files/colibri-t20/profile deleted file mode 100644 index c1ee240..0000000 --- a/recipes/base-files/base-files/colibri-t20/profile +++ /dev/null @@ -1,35 +0,0 @@ -# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) -# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). - -PATH="/usr/local/bin:/usr/bin:/bin" -EDITOR="/bin/vi" # needed for packages like cron -test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc. - -if [ ! -e /etc/localtime ]; then - TZ="UTC" # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html - # for an explanation of how to set this to your local timezone. - export TZ -fi - -if [ "$HOME" = "/home/root" ]; then - PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin -fi -if [ "$PS1" ]; then -# works for bash and ash (no other shells known to be in use here) - PS1='\u@\h:\w\$ ' -fi - -if [ -d /etc/profile.d ]; then - for i in /etc/profile.d/* ; do - . $i - done - unset i -fi - -test -z "$DISPLAY" && DISPLAY=":0.0" # have the X display defined, unless it is already set, e.g. by a ssh connection -export DISPLAY - -export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM - -umask 022 - diff --git a/recipes/base-files/base-files/colibri-t30/fstab b/recipes/base-files/base-files/colibri-t30/fstab deleted file mode 100644 index 8c4880f..0000000 --- a/recipes/base-files/base-files/colibri-t30/fstab +++ /dev/null @@ -1,14 +0,0 @@ -# stock fstab - you probably want to override this with a machine specific one - -/dev/root / auto defaults 1 1 -proc /proc proc defaults 0 0 -debugfs /sys/kernel/debug debugfs defaults 0 0 -devpts /dev/pts devpts mode=0620,gid=5 0 0 -usbfs /proc/bus/usb usbfs defaults 0 0 -tmpfs /var/volatile tmpfs defaults 0 0 -tmpfs /dev/shm tmpfs mode=0777 0 0 -tmpfs /media/ram tmpfs defaults 0 0 - -# uncomment this if your device has a SD/MMC/Transflash slot -#/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 - diff --git a/recipes/base-files/base-files/colibri-t30/profile b/recipes/base-files/base-files/colibri-t30/profile deleted file mode 100644 index 8380341..0000000 --- a/recipes/base-files/base-files/colibri-t30/profile +++ /dev/null @@ -1,38 +0,0 @@ -# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) -# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). - -PATH="/usr/local/bin:/usr/bin:/bin" -EDITOR="/bin/vi" # needed for packages like cron -test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc. - -if [ ! -e /etc/localtime ]; then - TZ="UTC" # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html - # for an explanation of how to set this to your local timezone. - export TZ -fi - -if [ "$HOME" = "/home/root" ]; then - PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin -fi -if [ "$PS1" ]; then -# works for bash and ash (no other shells known to be in use here) - PS1='\u@\h:\w\$ ' -fi - -if [ -d /etc/profile.d ]; then - for i in /etc/profile.d/* ; do - . $i - done - unset i -fi - -test -z "$DISPLAY" && DISPLAY=":0.0" # have the X display defined, unless it is already set, e.g. by a ssh connection -export DISPLAY - -# temporary workaround to give fw_setenv mmcblk0boot1 write permissions -function fw_setenv() { echo 0 > /sys/block/mmcblk0boot1/force_ro; /sbin/fw_setenv "$@"; echo 1 > /sys/block/mmcblk0boot1/force_ro; } - -export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM - -umask 022 - diff --git a/recipes/base-files/base-files/colibri-vf/fstab b/recipes/base-files/base-files/colibri-vf/fstab deleted file mode 100644 index 8c4880f..0000000 --- a/recipes/base-files/base-files/colibri-vf/fstab +++ /dev/null @@ -1,14 +0,0 @@ -# stock fstab - you probably want to override this with a machine specific one - -/dev/root / auto defaults 1 1 -proc /proc proc defaults 0 0 -debugfs /sys/kernel/debug debugfs defaults 0 0 -devpts /dev/pts devpts mode=0620,gid=5 0 0 -usbfs /proc/bus/usb usbfs defaults 0 0 -tmpfs /var/volatile tmpfs defaults 0 0 -tmpfs /dev/shm tmpfs mode=0777 0 0 -tmpfs /media/ram tmpfs defaults 0 0 - -# uncomment this if your device has a SD/MMC/Transflash slot -#/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 - diff --git a/recipes/base-files/base-files/colibri-vf/profile b/recipes/base-files/base-files/colibri-vf/profile deleted file mode 100644 index c1ee240..0000000 --- a/recipes/base-files/base-files/colibri-vf/profile +++ /dev/null @@ -1,35 +0,0 @@ -# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) -# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). - -PATH="/usr/local/bin:/usr/bin:/bin" -EDITOR="/bin/vi" # needed for packages like cron -test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc. - -if [ ! -e /etc/localtime ]; then - TZ="UTC" # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html - # for an explanation of how to set this to your local timezone. - export TZ -fi - -if [ "$HOME" = "/home/root" ]; then - PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin -fi -if [ "$PS1" ]; then -# works for bash and ash (no other shells known to be in use here) - PS1='\u@\h:\w\$ ' -fi - -if [ -d /etc/profile.d ]; then - for i in /etc/profile.d/* ; do - . $i - done - unset i -fi - -test -z "$DISPLAY" && DISPLAY=":0.0" # have the X display defined, unless it is already set, e.g. by a ssh connection -export DISPLAY - -export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM - -umask 022 - diff --git a/recipes/base-files/base-files/fstab b/recipes/base-files/base-files/fstab new file mode 100644 index 0000000..8c4880f --- /dev/null +++ b/recipes/base-files/base-files/fstab @@ -0,0 +1,14 @@ +# stock fstab - you probably want to override this with a machine specific one + +/dev/root / auto defaults 1 1 +proc /proc proc defaults 0 0 +debugfs /sys/kernel/debug debugfs defaults 0 0 +devpts /dev/pts devpts mode=0620,gid=5 0 0 +usbfs /proc/bus/usb usbfs defaults 0 0 +tmpfs /var/volatile tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 +tmpfs /media/ram tmpfs defaults 0 0 + +# uncomment this if your device has a SD/MMC/Transflash slot +#/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 + diff --git a/recipes/base-files/base-files/profile b/recipes/base-files/base-files/profile new file mode 100644 index 0000000..c1ee240 --- /dev/null +++ b/recipes/base-files/base-files/profile @@ -0,0 +1,35 @@ +# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) +# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). + +PATH="/usr/local/bin:/usr/bin:/bin" +EDITOR="/bin/vi" # needed for packages like cron +test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc. + +if [ ! -e /etc/localtime ]; then + TZ="UTC" # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html + # for an explanation of how to set this to your local timezone. + export TZ +fi + +if [ "$HOME" = "/home/root" ]; then + PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin +fi +if [ "$PS1" ]; then +# works for bash and ash (no other shells known to be in use here) + PS1='\u@\h:\w\$ ' +fi + +if [ -d /etc/profile.d ]; then + for i in /etc/profile.d/* ; do + . $i + done + unset i +fi + +test -z "$DISPLAY" && DISPLAY=":0.0" # have the X display defined, unless it is already set, e.g. by a ssh connection +export DISPLAY + +export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM + +umask 022 + diff --git a/recipes/base-files/base-files/tegra3/fw_unlock_mmc.sh b/recipes/base-files/base-files/tegra3/fw_unlock_mmc.sh new file mode 100644 index 0000000..8982640 --- /dev/null +++ b/recipes/base-files/base-files/tegra3/fw_unlock_mmc.sh @@ -0,0 +1,6 @@ +# Give fw_setenv mmcblk0boot1 write permissions +function fw_setenv() { + echo 0 > /sys/block/mmcblk0boot1/force_ro + /sbin/fw_setenv "$@" + echo 1 > /sys/block/mmcblk0boot1/force_ro +} diff --git a/recipes/base-files/base-files_3.0.14.bbappend b/recipes/base-files/base-files_3.0.14.bbappend index e07cb46..f423488 100644 --- a/recipes/base-files/base-files_3.0.14.bbappend +++ b/recipes/base-files/base-files_3.0.14.bbappend @@ -1,7 +1,14 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/base-files:" +SRC_URI_append_tegra3 = "file://fw_unlock_mmc.sh" + do_install_append () { -#trdx specific echo "search colibri.net" > ${D}${sysconfdir}/resolv.conf echo "nameserver 8.8.8.8" >> ${D}${sysconfdir}/resolv.conf + echo "nameserver 8.8.4.4" >> ${D}${sysconfdir}/resolv.conf +} + +do_install_append_tegra3() { + install -d ${D}${sysconfdir}/profile.d/ + install -m 0644 ${WORKDIR}/fw_unlock_mmc.sh ${D}${sysconfdir}/profile.d/fw_unlock_mmc.sh } -- cgit v1.2.3