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/uclibc | |
| 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/uclibc')
| -rw-r--r-- | package/uclibc/Makefile | 5 | ||||
| -rw-r--r-- | package/uclibc/files/uclibc.conffiles (renamed from package/uclibc/ipkg/uclibc.conffiles) | 0 | ||||
| -rw-r--r-- | package/uclibc/ipkg/uclibc.control | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile index bd5e2687b..707d62b4a 100644 --- a/package/uclibc/Makefile +++ b/package/uclibc/Makefile @@ -6,11 +6,14 @@ include $(TOPDIR)/rules.mk include $(TOPDIR)/toolchain/uClibc/Makefile.inc +PKG_DESCR:= embedded C library +PKG_SECTION:= base + NO_DISTFILES:=1 include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,UCLIBC,uclibc,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,UCLIBC,uclibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) # do nothing, uClibc is already build in toolchain directory do-install: diff --git a/package/uclibc/ipkg/uclibc.conffiles b/package/uclibc/files/uclibc.conffiles index e9ee7e4d7..e9ee7e4d7 100644 --- a/package/uclibc/ipkg/uclibc.conffiles +++ b/package/uclibc/files/uclibc.conffiles diff --git a/package/uclibc/ipkg/uclibc.control b/package/uclibc/ipkg/uclibc.control deleted file mode 100644 index 2cc44200a..000000000 --- a/package/uclibc/ipkg/uclibc.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: uclibc -Priority: optional -Section: net -Description: Standard C library for embedded Linux systems |