author | kergoth <kergoth> | 2003-01-24 02:26:29 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-01-24 02:26:29 (UTC) |
commit | 8b2c18bb978c58de817ee163715f1e21982380a0 (patch) (unidiff) | |
tree | 6f8ab2a4778292d3cd3f9fbd6d5bf74c46f034a5 | |
parent | 039367f738688f9484a487db8720a5bd2ad5878f (diff) | |
download | opie-8b2c18bb978c58de817ee163715f1e21982380a0.zip opie-8b2c18bb978c58de817ee163715f1e21982380a0.tar.gz opie-8b2c18bb978c58de817ee163715f1e21982380a0.tar.bz2 |
Adjust package builds to handle the new lib paths
-rwxr-xr-x | mkipks | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -66,128 +66,132 @@ do | |||
66 | STRIP_FILES= | 66 | STRIP_FILES= |
67 | ;; /*) | 67 | ;; /*) |
68 | FILES="$FILES $1" | 68 | FILES="$FILES $1" |
69 | ;; *) | 69 | ;; *) |
70 | FILES="$FILES $PWD/$1" | 70 | FILES="$FILES $PWD/$1" |
71 | esac | 71 | esac |
72 | shift | 72 | shift |
73 | done | 73 | done |
74 | 74 | ||
75 | if [ -z "$FILES" ] | 75 | if [ -z "$FILES" ] |
76 | then | 76 | then |
77 | FILES=`find $OPIEDIR -name "*.control" -print` | 77 | FILES=`find $OPIEDIR -name "*.control" -print` |
78 | fi | 78 | fi |
79 | 79 | ||
80 | RDIR=$PWD | 80 | RDIR=$PWD |
81 | ORIGDIR=`pwd` | 81 | ORIGDIR=`pwd` |
82 | cd $OPIEDIR | 82 | cd $OPIEDIR |
83 | 83 | ||
84 | for i in $FILES | 84 | for i in $FILES |
85 | do | 85 | do |
86 | rm -rf $TDIR | 86 | rm -rf $TDIR |
87 | 87 | ||
88 | mkdir -p $DATADIR | 88 | mkdir -p $DATADIR |
89 | mkdir -p $CTRLDIR | 89 | mkdir -p $CTRLDIR |
90 | 90 | ||
91 | packagename=${i##*/}; packagename=${packagename%.control} | 91 | packagename=${i##*/}; packagename=${packagename%.control} |
92 | version=$(eval echo '"'$(sed -n -e "s/^Version: *//p" $i)'"') | 92 | version=$(eval echo '"'$(sed -n -e "s/^Version: *//p" $i)'"') |
93 | depends=$(eval echo '"'$(sed -n -e "s/^Depends: *//p" $i)'"') | 93 | depends=$(eval echo '"'$(sed -n -e "s/^Depends: *//p" $i)'"') |
94 | files=$(eval echo $(sed -n -e "s/^Files://p" $i)) | 94 | files=$(eval echo $(sed -n -e "s/^Files://p" $i)) |
95 | arch=$(eval echo $(sed -n -e "s/^Arch://p" $i)) | 95 | arch=$(eval echo $(sed -n -e "s/^Arch://p" $i)) |
96 | section=$(sed -n -e "s/^Section: *//p" $i) | 96 | section=$(sed -n -e "s/^Section: *//p" $i) |
97 | provides=$(sed -n -e "s/^Provides: *//p" $i) | 97 | provides=$(sed -n -e "s/^Provides: *//p" $i) |
98 | conflicts=$(sed -n -e "s/^Conflicts: *//p" $i) | 98 | conflicts=$(sed -n -e "s/^Conflicts: *//p" $i) |
99 | license=$(sed -n -e "s/^License: *//p" $i) | 99 | license=$(sed -n -e "s/^License: *//p" $i) |
100 | summary=$(sed -n -e "s/^Description: *//p" $i) | 100 | summary=$(sed -n -e "s/^Description: *//p" $i) |
101 | package=${packagename}_${version}_$ARCH | 101 | package=${packagename}_${version}_$ARCH |
102 | ERROR= | 102 | ERROR= |
103 | if [ -z "$files" ] | 103 | if [ -z "$files" ] |
104 | then | 104 | then |
105 | mkdir -p $DATADIR/usr/share/doc/$packagename | 105 | mkdir -p $DATADIR/usr/share/doc/$packagename |
106 | else | 106 | else |
107 | for f in $files | 107 | for f in $files |
108 | do | 108 | do |
109 | if [ -d $f ] | 109 | if [ -d $f ] |
110 | then | 110 | then |
111 | ffiles=$(find $f -type f -o -type b -o -type c -o -type l) | 111 | ffiles=$(find $f -type f -o -type b -o -type c -o -type l) |
112 | else | 112 | else |
113 | ffiles=$f | 113 | ffiles=$f |
114 | fi | 114 | fi |
115 | for ff in $ffiles | 115 | for ff in $ffiles |
116 | do | 116 | do |
117 | case $ff in | 117 | case $ff in |
118 | */CVS/*) | 118 | */CVS/*) |
119 | continue | 119 | continue |
120 | ;;*~) | 120 | ;;*~) |
121 | continue | 121 | continue |
122 | ;;*.control) | 122 | ;;*.control) |
123 | continue | 123 | continue |
124 | ;; $QTDIR/*) | 124 | ;; $QTDIR/*) |
125 | BASE=$(dirname /opt/QtPalmtop/${ff#$QTDIR/}) | 125 | BASE=$(dirname /opt/QtPalmtop/${ff#$QTDIR/}) |
126 | ;; etc/*.d/*) | 126 | ;; etc/*.d/*) |
127 | BASE=$(dirname /$ff) | 127 | BASE=$(dirname /$ff) |
128 | ;; root/*) | 128 | ;; root/*) |
129 | BASE=$(dirname ${ff#root}) | 129 | BASE=$(dirname ${ff#root}) |
130 | ;; lib/*) | ||
131 | BASE=$(dirname /opt/QtPalmtop/$ff) | ||
132 | ;; $OPIEDIR/lib/*) | ||
133 | BASE=$(dirname /opt/QtPalmtop/${ff#$OPIEDIR/}) | ||
130 | ;; *) | 134 | ;; *) |
131 | # For SHARP ROM compatibility. Should change to Qtopia. | 135 | # For SHARP ROM compatibility. Should change to Qtopia. |
132 | BASE=/opt/QtPalmtop/$(dirname $ff) | 136 | BASE=/opt/QtPalmtop/$(dirname $ff) |
133 | esac | 137 | esac |
134 | 138 | ||
135 | if [ -f $ff -o -b $ff -o -c $ff ] | 139 | if [ -f $ff -o -b $ff -o -c $ff ] |
136 | then | 140 | then |
137 | D=$DATADIR$BASE | 141 | D=$DATADIR$BASE |
138 | if [ -x $ff -a -n "$STRIP" ] | 142 | if [ -x $ff -a -n "$STRIP" ] |
139 | then | 143 | then |
140 | case $(file $ff) in | 144 | case $(file $ff) in |
141 | $STRIP_FILES) | 145 | $STRIP_FILES) |
142 | $STRIP $ff | 146 | $STRIP $ff |
143 | ;; *) | 147 | ;; *) |
144 | esac | 148 | esac |
145 | fi | 149 | fi |
146 | if [ -n "$RPM" ] | 150 | if [ -n "$RPM" ] |
147 | then | 151 | then |
148 | case "$ff" in | 152 | case "$ff" in |
149 | /*) RPMFILES="$RPMFILES $ff" | 153 | /*) RPMFILES="$RPMFILES $ff" |
150 | ;; *) RPMFILES="$RPMFILES $OPIEDIR/$ff" | 154 | ;; *) RPMFILES="$RPMFILES $OPIEDIR/$ff" |
151 | esac | 155 | esac |
152 | else | 156 | else |
153 | mkdir -p $D | 157 | mkdir -p $D |
154 | if cp -a $ff $D | 158 | if cp -a $ff $D |
155 | then | 159 | then |
156 | true | 160 | true |
157 | else | 161 | else |
158 | ERROR=1 | 162 | ERROR=1 |
159 | fi | 163 | fi |
160 | fi | 164 | fi |
161 | else | 165 | else |
162 | echo >&2 "$0: $i: No such file: $ff" | 166 | echo >&2 "$0: $i: No such file: $ff" |
163 | ERROR=1 | 167 | ERROR=1 |
164 | fi | 168 | fi |
165 | done | 169 | done |
166 | done | 170 | done |
167 | fi | 171 | fi |
168 | if [ -z "$ERROR" ] | 172 | if [ -z "$ERROR" ] |
169 | then | 173 | then |
170 | if [ -n "$RPM" ] | 174 | if [ -n "$RPM" ] |
171 | then | 175 | then |
172 | SPEC=/tmp/mkipks-rpm-$$.spec | 176 | SPEC=/tmp/mkipks-rpm-$$.spec |
173 | echo >$SPEC "Summary: $summary" | 177 | echo >$SPEC "Summary: $summary" |
174 | echo >>$SPEC "Name: $packagename" | 178 | echo >>$SPEC "Name: $packagename" |
175 | echo >>$SPEC "Group: $section" ########## | 179 | echo >>$SPEC "Group: $section" ########## |
176 | echo >>$SPEC "License: $license" | 180 | echo >>$SPEC "License: $license" |
177 | echo >>$SPEC "Version: ${version%-*}" | 181 | echo >>$SPEC "Version: ${version%-*}" |
178 | echo >>$SPEC "Release: ${version#*-}" | 182 | echo >>$SPEC "Release: ${version#*-}" |
179 | 183 | ||
180 | echo >>$SPEC "%description" | 184 | echo >>$SPEC "%description" |
181 | sed -n -e '/^Description:/,$ p' $i | tail +2 >>$SPEC | 185 | sed -n -e '/^Description:/,$ p' $i | tail +2 >>$SPEC |
182 | echo >>$SPEC "%files" | 186 | echo >>$SPEC "%files" |
183 | echo >>$SPEC "%defattr(-,root,root)" | 187 | echo >>$SPEC "%defattr(-,root,root)" |
184 | /bin/ls $RPMFILES >>$SPEC | 188 | /bin/ls $RPMFILES >>$SPEC |
185 | rpm -bb --target $ARCH-unknown-linux $SPEC | 189 | rpm -bb --target $ARCH-unknown-linux $SPEC |
186 | # rm $SPEC | 190 | # rm $SPEC |
187 | elif [ -z "$IMAGEDIR" ] | 191 | elif [ -z "$IMAGEDIR" ] |
188 | then | 192 | then |
189 | #size=$(du -h -s $DATADIR | sed -e 's/[ ].*//') | 193 | #size=$(du -h -s $DATADIR | sed -e 's/[ ].*//') |
190 | if (which mkfs.jffs2 >/dev/null 2>&1); then | 194 | if (which mkfs.jffs2 >/dev/null 2>&1); then |
191 | size=$(mkfs.jffs2 -r $DATADIR | wc -c) | 195 | size=$(mkfs.jffs2 -r $DATADIR | wc -c) |
192 | fi | 196 | fi |
193 | echo "Package: $packagename" >$CTRLDIR/control | 197 | echo "Package: $packagename" >$CTRLDIR/control |