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/cfgfs | |
| 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/cfgfs')
| -rw-r--r-- | package/cfgfs/Makefile | 5 | ||||
| -rw-r--r-- | package/cfgfs/ipkg/cfgfs.control | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index d99079195..4ab5c6ea1 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -8,12 +8,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cfgfs PKG_VERSION:= 1.0.6 PKG_RELEASE:= 2 +PKG_DESCR:= compressed config filesystem +PKG_SECTION:= base + WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CFGFS,cfgfs,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE:= auto diff --git a/package/cfgfs/ipkg/cfgfs.control b/package/cfgfs/ipkg/cfgfs.control deleted file mode 100644 index 8ae5a7917..000000000 --- a/package/cfgfs/ipkg/cfgfs.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: cfgfs -Priority: optional -Section: base -Description: compressed config filesystem - |