| 1 |
azarah |
334 |
--- MAKEDEV.orig 2003-03-09 08:12:11.000000000 +0200 |
| 2 |
|
|
+++ MAKEDEV 2003-03-09 08:26:25.000000000 +0200 |
| 3 |
|
|
@@ -260,48 +260,65 @@ |
| 4 |
|
|
# case `cvt $arg` in |
| 5 |
|
|
case $arg in |
| 6 |
|
|
generic) |
| 7 |
|
|
- # pick the right generic-<arch> using dpkg's knowledge |
| 8 |
|
|
- case `dpkg --print-installation-architecture` in |
| 9 |
|
|
- alpha) |
| 10 |
|
|
- $0 $opts generic-alpha |
| 11 |
|
|
- ;; |
| 12 |
|
|
- arm) |
| 13 |
|
|
- $0 $opts generic-arm |
| 14 |
|
|
- ;; |
| 15 |
|
|
- hppa) |
| 16 |
|
|
- $0 $opts generic-hppa |
| 17 |
|
|
- ;; |
| 18 |
|
|
- i386) |
| 19 |
|
|
- $0 $opts generic-i386 |
| 20 |
|
|
- ;; |
| 21 |
|
|
- ia64) |
| 22 |
|
|
- $0 $opts generic-ia64 |
| 23 |
|
|
- ;; |
| 24 |
|
|
- m68k) |
| 25 |
|
|
- $0 $opts generic-m68k |
| 26 |
|
|
- ;; |
| 27 |
|
|
- mips) |
| 28 |
|
|
- $0 $opts generic-mips |
| 29 |
|
|
- ;; |
| 30 |
|
|
- mipsel) |
| 31 |
|
|
- $0 $opts generic-mipsel |
| 32 |
|
|
- ;; |
| 33 |
|
|
- powerpc) |
| 34 |
|
|
- $0 $opts generic-powerpc |
| 35 |
|
|
- ;; |
| 36 |
|
|
- s390) |
| 37 |
|
|
- $0 $opts generic-s390 |
| 38 |
|
|
- ;; |
| 39 |
|
|
- sparc) |
| 40 |
|
|
- $0 $opts generic-sparc |
| 41 |
|
|
- ;; |
| 42 |
|
|
- *) |
| 43 |
|
|
- echo "$0: no support for generic on this arch" >&2 |
| 44 |
|
|
- exit 1 |
| 45 |
|
|
- ;; |
| 46 |
|
|
- esac |
| 47 |
|
|
+ if [ -n "`which dpkg 2> /dev/null`" ] |
| 48 |
|
|
+ then |
| 49 |
|
|
+ # pick the right generic-<arch> using dpkg's knowledge |
| 50 |
|
|
+ case `dpkg --print-installation-architecture` in |
| 51 |
|
|
+ alpha) |
| 52 |
|
|
+ $0 $opts generic-alpha |
| 53 |
|
|
+ ;; |
| 54 |
|
|
+ arm) |
| 55 |
|
|
+ $0 $opts generic-arm |
| 56 |
|
|
+ ;; |
| 57 |
|
|
+ hppa) |
| 58 |
|
|
+ $0 $opts generic-hppa |
| 59 |
|
|
+ ;; |
| 60 |
|
|
+ i386) |
| 61 |
|
|
+ $0 $opts generic-i386 |
| 62 |
|
|
+ ;; |
| 63 |
|
|
+ ia64) |
| 64 |
|
|
+ $0 $opts generic-ia64 |
| 65 |
|
|
+ ;; |
| 66 |
|
|
+ m68k) |
| 67 |
|
|
+ $0 $opts generic-m68k |
| 68 |
|
|
+ ;; |
| 69 |
|
|
+ mips) |
| 70 |
|
|
+ $0 $opts generic-mips |
| 71 |
|
|
+ ;; |
| 72 |
|
|
+ mipsel) |
| 73 |
|
|
+ $0 $opts generic-mipsel |
| 74 |
|
|
+ ;; |
| 75 |
|
|
+ powerpc) |
| 76 |
|
|
+ $0 $opts generic-powerpc |
| 77 |
|
|
+ ;; |
| 78 |
|
|
+ s390) |
| 79 |
|
|
+ $0 $opts generic-s390 |
| 80 |
|
|
+ ;; |
| 81 |
|
|
+ sparc) |
| 82 |
|
|
+ $0 $opts generic-sparc |
| 83 |
|
|
+ ;; |
| 84 |
|
|
+ *) |
| 85 |
|
|
+ echo "$0: no support for generic on this arch" >&2 |
| 86 |
|
|
+ exit 1 |
| 87 |
|
|
+ ;; |
| 88 |
|
|
+ esac |
| 89 |
|
|
+ else |
| 90 |
|
|
+ $0 $opts std |
| 91 |
|
|
+ $0 $opts fd |
| 92 |
|
|
+ $0 $opts fd0 fd1 |
| 93 |
|
|
+ $0 $opts hda hdb |
| 94 |
|
|
+ $0 $opts xda xdb |
| 95 |
|
|
+ $0 $opts sda sdb |
| 96 |
|
|
+ $0 $opts pty |
| 97 |
|
|
+ $0 $opts console |
| 98 |
|
|
+ $0 $opts ttyS0 ttyS1 ttyS2 ttyS3 |
| 99 |
|
|
+ $0 $opts busmice |
| 100 |
|
|
+ $0 $opts lp |
| 101 |
|
|
+ $0 $opts par |
| 102 |
|
|
+ fi |
| 103 |
|
|
;; |
| 104 |
|
|
generic-alpha) |
| 105 |
|
|
+ export MDARCH="alpha" |
| 106 |
|
|
$0 $opts std |
| 107 |
|
|
$0 $opts fd |
| 108 |
|
|
$0 $opts fd0 fd1 |
| 109 |
|
|
@@ -321,6 +338,7 @@ |
| 110 |
|
|
$0 $opts fb |
| 111 |
|
|
;; |
| 112 |
|
|
generic-arm) |
| 113 |
|
|
+ export MDARCH="arm" |
| 114 |
|
|
$0 $opts std |
| 115 |
|
|
$0 $opts fd |
| 116 |
|
|
$0 $opts fd0 fd1 |
| 117 |
|
|
@@ -340,6 +358,7 @@ |
| 118 |
|
|
$0 $opts fb |
| 119 |
|
|
;; |
| 120 |
|
|
generic-hppa) |
| 121 |
|
|
+ export MDARCH="hppa" |
| 122 |
|
|
$0 $opts std |
| 123 |
|
|
$0 $opts fd |
| 124 |
|
|
$0 $opts fd0 fd1 |
| 125 |
|
|
@@ -358,6 +377,7 @@ |
| 126 |
|
|
$0 $opts rtc |
| 127 |
|
|
;; |
| 128 |
|
|
generic-i386) |
| 129 |
|
|
+ export MDARCH="i386" |
| 130 |
|
|
$0 $opts std |
| 131 |
|
|
$0 $opts fd |
| 132 |
|
|
$0 $opts fd0 fd1 |
| 133 |
|
|
@@ -380,6 +400,7 @@ |
| 134 |
|
|
$0 $opts lmscd sbpcd aztcd bpcd dac960 ida ataraid cciss |
| 135 |
|
|
;; |
| 136 |
|
|
generic-ia64) |
| 137 |
|
|
+ export MDARCH="ia64" |
| 138 |
|
|
$0 $opts std |
| 139 |
|
|
$0 $opts fd |
| 140 |
|
|
$0 $opts fd0 fd1 |
| 141 |
|
|
@@ -400,6 +421,7 @@ |
| 142 |
|
|
$0 $opts efirtc |
| 143 |
|
|
;; |
| 144 |
|
|
generic-m68k) |
| 145 |
|
|
+ export MDARCH="m68k" |
| 146 |
|
|
$0 $opts std |
| 147 |
|
|
$0 $opts fd |
| 148 |
|
|
$0 $opts fd0 fd1 |
| 149 |
|
|
@@ -418,6 +440,7 @@ |
| 150 |
|
|
$0 $opts fb |
| 151 |
|
|
;; |
| 152 |
|
|
generic-mips) |
| 153 |
|
|
+ export MDARCH="mips" |
| 154 |
|
|
$0 $opts std |
| 155 |
|
|
$0 $opts fd |
| 156 |
|
|
$0 $opts fd0 fd1 |
| 157 |
|
|
@@ -436,6 +459,7 @@ |
| 158 |
|
|
$0 $opts busmice |
| 159 |
|
|
;; |
| 160 |
|
|
generic-mipsel) |
| 161 |
|
|
+ export MDARCH="mipsel" |
| 162 |
|
|
$0 $opts std |
| 163 |
|
|
$0 $opts fd |
| 164 |
|
|
$0 $opts fd0 fd1 |
| 165 |
|
|
@@ -454,6 +478,7 @@ |
| 166 |
|
|
$0 $opts rtc |
| 167 |
|
|
;; |
| 168 |
|
|
generic-powerpc) |
| 169 |
|
|
+ export MDARCH="powerpc" |
| 170 |
|
|
$0 $opts std |
| 171 |
|
|
$0 $opts fd |
| 172 |
|
|
$0 $opts fd0 fd1 |
| 173 |
|
|
@@ -478,6 +503,7 @@ |
| 174 |
|
|
$0 $opts isdn-io |
| 175 |
|
|
;; |
| 176 |
|
|
generic-s390) |
| 177 |
|
|
+ export MDARCH="s390" |
| 178 |
|
|
$0 $opts std |
| 179 |
|
|
$0 $opts fd |
| 180 |
|
|
$0 $opts dasda dasdb dasdc dasdd dasde dasdf dasdg dasdh \ |
| 181 |
|
|
@@ -489,6 +515,7 @@ |
| 182 |
|
|
$0 $opts rtc |
| 183 |
|
|
;; |
| 184 |
|
|
generic-sparc) |
| 185 |
|
|
+ export MDARCH="sparc" |
| 186 |
|
|
$0 $opts std |
| 187 |
|
|
$0 $opts fd0-bare fd1-bare |
| 188 |
|
|
$0 $opts hda hdb hdc hdd |
| 189 |
|
|
@@ -601,8 +628,19 @@ |
| 190 |
|
|
done |
| 191 |
|
|
;; |
| 192 |
|
|
adb) |
| 193 |
|
|
- # pick the right arch device using dpkg's knowledge |
| 194 |
|
|
- case `dpkg --print-installation-architecture` in |
| 195 |
|
|
+ myarch= |
| 196 |
|
|
+ |
| 197 |
|
|
+ if [ -n "`which dpkg 2> /dev/null`" ] |
| 198 |
|
|
+ then |
| 199 |
|
|
+ # pick the right arch device using dpkg's knowledge |
| 200 |
|
|
+ myarch="`dpkg --print-installation-architecture`" |
| 201 |
|
|
+ |
| 202 |
|
|
+ elif [ -n "${MDARCH}" ] |
| 203 |
|
|
+ then |
| 204 |
|
|
+ myarch="${MDARCH}" |
| 205 |
|
|
+ fi |
| 206 |
|
|
+ |
| 207 |
|
|
+ case $myarch in |
| 208 |
|
|
powerpc) |
| 209 |
|
|
# ADB bus devices (char) |
| 210 |
|
|
makedev adb c 56 0 $mouse |