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/mrd6 | |
| 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/mrd6')
| -rw-r--r-- | package/mrd6/Makefile | 20 | ||||
| -rw-r--r-- | package/mrd6/files/mrd6.init | 4 | ||||
| -rw-r--r-- | package/mrd6/files/mrd6.postinst (renamed from package/mrd6/ipkg/mrd6.postinst) | 0 | ||||
| -rw-r--r-- | package/mrd6/ipkg/mrd6.control | 6 |
4 files changed, 16 insertions, 14 deletions
diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile index 185157491..4cac9e588 100644 --- a/package/mrd6/Makefile +++ b/package/mrd6/Makefile @@ -9,29 +9,35 @@ PKG_NAME:= mrd6 PKG_VERSION:= 0.9.6 PKG_RELEASE:= 1 PKG_MD5SUM:= 93ada53bb414b9d622f80a717bc2694b -MASTER_SITES:= http://www.openadk.org/distfiles/ +PKG_DESCR:= IPv6 multicast routing daemon +PKG_SECTION:= net +PKG_DEPENDS:= kmod-ipv6 +PKG_SITES:= http://www.openadk.org/distfiles/ + WRKBUILD= ${WRKSRC}/src include ${TOPDIR}/mk/package.mk ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y) -TCXXFLAGS+= -fno-builtin -nostdinc++ -nodefaultlibs -I${STAGING_DIR}/usr/include/uClibc++ -TLDFLAGS+= -nodefaultlibs -luClibc++ -shared PKG_DEPENDS:= uclibc++ else PKG_DEPENDS:= libstdcxx endif -$(eval $(call PKG_template,MRD6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS})) +$(eval $(call PKG_template,MRD6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y) +TCXXFLAGS+= -fno-builtin -nostdinc++ -nodefaultlibs -I${STAGING_DIR}/usr/include/uClibc++ +TLDFLAGS+= -nodefaultlibs -luClibc++ -shared +endif BUILD_STYLE:= auto INSTALL_STYLE:= auto XAKE_FLAGS+= EXTRA_FLAGS="${TCFLAGS}" post-install: - ${INSTALL_DIR} ${WRKINST}/etc/init.d - ${INSTALL_DATA} files/${PKG_NAME}.conf ${WRKINST}/etc - ${INSTALL_BIN} files/${PKG_NAME}.init ${WRKINST}/etc/init.d/${PKG_NAME} + ${INSTALL_DIR} ${WRKINST}/etc + ${INSTALL_DATA} ./files/${PKG_NAME}.conf ${WRKINST}/etc ${INSTALL_DIR} ${IDIR_MRD6}/usr/sbin ${CP} ${WRKINST}/* ${IDIR_MRD6}/ diff --git a/package/mrd6/files/mrd6.init b/package/mrd6/files/mrd6.init index ed3d4bab6..710cde814 100644 --- a/package/mrd6/files/mrd6.init +++ b/package/mrd6/files/mrd6.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 60 +#PKG mrd6 +#INIT 60 + . /etc/rc.conf case $1 in diff --git a/package/mrd6/ipkg/mrd6.postinst b/package/mrd6/files/mrd6.postinst index 10332bae6..10332bae6 100644 --- a/package/mrd6/ipkg/mrd6.postinst +++ b/package/mrd6/files/mrd6.postinst diff --git a/package/mrd6/ipkg/mrd6.control b/package/mrd6/ipkg/mrd6.control deleted file mode 100644 index 89082b9f4..000000000 --- a/package/mrd6/ipkg/mrd6.control +++ /dev/null @@ -1,6 +0,0 @@ -Package: mrd6 -Architecture: mipsel -Section: net -Priority: optional -Depends: kmod-ipv6 -Description: IPv6 multicast routing daemon |