[oe-commits] org.oe.packaged-staging base-files: sync with .dev
rpurdie commit
openembedded-commits at lists.openembedded.org
Fri Sep 29 03:32:54 UTC 2006
base-files: sync with .dev
Author: rpurdie at openembedded.org
Branch: org.openembedded.packaged-staging
Revision: fc9491003efe4fb0d58af6f432b78bee9a92d06a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=fc9491003efe4fb0d58af6f432b78bee9a92d06a
Files:
1
packages/base-files/base-files/jornada720
packages/base-files/base-files/jornada720/fstab
packages/base-files/base-files/h5xxx
packages/base-files/base-files/htcuniversal
packages/base-files/base-files/jornada6xx
packages/base-files/base-files/jornada7xx
packages/base-files/base-files/mtx-2
packages/base-files/base-files/netbook-pro
packages/base-files/base-files/omap5912osk
packages/base-files/base-files/h5xxx/fstab
packages/base-files/base-files/htcuniversal/fstab
packages/base-files/base-files/jornada6xx/fstab
packages/base-files/base-files/jornada7xx/fstab
packages/base-files/base-files/mtx-2/fstab
packages/base-files/base-files/mtx-2/profile
packages/base-files/base-files/netbook-pro/fstab
packages/base-files/base-files/omap5912osk/fstab
packages/base-files/base-files/fstab
packages/base-files/base-files/simpad/fstab
packages/base-files/base-files/tosa/usbd
packages/base-files/base-files_3.0.14.bb
Diffs:
#
# mt diff -r13197692b25a288ba36cb3cfc0e52628095226cb -rfc9491003efe4fb0d58af6f432b78bee9a92d06a
#
#
#
# delete "packages/base-files/base-files/jornada720"
#
# delete "packages/base-files/base-files/jornada720/fstab"
#
# add_dir "packages/base-files/base-files/h5xxx"
#
# add_dir "packages/base-files/base-files/htcuniversal"
#
# add_dir "packages/base-files/base-files/jornada6xx"
#
# add_dir "packages/base-files/base-files/jornada7xx"
#
# add_dir "packages/base-files/base-files/mtx-2"
#
# add_dir "packages/base-files/base-files/netbook-pro"
#
# add_dir "packages/base-files/base-files/omap5912osk"
#
# add_file "packages/base-files/base-files/h5xxx/fstab"
# content [8528227d020a91dff8c93211bf149731854d23b0]
#
# add_file "packages/base-files/base-files/htcuniversal/fstab"
# content [58f21bbbdc022fb80291fb67887db0d214edf20e]
#
# add_file "packages/base-files/base-files/jornada6xx/fstab"
# content [8b3456e1ec4d0c984fda296f935298eea7df0e51]
#
# add_file "packages/base-files/base-files/jornada7xx/fstab"
# content [8b3456e1ec4d0c984fda296f935298eea7df0e51]
#
# add_file "packages/base-files/base-files/mtx-2/fstab"
# content [19c2bf578401b559712506a822eb92088a53722c]
#
# add_file "packages/base-files/base-files/mtx-2/profile"
# content [037744f9330eb8145cebaa8f050a1555c2f4f61e]
#
# add_file "packages/base-files/base-files/netbook-pro/fstab"
# content [d72dfb43e8d69fc7aa6c348c3e2bf1ac05ce3eae]
#
# add_file "packages/base-files/base-files/omap5912osk/fstab"
# content [e4ce1433ba66621d916df814e97b806add8e28ac]
#
# patch "packages/base-files/base-files/fstab"
# from [e0c304645833181769a6863a9c0016ab85f583ad]
# to [0e56b62f1b930f945c77c26f3c82f50eb72c985f]
#
# patch "packages/base-files/base-files/simpad/fstab"
# from [2ca17c68e2634fb69be631f5b90a7136b6a74e5a]
# to [bafc87be5320c7ed6d72e87e9ac39902576469fa]
#
# patch "packages/base-files/base-files/tosa/usbd"
# from [e738a0505d56a81fa0febdc8c755628819a544c0]
# to [c4a99e4a77f8ba354ccc1adf232a534e66ac52e6]
#
# patch "packages/base-files/base-files_3.0.14.bb"
# from [53b33b88d4d22d2210af7885fb2f3ce756b565ad]
# to [61b4cd6b410c2fde0dd5c68dcacf626af083a477]
#
============================================================
--- packages/base-files/base-files/h5xxx/fstab 8528227d020a91dff8c93211bf149731854d23b0
+++ packages/base-files/base-files/h5xxx/fstab 8528227d020a91dff8c93211bf149731854d23b0
@@ -0,0 +1,8 @@
+/dev/mtdblock/1 / jffs2 defaults 1 1
+#breaks h51xx
+/dev/mtdblock/2 /home jffs2 defaults 1 1
+proc /proc proc defaults 0 0
+/dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0
+/dev/mmc/part1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0
+tmpfs /var tmpfs defaults 0 0
+tmpfs /media/ram tmpfs defaults 0 0
============================================================
--- packages/base-files/base-files/htcuniversal/fstab 58f21bbbdc022fb80291fb67887db0d214edf20e
+++ packages/base-files/base-files/htcuniversal/fstab 58f21bbbdc022fb80291fb67887db0d214edf20e
@@ -0,0 +1,12 @@
+# stock fstab - you probably want to override this with a machine specific one
+
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+devpts /dev/pts devpts mode=0620,gid=5 0 0
+#usbfs /proc/bus/usb usbfs noauto 0 0
+tmpfs /var tmpfs defaults 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
+
============================================================
--- packages/base-files/base-files/jornada6xx/fstab 8b3456e1ec4d0c984fda296f935298eea7df0e51
+++ packages/base-files/base-files/jornada6xx/fstab 8b3456e1ec4d0c984fda296f935298eea7df0e51
@@ -0,0 +1,7 @@
+proc /proc proc defaults 0 0
+/dev/hda2 / ext2 defaults 0 0
+/dev/hda1 /mnt/cf auto defaults,sync,noauto 0 0
+/dev/hda3 none swap sw 0 0
+tmpfs /var tmpfs defaults 0 0
+tmpfs /mnt/ram tmpfs defaults 0 0
+devpts /dev/pts devpts defaults 0 0
============================================================
--- packages/base-files/base-files/jornada7xx/fstab 8b3456e1ec4d0c984fda296f935298eea7df0e51
+++ packages/base-files/base-files/jornada7xx/fstab 8b3456e1ec4d0c984fda296f935298eea7df0e51
@@ -0,0 +1,7 @@
+proc /proc proc defaults 0 0
+/dev/hda2 / ext2 defaults 0 0
+/dev/hda1 /mnt/cf auto defaults,sync,noauto 0 0
+/dev/hda3 none swap sw 0 0
+tmpfs /var tmpfs defaults 0 0
+tmpfs /mnt/ram tmpfs defaults 0 0
+devpts /dev/pts devpts defaults 0 0
============================================================
--- packages/base-files/base-files/mtx-2/fstab 19c2bf578401b559712506a822eb92088a53722c
+++ packages/base-files/base-files/mtx-2/fstab 19c2bf578401b559712506a822eb92088a53722c
@@ -0,0 +1,8 @@
+# /etc/fstab: static file system information. mtx-2
+#
+# <file system> <mount pt> <type> <options> <dump> <pass>
+rootfs / auto defaults 1 1
+tmpfs /var tmpfs size=10m 0 0
+proc /proc proc defaults 0 0
+devpts /dev/pts devpts mode=0620,gid=5 0 0
+usbdevfs /proc/bus/usb usbdevfs noauto 0 0
============================================================
--- packages/base-files/base-files/mtx-2/profile 037744f9330eb8145cebaa8f050a1555c2f4f61e
+++ packages/base-files/base-files/mtx-2/profile 037744f9330eb8145cebaa8f050a1555c2f4f61e
@@ -0,0 +1,25 @@
+# /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"
+
+if [ "`id -u`" -eq 0 ]; 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 `ls /etc/profile.d/`; do
+ . /etc/profile.d/$i
+ done
+ unset i
+fi
+
+export PATH PS1
+
+umask 022
+
+alias ll="ls -lah"
============================================================
--- packages/base-files/base-files/netbook-pro/fstab d72dfb43e8d69fc7aa6c348c3e2bf1ac05ce3eae
+++ packages/base-files/base-files/netbook-pro/fstab d72dfb43e8d69fc7aa6c348c3e2bf1ac05ce3eae
@@ -0,0 +1,5 @@
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+devpts /dev/pts devpts mode=0620,gid=5 0 0
+usbdevfs /proc/bus/usb usbdevfs noauto 0 0
+tmpfs /var tmpfs defaults 0 0
============================================================
--- packages/base-files/base-files/omap5912osk/fstab e4ce1433ba66621d916df814e97b806add8e28ac
+++ packages/base-files/base-files/omap5912osk/fstab e4ce1433ba66621d916df814e97b806add8e28ac
@@ -0,0 +1,9 @@
+# fstab for omap5912osk
+
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+sysfs /sysfs sysfs defaults 0 0
+tmpfs /dev tmpfs defaults 0 0
+tmpfs /var tmpfs defaults 0 0
+tmpfs /media/ram tmpfs defaults 0 0
+
============================================================
--- packages/base-files/base-files/fstab e0c304645833181769a6863a9c0016ab85f583ad
+++ packages/base-files/base-files/fstab 0e56b62f1b930f945c77c26f3c82f50eb72c985f
@@ -1,4 +1,12 @@
-rootfs / auto defaults 1 1
-proc /proc proc defaults 0 0
-devpts /dev/pts devpts mode=0620,gid=5 0 0
-usbdevfs /proc/bus/usb usbdevfs noauto 0 0
+# stock fstab - you probably want to override this with a machine specific one
+
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+devpts /dev/pts devpts mode=0620,gid=5 0 0
+usbdevfs /proc/bus/usb usbdevfs noauto 0 0
+tmpfs /var tmpfs defaults 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
+
============================================================
--- packages/base-files/base-files/simpad/fstab 2ca17c68e2634fb69be631f5b90a7136b6a74e5a
+++ packages/base-files/base-files/simpad/fstab bafc87be5320c7ed6d72e87e9ac39902576469fa
@@ -1,7 +1,8 @@ tmpfs /var tmpfs defaults
rootfs / auto defaults 1 1
proc /proc proc defaults 0 0
devpts /dev/pts devpts mode=0620,gid=5 0 0
usbdevfs /proc/bus/usb usbdevfs noauto 0 0
tmpfs /var tmpfs defaults 0 0
+tmpfs /media/ram tmpfs defaults 0 0
/dev/mtdblock/2 /home jffs2 defaults 1 1
+/dev/hda1 /media/cf auto noauto,owner 0 0
-/dev/hda1 /mnt/cf auto noauto,owner 0 0
============================================================
--- packages/base-files/base-files/tosa/usbd e738a0505d56a81fa0febdc8c755628819a544c0
+++ packages/base-files/base-files/tosa/usbd c4a99e4a77f8ba354ccc1adf232a534e66ac52e6
@@ -1 +1,5 @@
-usbdmodule=pxa_bi
+# I know that this was created for usb-client stuff
+# but tosa/2.6 need (un)loading USB Host module
+# on suspend/resume and this way is simplest one ;)
+
+usbdmodule=ohci-hcd
============================================================
--- packages/base-files/base-files_3.0.14.bb 53b33b88d4d22d2210af7885fb2f3ce756b565ad
+++ packages/base-files/base-files_3.0.14.bb 61b4cd6b410c2fde0dd5c68dcacf626af083a477
@@ -1,7 +1,7 @@ PRIORITY = "required"
DESCRIPTION = "Miscellaneous files for the base system."
SECTION = "base"
PRIORITY = "required"
-PR = "r50"
+PR = "r54"
LICENSE = "GPL"
SRC_URI = " \
@@ -45,12 +45,14 @@ conffiles = "${sysconfdir}/debian_versio
${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \
${sysconfdir}/default"
+#
+# set standard hostname, might be a candidate for a DISTRO variable? :M:
+#
hostname = "openembedded"
hostname_slugos = "nslu2"
hostname_mnci = "MNCI"
-PACKAGE_ARCH_mnci = "mnci"
hostname_rt3000 = "MNRT"
-PACKAGE_ARCH_rt3000 = "rt3000"
+hostname_jlime = "JLime"
do_install () {
for d in ${dirs755}; do
@@ -129,12 +131,19 @@ do_install_append_slugos() {
ln -s ../root ${D}/home/root
}
+do_install_append_netbook-pro () {
+ mkdir -p ${D}/initrd
+}
+
PACKAGES = "${PN}-doc ${PN}"
FILES_${PN} = "/"
FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses"
+# M&N specific packaging
+PACKAGE_ARCH_mnci = "mnci"
+PACKAGE_ARCH_rt3000 = "rt3000"
-# Unslung distribution specific packages follow ...
+# Unslung distribution specific packaging
PACKAGES_unslung = "${PN}-unslung"
PACKAGE_ARCH_${PN}-unslung = "nslu2"
More information about the Openembedded-commits
mailing list