diff options
99 files changed, 2752 insertions, 372 deletions
@@ -102,7 +102,7 @@ source "target/config/Config.in.runtime" endmenu menu "Kernel configuration" - visible if !ADK_CHOOSE_APPLIANCE + visible if !ADK_CHOOSE_APPLIANCE && ADK_TARGET_KERNEL_CUSTOMISING source "target/linux/Config.in" endmenu diff --git a/mk/build.mk b/mk/build.mk index 214c52e88..29c99bd6f 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -223,7 +223,7 @@ kernelconfig: ${KERNEL_MAKE_ENV} ${MAKE} \ ARCH=$(ADK_TARGET_ARCH) \ ${KERNEL_MAKE_OPTS} \ - -C $(BUILD_DIR)/linux menuconfig + menuconfig # create a new package from package/.template newpackage: diff --git a/mk/fetch.mk b/mk/fetch.mk index 5fb13a29e..6365b4c13 100644 --- a/mk/fetch.mk +++ b/mk/fetch.mk @@ -28,7 +28,7 @@ ifeq ($(strip ${PKG_NOCHECKSUM}),) ${_CHECKSUM_COOKIE}: ${FULLDISTFILES} -rm -rf ${WRKDIR} ifneq ($(ADK_DISABLE_CHECKSUM),y) - @if [ ! -e "${FULLDISTFILES}.nohash" ]; then \ + @if [ ! -e $(firstword ${FULLDISTFILES}).nohash ]; then \ OK=n; \ allsums="$(strip ${PKG_HASH})"; \ (shasum -a 256 ${FULLDISTFILES}; echo exit) | while read sum name; do \ diff --git a/mk/image.mk b/mk/image.mk index bd7d66f96..7d982d773 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -37,7 +37,7 @@ else $(error No login shell configured!) endif -imageprepare: image-prepare-post extra-install +imageprepare: image-prepare-post extra-install prelink # if an extra directory exist in ADK_TOPDIR, copy all content over the # root directory, do the same if make extra=/dir/to/extra is used @@ -79,6 +79,19 @@ ifneq ($(ADK_TARGET_ARCH_AARCH64)$(ADK_TARGET_ARCH_X86_64)$(ADK_TARGET_ARCH_PPC6 (cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib) endif +ifeq (${ADK_PRELINK},) +prelink: +else +${TARGET_DIR}/etc/prelink.conf: + echo '/' > $@ + +prelink: ${TARGET_DIR}/etc/prelink.conf + $(TRACE) target/prelink + ${TARGET_CROSS}prelink ${ADK_PRELINK_OPTS} \ + --ld-library-path=${STAGING_TARGET_DIR}/usr/lib:${STAGING_TARGET_DIR}/lib \ + --root=${TARGET_DIR} -a $(MAKE_TRACE) +endif + KERNEL_PKGDIR:=$(LINUX_BUILD_DIR)/kernel-pkg KERNEL_PKG:=$(PACKAGE_DIR)/kernel_$(KERNEL_VERSION)_$(ADK_TARGET_CPU_ARCH).$(PKG_SUFFIX) TARGET_KERNEL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_FS}-kernel @@ -203,7 +216,7 @@ ifeq ($(ADK_KERNEL_COMP_BZIP2),y) echo "CONFIG_INITRAMFS_COMPRESSION_BZIP2=y" >> ${LINUX_DIR}/.config endif @-rm $(LINUX_DIR)/usr/initramfs_data.cpio* 2>/dev/null - env $(KERNEL_MAKE_ENV) $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKE_OPTS) \ + env $(KERNEL_MAKE_ENV) $(MAKE) $(KERNEL_MAKE_OPTS) \ -j${ADK_MAKE_JOBS} $(ADK_TARGET_KERNEL) $(MAKE_TRACE) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index b66f71132..37570909e 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -35,18 +35,18 @@ $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig $(ADK_TO $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-configure -for f in $(TARGETS);do if [ -f $$f ];then rm $$f;fi;done $(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/mini.config - ${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} KCONFIG_ALLCONFIG=mini.config allnoconfig $(MAKE_TRACE) + ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} KCONFIG_ALLCONFIG=mini.config allnoconfig $(MAKE_TRACE) touch -c $(LINUX_DIR)/.config $(LINUX_DIR)/$(KERNEL_FILE): $(LINUX_DIR)/.config $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-compile - ${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(KERNEL_TARGET) modules $(MAKE_TRACE) + ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(KERNEL_TARGET) modules $(MAKE_TRACE) touch -c $(LINUX_DIR)/$(KERNEL_FILE) $(LINUX_BUILD_DIR)/modules: $(LINUX_DIR)/$(KERNEL_FILE) $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-modules-install rm -rf $(LINUX_BUILD_DIR)/modules - ${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} DEPMOD=true \ + ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} DEPMOD=true \ INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules \ LOCALVERSION="" \ modules_install $(MAKE_TRACE) diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk index 17a8d23a2..89ba10dd9 100644 --- a/mk/kernel-vars.mk +++ b/mk/kernel-vars.mk @@ -1,7 +1,7 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -KERNEL_MAKE_OPTS:= V=1 \ +KERNEL_MAKE_OPTS:= V=1 -C "${LINUX_DIR}" \ ARCH="$(ADK_TARGET_KARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ CC="$(TARGET_CC)" \ diff --git a/mk/package.mk b/mk/package.mk index 65d9c8f9f..3b27d1278 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -308,7 +308,7 @@ clean-targets: clean: @$(CMD_TRACE) "cleaning... " @$(MAKE) clean-targets $(MAKE_TRACE) - rm -rf ${WRKDIR} ${ALL_IPKGS} ${STAGING_PKG_DIR}/stamps/${PKG_NAME}${PKG_VERSION} + rm -rf ${WRKDIR} ${ALL_IPKGS} ${_IPKGS_COOKIE} distclean: clean rm -f ${FULLDISTFILES} diff --git a/package/aufs-util/Makefile b/package/aufs-util/Makefile new file mode 100644 index 000000000..fc57c7bb6 --- /dev/null +++ b/package/aufs-util/Makefile @@ -0,0 +1,44 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= aufs-util +# branch aufs3.x-rcN (of around June 6th, 2014) +PKG_VERSION:= a0eb20c75c07299bfc50c3d80023e1d22c86b4cc +PKG_RELEASE:= 1 +PKG_DESCR:= aufs utilities (version 3 and above) +PKG_SECTION:= sys/fs +PKG_URL:= http://aufs.sf.net/ +PKG_SITES:= git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util + +PKG_SUBPKGS:= AUFS_UTIL LIBAU +PKGSD_LIBAU:= aufs userspace library +PKGSC_LIBAU:= libs/misc + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,AUFS_UTIL,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) +$(eval $(call PKG_template,LIBAU,libau,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBAU),$(PKGSC_LIBAU))) + +CONFIG_STYLE:= manual +XAKE_FLAGS+= Install=install \ + HOSTCC="$(HOST_CC)" \ + CPPFLAGS_FOR_BUILD="-I$(STAGING_TARGET_DIR)/usr/include -I./libau" + +aufs-util-install: + $(INSTALL_DIR) $(IDIR_AUFS_UTIL)/sbin + $(INSTALL_BIN) $(WRKINST)/sbin/{{u,}mount.aufs,auplink} \ + $(IDIR_AUFS_UTIL)/sbin + $(INSTALL_DIR) $(IDIR_AUFS_UTIL)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/au{brsync,chk} \ + $(IDIR_AUFS_UTIL)/usr/bin + $(INSTALL_DIR) $(IDIR_AUFS_UTIL)/etc/default + $(INSTALL_DATA) $(WRKINST)/etc/default/aufs \ + $(IDIR_AUFS_UTIL)/etc/default + +libau-install: + $(INSTALL_DIR) $(IDIR_LIBAU)/usr/lib + $(CP) $(WRKINST)/usr/lib/libau* $(IDIR_LIBAU)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/aufs-util/patches/patch-Makefile b/package/aufs-util/patches/patch-Makefile new file mode 100644 index 000000000..0253076f1 --- /dev/null +++ b/package/aufs-util/patches/patch-Makefile @@ -0,0 +1,23 @@ + - Ensure correct (HOST-)FLAGS when compiling the intermediates + - Drop version test, this cant work anyway since there is no aufs3.12 branch anywhere +--- w-aufs-util-3.x-rcN-050614-1.orig/Makefile 2014-05-06 15:36:53.000000000 +0200 ++++ w-aufs-util-3.x-rcN-050614-1/Makefile 2014-06-05 14:32:53.496611173 +0200 +@@ -49,7 +49,7 @@ LibUtilObj = perror.o proc_mnt.o br.o pl + LibUtilHdr = au_util.h + export + +-all: ver_test ${Man} ${Bin} ${Etc} ++all: ${Man} ${Bin} ${Etc} + ${MAKE} -C libau $@ + ln -sf ./libau/libau*.so . + +@@ -85,6 +85,9 @@ aufs.5: aufs.in.5 c2tmac + chmod a-w $@ + + c2sh c2tmac ver: CC = ${HOSTCC} ++c2sh c2tmac ver: CFLAGS = ${CFLAGS_FOR_BUILD} ++c2sh c2tmac ver: LDFLAGS = ${LDFLAGS_FOR_BUILD} ++c2sh c2tmac ver: CPPFLAGS = ${CPPFLAGS_FOR_BUILD} + .INTERMEDIATE: c2sh c2tmac ver + + Install = install -o root -g root -p diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index 6e68fc786..d5bbad0ef 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -488,6 +488,7 @@ config BUSYBOX_FEATURE_IFUPDOWN_IP_BUILTIN bool "Use busybox ip applet" default y depends on BUSYBOX_FEATURE_IFUPDOWN_IP + depends on !ADK_PACKAGE_IP select BUSYBOX_PLATFORM_LINUX select BUSYBOX_IP select BUSYBOX_FEATURE_IP_ADDRESS diff --git a/package/capi4k-utils/Makefile b/package/capi4k-utils/Makefile new file mode 100644 index 000000000..0ac58e978 --- /dev/null +++ b/package/capi4k-utils/Makefile @@ -0,0 +1,48 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= capi4k-utils +PKG_VERSION:= 2005-07-18 +PKG_RELEASE:= 1 +PKG_HASH:= b162d726a31310fc29e7c0a25a4f82a590457f6a95c1b1168bcd72b6497b5746 +PKG_DESCR:= capi4linux utils +PKG_SECTION:= net/voip +PKG_SITES:= ftp://ftp.in-berlin.de/pub/capi4linux/ + +PKG_CFLINE_CAPI4K_UTILS:=depends on ADK_BROKEN + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz +WRKDIST= $(WRKDIR)/$(PKG_NAME) + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,CAPI4K_UTILS,capi4k-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +CONFIG_STYLE:= manual +XAKE_FLAGS+= PPPVERSIONS=2.4.5 + +do-configure: + echo "CONFIG_KERNELDIR='$(LINUX_DIR)'" >$(WRKDIST)/.config + echo "CONFIG_BINDIR='/usr/bin'" >>$(WRKDIST)/.config + echo "CONFIG_SBINDIR='/usr/sbin'" >>$(WRKDIST)/.config + echo "CONFIG_MANDIR='/usr/man'" >>$(WRKDIST)/.config + echo "CONFIG_RCAPID=y" >>$(WRKDIST)/.config + echo "CONFIG_PPPDCAPIPLUGIN=y" >>$(WRKDIST)/.config + (cd $(WRKDIST); \ + cp Makefile Makefile.tmp; \ + $(MAKE_ENV) $(MAKE) $(MAKE_FLAGS) -f Makefile.tmp subconfig; \ + rm -f Makefile.tmp; \ + ) + +c |