|
@@ -168,8 +168,8 @@ debstuff() {
|
168
|
168
|
|
169
|
169
|
# read content of each mandatory file from debian_skel
|
170
|
170
|
#
|
171
|
|
- local debian_skel=$(ini 1value debstuff:debian_skel)
|
172
|
|
- test -n "$debian_skel" || die "debstuff:debian_skel not specified"
|
|
171
|
+ local debian_skel=$(ini 1value dist:debstuff)
|
|
172
|
+ test -n "$debian_skel" || die "dist:debstuff not specified"
|
173
|
173
|
test -d "$debian_skel" || die "debian directory template found: $debian_skel"
|
174
|
174
|
mkdir -p debian/source
|
175
|
175
|
local dfsrc dftgt
|
|
@@ -194,7 +194,7 @@ dist() {
|
194
|
194
|
local git_lasthash=$(git_lasthash)
|
195
|
195
|
local dirname=$MKIT_PROJ_PKGNAME-$version
|
196
|
196
|
mkdir -p "$dirname"
|
197
|
|
- ini values "lists:dist" | xargs -I DIST_ITEM cp -R DIST_ITEM "$dirname"
|
|
197
|
+ ini values "dist:tarball" | xargs -I DIST_ITEM cp -R DIST_ITEM "$dirname"
|
198
|
198
|
update_version "$version" "$dirname/mkit.ini"
|
199
|
199
|
mkdir -p "$dirname/.mkit"
|
200
|
200
|
echo -n "$git_lasthash" > "$dirname/.mkit/git_lasthash"
|
|
@@ -210,8 +210,8 @@ rpmstuff() {
|
210
|
210
|
# Build specfile
|
211
|
211
|
#
|
212
|
212
|
local specname="$MKIT_PROJ_PKGNAME.spec"
|
213
|
|
- local specsrc="$(ini 1value "rpmstuff:spec_skel")"
|
214
|
|
- test -n "$specsrc" || die "rpmstuff:spec_skel not specified"
|
|
213
|
+ local specsrc="$(ini 1value "dist:rpmstuff")"
|
|
214
|
+ test -n "$specsrc" || die "dist:rpmstuff not specified"
|
215
|
215
|
test -f "$specsrc" || die "specfile template not found: $specsrc"
|
216
|
216
|
_build1 "$specsrc" "$specname"
|
217
|
217
|
}
|