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 /openembedded | |
parent | 3664700a203ddc99714c244adf8a433ca2a6392e (diff) | |
download | poky-170a50cd2cab7455aab47d3e777795d65cad2cdf.tar.gz |
base-files: sync with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@433 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded')
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 bf8f8a87e5..8bfb08720f 100644 --- a/openembedded/packages/base-files/base-files/fstab +++ b/openembedded/packages/base-files/base-files/fstab | |||
@@ -1,4 +1,12 @@ | |||
1 | rootfs / auto defaults 1 1 | 1 | # stock fstab - you probably want to override this with a machine specific one |
2 | proc /proc proc defaults 0 0 | 2 | |
3 | devpts /dev/pts devpts mode=0620,gid=5 0 0 | 3 | rootfs / auto defaults 1 1 |
4 | usbdevfs /proc/bus/usb usbdevfs noauto 0 0 | 4 | proc /proc proc defaults 0 0 |
5 | devpts /dev/pts devpts mode=0620,gid=5 0 0 | ||
6 | usbdevfs /proc/bus/usb usbdevfs noauto 0 0 | ||
7 | tmpfs /var tmpfs defaults 0 0 | ||
8 | tmpfs /media/ram tmpfs defaults 0 0 | ||
9 | |||
10 | # uncomment this if your device has a SD/MMC/Transflash slot | ||
11 | #/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 | ||
12 | |||
diff --git a/openembedded/packages/base-files/base-files/poodle/fstab b/openembedded/packages/base-files/base-files/poodle/fstab index 31e2edb831..06b9672504 100644 --- a/openembedded/packages/base-files/base-files/poodle/fstab +++ b/openembedded/packages/base-files/base-files/poodle/fstab | |||
@@ -2,6 +2,11 @@ | |||
2 | /dev/mtdblock3 /home jffs2 defaults,noatime 1 2 | 2 | /dev/mtdblock3 /home jffs2 defaults,noatime 1 2 |
3 | proc /proc proc defaults 0 0 | 3 | proc /proc proc defaults 0 0 |
4 | /dev/hda1 /media/cf auto defaults,sync,noauto 0 0 | 4 | /dev/hda1 /media/cf auto defaults,sync,noauto 0 0 |
5 | |||
6 | # SD/MMC in kernel 2.6 | ||
7 | /dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 | ||
8 | |||
9 | # SD/MMC in kernel 2.4 | ||
5 | /dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 | 10 | /dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 |
6 | 11 | ||
7 | tmpfs /var tmpfs defaults 0 0 | 12 | 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 99b87714e5..51aaaf9256 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 | |||
3 | devpts /dev/pts devpts mode=0620,gid=5 0 0 | 3 | devpts /dev/pts devpts mode=0620,gid=5 0 0 |
4 | usbdevfs /proc/bus/usb usbdevfs noauto 0 0 | 4 | usbdevfs /proc/bus/usb usbdevfs noauto 0 0 |
5 | tmpfs /var tmpfs defaults 0 0 | 5 | tmpfs /var tmpfs defaults 0 0 |
6 | tmpfs /media/ram tmpfs defaults 0 0 | ||
6 | /dev/mtdblock/2 /home jffs2 defaults 1 1 | 7 | /dev/mtdblock/2 /home jffs2 defaults 1 1 |
7 | /dev/hda1 /mnt/cf auto noauto,owner 0 0 | 8 | /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 25cb1b1bbe..866c016965 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 @@ | |||
1 | DESCRIPTION = "Miscellaneous files for the base system." | 1 | DESCRIPTION = "Miscellaneous files for the base system." |
2 | SECTION = "base" | 2 | SECTION = "base" |
3 | PRIORITY = "required" | 3 | PRIORITY = "required" |
4 | PR = "r48" | 4 | PR = "r51" |
5 | LICENSE = "GPL" | 5 | LICENSE = "GPL" |
6 | 6 | ||
7 | SRC_URI = " \ | 7 | SRC_URI = " \ |
@@ -45,12 +45,13 @@ conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ | |||
45 | ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \ | 45 | ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \ |
46 | ${sysconfdir}/default" | 46 | ${sysconfdir}/default" |
47 | 47 | ||
48 | # | ||
49 | # set standard hostname, might be a candidate for a DISTRO variable? :M: | ||
50 | # | ||
48 | hostname = "openembedded" | 51 | hostname = "openembedded" |
49 | hostname_slugos = "nslu2" | 52 | hostname_slugos = "nslu2" |
50 | hostname_mnci = "MNCI" | 53 | hostname_mnci = "MNCI" |
51 | PACKAGE_ARCH_mnci = "mnci" | ||
52 | hostname_rt3000 = "MNRT" | 54 | hostname_rt3000 = "MNRT" |
53 | PACKAGE_ARCH_rt3000 = "rt3000" | ||
54 | 55 | ||
55 | do_install () { | 56 | do_install () { |
56 | for d in ${dirs755}; do | 57 | for d in ${dirs755}; do |
@@ -133,8 +134,11 @@ PACKAGES = "${PN}-doc ${PN}" | |||
133 | FILES_${PN} = "/" | 134 | FILES_${PN} = "/" |
134 | FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses" | 135 | FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses" |
135 | 136 | ||
137 | # M&N specific packaging | ||
138 | PACKAGE_ARCH_mnci = "mnci" | ||
139 | PACKAGE_ARCH_rt3000 = "rt3000" | ||
136 | 140 | ||
137 | # Unslung distribution specific packages follow ... | 141 | # Unslung distribution specific packaging |
138 | 142 | ||
139 | PACKAGES_unslung = "${PN}-unslung" | 143 | PACKAGES_unslung = "${PN}-unslung" |
140 | PACKAGE_ARCH_${PN}-unslung = "nslu2" | 144 | PACKAGE_ARCH_${PN}-unslung = "nslu2" |