diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-05-27 21:36:07 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-05-27 21:36:07 +0000 |
| commit | 170a50cd2cab7455aab47d3e777795d65cad2cdf (patch) | |
| tree | d82af917b397930ab2463014160a9c53e38e2318 | |
| parent | 3664700a203ddc99714c244adf8a433ca2a6392e (diff) | |
| download | openembedded-core-170a50cd2cab7455aab47d3e777795d65cad2cdf.tar.gz openembedded-core-170a50cd2cab7455aab47d3e777795d65cad2cdf.tar.bz2 openembedded-core-170a50cd2cab7455aab47d3e777795d65cad2cdf.tar.xz openembedded-core-170a50cd2cab7455aab47d3e777795d65cad2cdf.zip | |
base-files: sync with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@433 311d38ba-8fff-0310-9ca6-ca027cbcb966
4 files changed, 27 insertions, 9 deletions
diff --git a/openembedded/packages/base-files/base-files/fstab b/openembedded/packages/base-files/base-files/fstab index bf8f8a87e..8bfb08720 100644 --- a/openembedded/packages/base-files/base-files/fstab +++ b/openembedded/packages/base-files/base-files/fstab @@ -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 + diff --git a/openembedded/packages/base-files/base-files/poodle/fstab b/openembedded/packages/base-files/base-files/poodle/fstab index 31e2edb83..06b967250 100644 --- a/openembedded/packages/base-files/base-files/poodle/fstab +++ b/openembedded/packages/base-files/base-files/poodle/fstab @@ -2,6 +2,11 @@ /dev/mtdblock3 /home jffs2 defaults,noatime 1 2 proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,sync,noauto 0 0 + +# SD/MMC in kernel 2.6 +/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 + +# SD/MMC in kernel 2.4 /dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 tmpfs /var tmpfs defaults 0 0 diff --git a/openembedded/packages/base-files/base-files/simpad/fstab b/openembedded/packages/base-files/base-files/simpad/fstab index 99b87714e..51aaaf925 100644 --- a/openembedded/packages/base-files/base-files/simpad/fstab +++ b/openembedded/packages/base-files/base-files/simpad/fstab @@ -3,5 +3,6 @@ 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 /mnt/cf auto noauto,owner 0 0 +/dev/hda1 /media/cf auto noauto,owner 0 0 diff --git a/openembedded/packages/base-files/base-files_3.0.14.bb b/openembedded/packages/base-files/base-files_3.0.14.bb index 25cb1b1bb..866c01696 100644 --- a/openembedded/packages/base-files/base-files_3.0.14.bb +++ b/openembedded/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r48" +PR = "r51" LICENSE = "GPL" SRC_URI = " \ @@ -45,12 +45,13 @@ conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ ${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" do_install () { for d in ${dirs755}; do @@ -133,8 +134,11 @@ 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" |