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 /package/tar | |
| 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 'package/tar')
| -rw-r--r-- | package/tar/Makefile | 10 | ||||
| -rw-r--r-- | package/tar/ipkg/tar.control | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/package/tar/Makefile b/package/tar/Makefile index 333e8a0ca..638ba6432 100644 --- a/package/tar/Makefile +++ b/package/tar/Makefile @@ -9,13 +9,15 @@ PKG_NAME:= tar PKG_VERSION:= 1.22 PKG_RELEASE:= 1 PKG_MD5SUM:= efafad1b256e3de410f4fce5335d9c9d - -MASTER_SITES:= ftp://ftp.informatik.rwth-aachen.de/pub/gnu/tar/ \ +PKG_DESCR:= GNU tar +PKG_SECTION:= utils +PKG_URL:= http://mirrors.kernel.org/gnu/tar +PKG_SITES:= ftp://ftp.informatik.rwth-aachen.de/pub/gnu/tar/ \ http://mirrors.kernel.org/gnu/tar/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,TAR,tar,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,TAR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto @@ -23,6 +25,6 @@ INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_TAR}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/tar ${IDIR_TAR}/usr/bin/tar + ${INSTALL_BIN} ${WRKINST}/usr/bin/tar ${IDIR_TAR}/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/tar/ipkg/tar.control b/package/tar/ipkg/tar.control deleted file mode 100644 index 7d53ceea8..000000000 --- a/package/tar/ipkg/tar.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: tar -Priority: optional -Section: archival -Description: GNU tar |