diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-07 20:12:57 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-07 20:12:57 +0100 |
| commit | 2bbfadac526c7880720e518e0fdd84ac0ca601bd (patch) | |
| tree | 5d7ca7982b47e2fe7ea4ef6ed5f461f3ffce83d7 /package/cfgfs/Makefile | |
| parent | 6daa792eab1488d013fefc5eb7e4d01f40f38687 (diff) | |
| parent | 2e44499238125dbecbbf17222496ebba315cc90c (diff) | |
resolve conflicts
Diffstat (limited to 'package/cfgfs/Makefile')
| -rw-r--r-- | package/cfgfs/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 926473eb6..33d4ee228 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -4,16 +4,17 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cfgfs -PKG_VERSION:= 1.0.6 -PKG_RELEASE:= 5 +PKG_VERSION:= 1.0.7 +PKG_RELEASE:= 1 PKG_DESCR:= compressed config filesystem PKG_SECTION:= base + PKG_TARGET_DEPENDS:= alix wrap foxboard ag241 rb532 WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 -CFLINE_CFGFS:= select BUSYBOX_COMM\n\tselect BUSYBOX_MD5SUM\n\tselect BUSYBOX_XARGS\n\tselect BUSYBOX_FEATURE_SORT_BIG\n\tdepends on !ADK_TARGET_ROOTFS_NFSROOT\n\tdepends on !ADK_TARGET_ROOTFS_YAFFS +CFLINE_CFGFS:= select BUSYBOX_COMM\n\tselect BUSYBOX_MD5SUM\n\tselect BUSYBOX_XARGS\n\tselect BUSYBOX_FEATURE_SORT_BIG\n\tdepends on !ADK_TARGET_ROOTFS_NFSROOT include ${TOPDIR}/mk/package.mk |