diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-04 15:27:17 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-04 15:27:17 +0000 |
| commit | 503095d3621ae75e0843d0bef02c960140459e02 (patch) | |
| tree | b735eb3fbb22c3fcbc3d03f4802cf5b5bdbec4ff | |
| parent | decf4ec569ba3b54aeb7dd0989959f085656593d (diff) | |
| download | fhs-dirs-baserock/samthursfield/build-essential-2.tar.gz | |
Update to use 'devices' morph fieldbaserock/samthursfield/build-essential-2
| -rw-r--r-- | fhs-dirs.morph.yaml | 42 | ||||
| -rw-r--r-- | stage2-fhs-dirs.morph | 48 | ||||
| -rw-r--r-- | stage2-fhs-dirs.morph.yaml | 42 |
3 files changed, 129 insertions, 3 deletions
diff --git a/fhs-dirs.morph.yaml b/fhs-dirs.morph.yaml index 082513d..321b086 100644 --- a/fhs-dirs.morph.yaml +++ b/fhs-dirs.morph.yaml @@ -4,7 +4,6 @@ decription: create the FHS 2.3 directory hierarchy and the usual files install-commands: - sh ./create-fhs-dirs "$DESTDIR" - - sh ./create-dev-nodes "$DESTDIR" - install -m 644 passwd "$DESTDIR/etc/passwd" - install -m 600 shadow "$DESTDIR/etc/shadow" - install -m 644 interfaces "$DESTDIR/etc/network/interfaces" @@ -13,3 +12,44 @@ install-commands: - install -m 644 issue "$DESTDIR/etc/issue" - install -m 644 services "$DESTDIR/etc/services" - echo baserock > "$DESTDIR"/etc/hostname + +devices: + - filename: /dev/console + uid: 0 + gid: 0 + type: c + major: 5 + minor: 1 + permissions: '0600' + + - filename: /dev/full + uid: 0 + gid: 0 + type: c + major: 1 + minor: 7 + permissions: '0666' + + - filename: /dev/null + uid: 0 + gid: 0 + type: c + major: 1 + minor: 3 + permissions: '0666' + + - filename: /dev/urandom + uid: 0 + gid: 0 + type: c + major: 1 + minor: 9 + permissions: '0666' + + - filename: /dev/zero + uid: 0 + gid: 0 + type: c + major: 1 + minor: 5 + permissions: '0666' diff --git a/stage2-fhs-dirs.morph b/stage2-fhs-dirs.morph index bc68481..636f279 100644 --- a/stage2-fhs-dirs.morph +++ b/stage2-fhs-dirs.morph @@ -6,7 +6,6 @@ "sh ./create-fhs-dirs \"$DESTDIR\"", "rmdir \"$DESTDIR/bin\"", "ln -s \"$PREFIX/bin\" \"$DESTDIR/bin\"", - "sh ./create-dev-nodes \"$DESTDIR\"", "install -m 644 passwd \"$DESTDIR/etc/passwd\"", "install -m 600 shadow \"$DESTDIR/etc/shadow\"", "install -m 644 interfaces \"$DESTDIR/etc/network/interfaces\"", @@ -15,5 +14,52 @@ "install -m 644 issue \"$DESTDIR/etc/issue\"", "install -m 644 services \"$DESTDIR/etc/services\"", "echo baserock > \"$DESTDIR\"/etc/hostname" + ], + "devices": [ + { + "filename": "/dev/console", + "uid": 0, + "gid": 0, + "type": "c", + "major": 5, + "minor": 1, + "permissions": "0600" + }, + { + "filename": "/dev/full", + "uid": 0, + "gid": 0, + "type": "c", + "major": 1, + "minor": 7, + "permissions": "0666" + }, + { + "filename": "/dev/null", + "uid": 0, + "gid": 0, + "type": "c", + "major": 1, + "minor": 3, + "permissions": "0666" + }, + { + "filename": "/dev/urandom", + "uid": 0, + "gid": 0, + "type": "c", + "major": 1, + "minor": 9, + "permissions": "0666" + }, + { + "filename": "/dev/zero", + "uid": 0, + "gid": 0, + "type": "c", + "major": 1, + "minor": 5, + "permissions": "0666" + } ] } diff --git a/stage2-fhs-dirs.morph.yaml b/stage2-fhs-dirs.morph.yaml index 69e6eac..bd5de93 100644 --- a/stage2-fhs-dirs.morph.yaml +++ b/stage2-fhs-dirs.morph.yaml @@ -20,7 +20,6 @@ install-commands: # that they can be found during stage 3 builds, and stage2-eglibc # likewise installs a symlink for the program loader (ld.so). - - sh ./create-dev-nodes "$DESTDIR" - install -m 644 passwd "$DESTDIR/etc/passwd" - install -m 600 shadow "$DESTDIR/etc/shadow" - install -m 644 interfaces "$DESTDIR/etc/network/interfaces" @@ -29,3 +28,44 @@ install-commands: - install -m 644 issue "$DESTDIR/etc/issue" - install -m 644 services "$DESTDIR/etc/services" - echo baserock > "$DESTDIR"/etc/hostname + +devices: + - filename: /dev/console + uid: 0 + gid: 0 + type: c + major: 5 + minor: 1 + permissions: '0600' + + - filename: /dev/full + uid: 0 + gid: 0 + type: c + major: 1 + minor: 7 + permissions: '0666' + + - filename: /dev/null + uid: 0 + gid: 0 + type: c + major: 1 + minor: 3 + permissions: '0666' + + - filename: /dev/urandom + uid: 0 + gid: 0 + type: c + major: 1 + minor: 9 + permissions: '0666' + + - filename: /dev/zero + uid: 0 + gid: 0 + type: c + major: 1 + minor: 5 + permissions: '0666' |