summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-12 18:45:57 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-12 18:45:57 (GMT)
commitd063a0fb23d3a415f31338263afc4e3ec135171c (patch)
tree4a530016b17b187fe420037abedb349f718f1422
parent9a7fd2168ce172fcd7111b1137c7e4808ce1f7c8 (diff)
rename to external kernel module style
-rw-r--r--package/ipset/Makefile12
-rw-r--r--package/rtsp/Makefile12
2 files changed, 12 insertions, 12 deletions
diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index ff8a039..01ba6a8 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -12,16 +12,16 @@ PKG_SECTION:= firewall
PKG_URL:= http://ipset.netfilter.org/
PKG_SITES:= http://ipset.netfilter.org/
-PKG_SUBPKGS:= IPSET KMOD_IPSET
-PKGSD_KMOD_IPSET:= ipset kernel module
-PKGSC_KMOD_IPSET:= kernel
+PKG_SUBPKGS:= IPSET IPSET_KMOD
+PKGSD_IPSET_KMOD:= ipset kernel module
+PKGSC_IPSET_KMOD:= kernel
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKGSD_KMOD_IPSET},${PKGSC_KMOD_IPSET}))
+$(eval $(call PKG_template,IPSET_KMOD,ipset-kmod,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKGSD_IPSET_KMOD},${PKGSC_IPSET_KMOD}))
CONFIG_STYLE:= manual
XAKE_FLAGS+= PREFIX=/usr
@@ -39,8 +39,8 @@ post-install:
${INSTALL_BIN} ${WRKINST}/usr/sbin/ipset ${IDIR_IPSET}/usr/sbin
${CP} ${WRKINST}/usr/lib/ipset/*.so ${IDIR_IPSET}/usr/lib/ipset/
# kernel modules (no autoload at the moment)
- ${INSTALL_DIR} ${IDIR_KMOD_IPSET}/lib/modules/${KERNEL_VERSION}/
+ ${INSTALL_DIR} ${IDIR_IPSET_KMOD}/lib/modules/${KERNEL_VERSION}/
${INSTALL_DATA} ${WRKBUILD}/kernel/*.ko \
- ${IDIR_KMOD_IPSET}/lib/modules/${KERNEL_VERSION}
+ ${IDIR_IPSET_KMOD}/lib/modules/${KERNEL_VERSION}
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/rtsp/Makefile b/package/rtsp/Makefile
index ec5bb1d..bc11f10 100644
--- a/package/rtsp/Makefile
+++ b/package/rtsp/Makefile
@@ -15,7 +15,7 @@ NO_DISTFILES:= 1
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,KMOD_RTSP,kmod-rtsp,${KERNEL_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,RTSP_KMOD,rtsp-kmod,${KERNEL_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
@@ -28,11 +28,11 @@ pre-build:
$(MAKE) -C ${WRKBUILD} debug V=1
do-install:
- ${INSTALL_DIR} ${IDIR_KMOD_RTSP}/etc/modules.d/
- echo "nf_conntrack_rtsp" > ${IDIR_KMOD_RTSP}/etc/modules.d/60-nf-nat-rtsp
- echo "nf_nat_rtsp" >> ${IDIR_KMOD_RTSP}/etc/modules.d/60-nf-nat-rtsp
- ${INSTALL_DIR} ${IDIR_KMOD_RTSP}/lib/modules/${KERNEL_VERSION}/
+ ${INSTALL_DIR} ${IDIR_RTSP_KMOD}/etc/modules.d/
+ echo "nf_conntrack_rtsp" > ${IDIR_RTSP_KMOD}/etc/modules.d/60-nf-nat-rtsp
+ echo "nf_nat_rtsp" >> ${IDIR_RTSP_KMOD}/etc/modules.d/60-nf-nat-rtsp
+ ${INSTALL_DIR} ${IDIR_RTSP_KMOD}/lib/modules/${KERNEL_VERSION}/
${INSTALL_DATA} ${WRKBUILD}/*.ko \
- ${IDIR_KMOD_RTSP}/lib/modules/${KERNEL_VERSION}
+ ${IDIR_RTSP_KMOD}/lib/modules/${KERNEL_VERSION}
include ${TOPDIR}/mk/pkg-bottom.mk