diff options
| -rw-r--r-- | mk/build.mk | 5 | ||||
| -rw-r--r-- | package/Config.in | 2 | ||||
| -rw-r--r-- | package/cryptinit/Makefile | 3 | ||||
| -rw-r--r-- | package/gatling/Makefile | 8 | ||||
| -rw-r--r-- | package/libowfat/Makefile | 10 | ||||
| -rw-r--r-- | package/openssh/Makefile | 14 |
6 files changed, 18 insertions, 24 deletions
diff --git a/mk/build.mk b/mk/build.mk index 12baf5049..42f8db051 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -17,6 +17,11 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \ ADK_FORCE_PARALLEL=n \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_BASE_FILES=y \ + ADK_COMPILE_HEIMDAL=n \ + ADK_PACKAGE_HEIMDAL_PKINIT=n \ + ADK_PACKAGE_HEIMDAL_SERVER=n \ + ADK_PACKAGE_HEIMDAL_LIBS=n \ + ADK_PACKAGE_HEIMDAL_CLIENT_LIBS=n \ BUSYBOX_SELINUX=n \ BUSYBOX_MODPROBE_SMALL=n \ BUSYBOX_EJECT=n \ diff --git a/package/Config.in b/package/Config.in index 507497e0d..1806589fc 100644 --- a/package/Config.in +++ b/package/Config.in @@ -468,8 +468,6 @@ source "package/obexftp/Config.in.lib" source "package/openobex/Config.in" source "package/libosip2/Config.in" source "package/libosip2/Config.in.lib" -source "package/libowfat/Config.in" -source "package/libowfat/Config.in.lib" source "package/libp11/Config.in" source "package/libp11/Config.in.lib" source "package/libpcap/Config.in" diff --git a/package/cryptinit/Makefile b/package/cryptinit/Makefile index 6969ecc6e..6ffcef02e 100644 --- a/package/cryptinit/Makefile +++ b/package/cryptinit/Makefile @@ -15,8 +15,6 @@ NO_DISTFILES:= 1 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,CRYPTINIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - BUILD_STYLE:= manual INSTALL_STYLE:= manual @@ -39,6 +37,5 @@ do-build: do-install: $(CP) ./files/initramfs_list $(LINUX_DIR) $(CP) ${WRKBUILD}/cryptinit $(LINUX_DIR) - @touch $(IDIR_CRYPTINIT)/.cryptinit include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gatling/Makefile b/package/gatling/Makefile index 88aa5a1e9..cb1c48188 100644 --- a/package/gatling/Makefile +++ b/package/gatling/Makefile @@ -4,14 +4,14 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gatling -PKG_VERSION:= 0.10 +PKG_VERSION:= 0.11 PKG_RELEASE:= 1 -PKG_MD5SUM:= 04e8434156d91657c77a8a038c5b27cf +PKG_MD5SUM:= a0fb49ccb6b910bdbd7e76a9960394e3 PKG_DESCR:= small non-forking webserver PKG_SECTION:= net -PKG_DEPENDS:= libowfat libiconv +PKG_DEPENDS:= libiconv PKG_BUILDDEP+= libowfat libiconv -PKG_URL:= http://www.fefe.de/gatling +PKG_URL:= http://www.fefe.de/gatling/ PKG_SITES:= http://dl.fefe.de/ DISTFILES= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/libowfat/Makefile b/package/libowfat/Makefile index 2252d83f5..1af2234df 100644 --- a/package/libowfat/Makefile +++ b/package/libowfat/Makefile @@ -7,8 +7,6 @@ PKG_NAME:= libowfat PKG_VERSION:= 0.28 PKG_RELEASE:= 1 PKG_MD5SUM:= 6bbee9a86506419657d87123b7a6f2c1 -PKG_DESCR:= useful C library -PKG_SECTION:= libs PKG_URL:= http://www.fefe.de/libowfat PKG_SITES:= http://dl.fefe.de/ @@ -16,13 +14,11 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBOWFAT,libowfat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -BUILD_STYLE= auto -INSTALL_STYLE= auto +BUILD_STYLE:= auto +INSTALL_STYLE:= auto +TCFLAGS+= ${TCPPFLAGS} MAKE_FILE= GNUmakefile MAKE_FLAGS+= DIET= CC='${TARGET_CC}' CROSS=${TARGET_CROSS} -TCFLAGS+= ${TCPPFLAGS} FAKE_FLAGS+= prefix='${WRKINST}/usr' \ INCLUDEDIR='${WRKINST}/usr/include/owfat' diff --git a/package/openssh/Makefile b/package/openssh/Makefile index e7fe57098..6aa819a3d 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -6,17 +6,19 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openssh PKG_VERSION:= 5.3p1 PKG_RELEASE:= 1 +PKG_MD5SUM:= 13563dbf61f36ca9a1e4254260131041 +PKG_DESCR:= OpenSSH server +PKG_SECTION:= net +PKG_DEPENDS:= zlib libopenssl PKG_BUILDDEP+= zlib openssl ifeq (${ADK_COMPILE_OPENSSH_WITH_KRB5},y) +PKG_DEPENDS+= krb5-libs PKG_BUILDDEP+= krb5 endif ifeq (${ADK_COMPILE_OPENSSH_WITH_HEIMDAL},y) +PKG_DEPENDS+= heimdal-libs PKG_BUILDDEP+= heimdal endif -PKG_MD5SUM:= 13563dbf61f36ca9a1e4254260131041 -PKG_DESCR:= OpenSSH server -PKG_SECTION:= net -PKG_DEPENDS:= zlib libopenssl PKG_URL:= http://www.openssh.com PKG_SITES:= ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ ftp://openbsd.wiretapped.net/pub/OpenBSD/OpenSSH/portable/ \ @@ -30,10 +32,6 @@ PKG_DESCR_4:= OpenSSH sftp server include ${TOPDIR}/mk/package.mk -ifeq ($(ADK_COMPILE_OPENSSH_WITH_KERBEROS),y) -PKG_DEPENDS+= heimdal-libs -endif - $(eval $(call PKG_template,OPENSSH_SERVER,openssh-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,OPENSSH_CLIENT,openssh-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION})) $(eval $(call PKG_template,OPENSSH_CLIENT_UTILS,openssh-client-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_2},${PKG_SECTION})) |