diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /scripts | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ipkg-build | 2 | ||||
| -rw-r--r-- | scripts/make-ipkg-dir.sh | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/scripts/ipkg-build b/scripts/ipkg-build index 4c0f47143..378236b78 100644 --- a/scripts/ipkg-build +++ b/scripts/ipkg-build @@ -98,7 +98,7 @@ You probably want to remove them: " >&2 [ "$?" -ne 0 ] && PKG_ERROR=1 if [ -z "$section" ]; then echo "The Section field should have one of the following values:" >&2 - echo "admin, base, comm, editors, extras, games, graphics, kernel, libs, misc, net, text, web, x11" >&2 + echo "admin, base, comm, editors, extras, games, graphics, kernel, lang, libs, misc, net, text, web, x11" >&2 fi priority=`required_field Priority` diff --git a/scripts/make-ipkg-dir.sh b/scripts/make-ipkg-dir.sh index 08b48f59e..857076fb1 100644 --- a/scripts/make-ipkg-dir.sh +++ b/scripts/make-ipkg-dir.sh @@ -1,4 +1,4 @@ -BASE=http://waldemar-brodkorb.de +BASE=http://www.openadk.org TARGET=$1 CONTROL=$2 VERSION=$3 @@ -9,7 +9,9 @@ WD=$(pwd) mkdir -p "$TARGET/CONTROL" grep '^[^(Version|Architecture)]' "$CONTROL" > "$TARGET/CONTROL/control" grep '^Maintainer' "$CONTROL" 2>&1 >/dev/null || \ - echo "Maintainer: Waldemar Brodkorb <mail@waldemar-brodkorb.de>" >> "$TARGET/CONTROL/control" + echo "Maintainer: Waldemar Brodkorb <wbx@openadk.org>" >> "$TARGET/CONTROL/control" +grep '^Priority' "$CONTROL" 2>&1 >/dev/null || \ + echo "Priority: optional" >> "$TARGET/CONTROL/control" grep '^Source' "$CONTROL" 2>&1 >/dev/null || { pkgbase=$(echo "$WD" | sed -e "s|^$TOPDIR/||g") [ "$pkgbase" = "$WD" ] && src="N/A" || src="$BASE/$pkgbase" |