Merge branch 'master' of git+ssh://openadk.org/git/openadk

mk/image.mk

@@ -101,7 +101,7 @@ ${BUILD_DIR}/root.squashfs: ${TARGET_DIR}
 		-nopad -noappend -root-owned $(MAKE_TRACE)
 
 ifeq (,${CUSTOM_ROOTFSSQUASHFS_BUILD})
-${BIN_DIR}/${ROOTFSSQUASHFS}: ${BUILD_DIR}/root.squashfs
+${BUILD_DIR}/${ROOTFSSQUASHFS}: ${BUILD_DIR}/root.squashfs
 	cat ${BUILD_DIR}/${TARGET_KERNEL} ${BUILD_DIR}/root.squashfs \
 	    >${BUILD_DIR}/${ROOTFSSQUASHFS}
 endif

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

package/lsof/Makefile

@@ -5,15 +5,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		lsof
 PKG_VERSION:=		4.84
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		6dae655988c810a7042c06a4e2fa3c5f
 PKG_DESCR:=		list open files
 PKG_SECTION:=		misc
 PKG_URL:=		http://people.freebsd.org/~abe/
 PKG_SITES:=		ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
 
-PKG_HOST_DEPENDS:=	!darwin
-
 DISTFILES:=             ${PKG_NAME}_${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}_${PKG_VERSION}/${PKG_NAME}_${PKG_VERSION}_src
 
@@ -24,7 +22,7 @@ $(eval $(call PKG_template,LSOF,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_
 CONFIG_STYLE:=		minimal
 CONFIGURE_PROG:=	Configure
 CONFIGURE_ARGS:=	-n linux
-XAKE_FLAGS+=		CC='${TARGET_CC}'
+XAKE_FLAGS+=		CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS}'
 INSTALL_STYLE:=		manual
 
 post-extract:

package/lsof/patches/patch-Configure

@@ -1,30 +1,17 @@
 --- lsof_4.84_src.orig/Configure	2010-07-29 17:59:32.000000000 +0200
-+++ lsof_4.84_src/Configure	2010-10-07 20:03:14.000000000 +0200
-@@ -2739,27 +2739,6 @@ return(0); }
-     then
-       LSOF_CFGF="$LSOF_CFGF -DHASIPv6"
-     fi	# }
--
--    # Test for SELinux support.
--
--    LSOF_TMP1=0
--    if test "X$LINUX_HASSELINUX" = "X"	# {
--    then
--      if test -r ${LSOF_INCLUDE}/selinux/selinux.h	# {
--      then
--	LSOF_TMP1=1
--      fi	# }
--    else
--      if test "X$LINUX_HASSELINUX" = "XY" -o "X$LINUX_HASSELINUX" = "Xy" # {
--      then
--	LSOF_TMP1=1
--      fi	# }
--    fi	# }
--    if test $LSOF_TMP1 -eq 1	# {
--    then
--      LSOF_CFGF="$LSOF_CFGF -DHASSELINUX"
--      LSOF_CFGL="$LSOF_CFGL -lselinux"
--    fi	# }
-     LSOF_DIALECT_DIR="linux"
-     LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
-     ;;
++++ lsof_4.84_src/Configure	2011-01-12 19:42:53.000000000 +0100
+@@ -5357,12 +5357,12 @@ then
+   if test "X$LSOF_RANLIB" != "X"	# {
+   then
+     echo "" >> ${LSOF_LIB}/$LSOF_LIBMKF
+-    echo "RANLIB=	$LSOF_RANLIB \${LIB}" >> ${LSOF_LIB}/$LSOF_LIBMKF
++    echo "RANLIB?=	$LSOF_RANLIB" >> ${LSOF_LIB}/$LSOF_LIBMKF
+   fi	# }
+   echo "" >> ${LSOF_LIB}/$LSOF_LIBMKF
+   if test "X$LSOF_CFLAGS_OVERRIDE" = "X"	# {
+   then
+-    echo "CFLAGS=	\${CDEFS} \${INCL} \${DEBUG}" >> ${LSOF_LIB}/$LSOF_LIBMKF
++    echo "CFLAGS?=	\${CDEFS} \${INCL} \${DEBUG}" >> ${LSOF_LIB}/$LSOF_LIBMKF
+   else
+     echo "override CFLAGS=\${CDEFS} \${INCL} \${DEBUG}" >> ${LSOF_LIB}/$LSOF_LIBMKF
+   fi	# }

package/lsof/patches/patch-lib_Makefile_skel

@@ -0,0 +1,11 @@
+--- lsof_4.84_src.orig/lib/Makefile.skel	2001-02-13 03:12:22.000000000 +0100
++++ lsof_4.84_src/lib/Makefile.skel	2011-01-12 19:42:17.000000000 +0100
+@@ -22,7 +22,7 @@ all:	${LIB}
+ 
+ ${LIB}:	${OBJ}
+ 	${AR}
+-	${RANLIB}
++	${RANLIB} ${LIB}
+ 
+ clean:	FRC
+ 	rm -f ${LIB} ${OBJ} errs Makefile.bak a.out core

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

target/cris/Makefile

@@ -21,7 +21,7 @@ kernel-install: tools-compile
 	PATH='${TARGET_PATH}' mkfimage $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
 
 ifeq ($(ADK_TARGET_FS),squashfs)
-imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSSQUASHFS)
+imageinstall: kernel-install $(BUILD_DIR)/$(ROOTFSSQUASHFS)
 	dd if=${BUILD_DIR}/${ROOTFSSQUASHFS} of=${BIN_DIR}/${ROOTFSSQUASHFS} \
 		bs=4063232 conv=sync $(MAKE_TRACE)
 	@if [ $$(stat --format=%s ${BIN_DIR}/${ROOTFSSQUASHFS}) -gt 4063232 ];then \