diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-09-16 13:10:39 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-09-16 13:10:39 +0200 |
| commit | 9a625cd021c2d087a988699dcfc3e512fa163235 (patch) | |
| tree | 2fbdefdee370f2cd2c5ee76ec62b9dd9b65cbd9c /package/busybox | |
| parent | afab289b265ff987c3f62393b3ef707c2650704f (diff) | |
| parent | 4422cda575db22275b067e07ad4b585572d91756 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
mk/kernel-build.mk
package/expat/Makefile
package/gettext/Makefile
package/perl/Makefile
package/zlib/Makefile
Diffstat (limited to 'package/busybox')
| -rw-r--r-- | package/busybox/Makefile | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile index cdd0d8538..1f56f057b 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -14,13 +14,14 @@ PKG_SITES:= http://www.busybox.net/downloads/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -PKG_DESCR_UDHCPD:= uDHCPD meta package -PKG_SECTION_UDHCPD:= net +PKG_SUBPKGS:= BUSYBOX UDHCPD +PKGSD_UDHCPD:= uDHCPD meta package +PKGSC_UDHCPD:= net include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,UDHCPD,udhcpd,${PKG_VERSION}-${PKG_RELEASE},busybox,${PKG_DESCR_UDHCPD},${PKG_SECTION_UDHCPD})) +$(eval $(call PKG_template,UDHCPD,udhcpd,${PKG_VERSION}-${PKG_RELEASE},busybox,${PKGSD_UDHCPD},${PKGSC_UDHCPD})) SUB_INSTALLS-y:= SUB_INSTALLS-m:= @@ -81,12 +82,4 @@ udhcpd-install: ${INSTALL_DIR} ${IDIR_UDHCPD}/etc/ ${INSTALL_DATA} ./files/udhcpd.conf ${IDIR_UDHCPD}/etc/ -rebuild: - @if [ -f ${TOPDIR}/.rebuild.${PKG_NAME} ];then \ - rm ${WRKBUILD}/.build_done; \ - rm ${TOPDIR}/.rebuild.${PKG_NAME}; \ - fi - -fake: rebuild - include ${TOPDIR}/mk/pkg-bottom.mk |