summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-05-30 22:59:29 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-05-30 22:59:29 +0200
commitfb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch)
tree379626b7b419ac1643131a7b8ac07e9fb87b9f80 /mk
parent5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff)
parentba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (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 'mk')
-rw-r--r--mk/build.mk8
-rw-r--r--mk/buildhlp.mk2
-rw-r--r--mk/fetch.mk2
-rw-r--r--mk/kernel-build.mk12
-rw-r--r--mk/linux.mk2
-rw-r--r--mk/package.mk31
-rw-r--r--mk/vars.mk4
7 files changed, 52 insertions, 9 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 79406bf9f..ef40ec962 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -18,8 +18,8 @@ noconfig_targets:= menuconfig \
_mconfig \
tags
-MAKECLEAN_SYMBOLS= ADK_TARGET_LIB_UCLIBC ADK_TARGET_LIB_GLIBC ADK_SSP ADK_IPV6 ADK_CXX \
- ADK_DEBUG
+MAKECLEAN_SYMBOLS= ADK_TARGET_LIB_UCLIBC ADK_TARGET_LIB_GLIBC ADK_SSP \
+ ADK_IPV6 ADK_CXX ADK_DEBUG
POSTCONFIG= -@\
if [ -f .config.old ];then \
if [ -d .cfg ];then \
@@ -57,7 +57,11 @@ all: world
world: $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR) ${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG
${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
+ifeq ($(ADK_NATIVE),y)
+ $(MAKE) -f mk/build.mk toolchain/kernel-headers-prepare target/config-prepare target/compile package/compile root_clean package/install package_index target/install
+else
$(MAKE) -f mk/build.mk toolchain/install target/config-prepare target/compile package/compile root_clean package/install package_index target/install
+endif
package_index:
-cd ${PACKAGE_DIR} && \
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index 128f3a54c..386fbbec4 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -3,7 +3,7 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-ifneq ($(strip ${MASTER_SITES}),)
+ifneq ($(strip ${PKG_SITES}),)
ifeq ($(strip ${DISTFILES}),)
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
endif
diff --git a/mk/fetch.mk b/mk/fetch.mk
index c4625ccee..dc593be0b 100644
--- a/mk/fetch.mk
+++ b/mk/fetch.mk
@@ -69,7 +69,7 @@ $(1):
fi; \
mkdir -p "$$$${fullname%%/$$$$filename}"; \
cd "$$$${fullname%%/$$$$filename}"; \
- for site in $${MASTER_SITES} $${MASTER_SITE_BACKUP}; do \
+ for site in $${PKG_SITES} $${MASTER_SITE_BACKUP}; do \
: echo "$${FETCH_CMD} $$$$site$$$$filename"; \
rm -f "$$$$filename"; \
if $${FETCH_CMD} $$$$site$$$$filename; then \
diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk
index 02990c250..f1ed65f57 100644
--- a/mk/kernel-build.mk
+++ b/mk/kernel-build.mk
@@ -26,16 +26,28 @@ $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig
$(TRACE) target/$(DEVICE)-kernel-configure
for f in $(TARGETS);do if [ -f $$f ];then rm $$f;fi;done $(MAKE_TRACE)
$(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/.config
+ifeq ($(ADK_NATIVE),y)
+ echo N | $(MAKE) -C $(LINUX_DIR) oldconfig $(MAKE_TRACE)
+ $(MAKE) -C $(LINUX_DIR) V=1 prepare scripts $(MAKE_TRACE)
+else
echo N | $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(ARCH) CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE)
$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(ARCH) CC="$(TARGET_CC)" prepare scripts $(MAKE_TRACE)
+endif
touch -c $(LINUX_DIR)/.config
$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.config
$(TRACE) target/$(DEVICE)-kernel-compile
+ifeq ($(ADK_NATIVE),y)
+ $(MAKE) -C $(LINUX_DIR) V=1 $(MAKE_TRACE)
+ $(TRACE) target/$(DEVICE)-kernel-modules-install
+ rm -rf $(LINUX_BUILD_DIR)/modules
+ $(MAKE) -C "$(LINUX_DIR)" V=1 DEPMOD=true INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules modules_install $(MAKE_TRACE)
+else
$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(ARCH) CC="$(TARGET_CC)" $(MAKE_TRACE)
$(TRACE) target/$(DEVICE)-kernel-modules-install
rm -rf $(LINUX_BUILD_DIR)/modules
$(MAKE) -C "$(LINUX_DIR)" V=1 CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(ARCH) DEPMOD=true INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules modules_install $(MAKE_TRACE)
+endif
$(TRACE) target/$(DEVICE)-create-packages
$(MAKE) $(KERNEL_IPKG) $(TARGETS)
touch -c $(LINUX_DIR)/vmlinux
diff --git a/mk/linux.mk b/mk/linux.mk
index e9d17e231..c2b226bc7 100644
--- a/mk/linux.mk
+++ b/mk/linux.mk
@@ -7,5 +7,5 @@ PKG_NAME:= linux
PKG_VERSION:= $(KERNEL_VERSION)
PKG_RELEASE:= $(KERNEL_RELEASE)
PKG_MD5SUM= $(KERNEL_MD5SUM)
+PKG_SITES= ${MASTER_SITE_KERNEL:=kernel/v2.6/}
DISTFILES= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
-MASTER_SITES= ${MASTER_SITE_KERNEL:=kernel/v2.6/}
diff --git a/mk/package.mk b/mk/package.mk
index e359a6f7c..b635d6a40 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -24,6 +24,10 @@ CONFIGURE_ARGS+= --enable-ipv6
else
CONFIGURE_ARGS+= --disable-ipv6
endif
+
+ifeq ($(ADK_NATIVE),y)
+ CONFIG_SHELL='$(strip ${SHELL})'
+else
CONFIGURE_ENV+= ${TARGET_CONFIGURE_OPTS} \
${HOST_CONFIGURE_OPTS} \
CC='${TARGET_CC}' CXX='${TARGET_CXX}' \
@@ -36,6 +40,7 @@ CONFIGURE_ENV+= ${TARGET_CONFIGURE_OPTS} \
CONFIG_SHELL='$(strip ${SHELL})' \
ac_cv_func_realloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes
+endif
MAKE_FILE?= Makefile
# this is environment for 'make all' and 'make install'
MAKE_ENV?=
@@ -47,6 +52,11 @@ MAKE_FLAGS?=
FAKE_FLAGS?=
ALL_TARGET?= all
INSTALL_TARGET?= install
+ifeq ($(ADK_NATIVE),y)
+MAKE_ENV+= \
+ WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \
+ WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}'
+else
MAKE_ENV+= PATH='${TARGET_PATH}' \
${HOST_CONFIGURE_OPTS} \
WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \
@@ -60,6 +70,7 @@ MAKE_ENV+= PATH='${TARGET_PATH}' \
CXXFLAGS='$(strip ${TCXXFLAGS})' \
CPPFLAGS='$(strip ${TCPPFLAGS})' \
LDFLAGS='$(strip ${TLDFLAGS})'
+endif
MAKE_FLAGS+= ${XAKE_FLAGS}
FAKE_FLAGS+= ${XAKE_FLAGS}
@@ -95,9 +106,11 @@ build-all-ipkgs: ${_IPKGS_COOKIE}
# there are some parameters to the PKG_template function
# 1.) Config.in identifier ADK_PACKAGE_$(1)
# 2.) name of the package, for single package mostly $(PKG_NAME)
-# 3.) package version (upstream version) and package revision (adk revision),
-# always $(PKG_VERSION)-$(PKG_REVISION)
+# 3.) package version (upstream version) and package release (adk version),
+# always $(PKG_VERSION)-$(PKG_RELEASE)
# 4.) dependencies to other packages, $(PKG_DEPENDS)
+# 5.) description for the package, $(PKG_DESCR)
+# 6.) section of the package, $(PKG_SECTION)
#
# should be package format independent and modular in the future
define PKG_template
@@ -116,8 +129,11 @@ endif
IDEPEND_$(1):= $$(strip $(4))
_ALL_CONTROLS+= $$(IDIR_$(1))/CONTROL/control
-ICONTROL_$(1)?= ipkg/$(2).control
+ICONTROL_$(1)?= $(WRKDIR)/.$(2).control
$$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
+ @echo "Package: $(2)" > $(WRKDIR)/.$(2).control
+ @echo "Section: $(6)" >> $(WRKDIR)/.$(2).control
+ @echo "Description: $(5)" >> $(WRKDIR)/.$(2).control
${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)} $${ICONTROL_$(1)} $(3) ${CPU_ARCH}
@adeps='$$(strip $${IDEPEND_$(1)})'; if [[ -n $$$$adeps ]]; then \
comma=; \
@@ -135,7 +151,7 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
echo "Depends: $$$$deps" >>$${IDIR_$(1)}/CONTROL/control; \
fi
@for file in conffiles preinst postinst prerm postrm; do \
- [ ! -f ./ipkg/$(2).$$$$file ] || cp ./ipkg/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \
+ [ ! -f ./files/$(2).$$$$file ] || cp ./files/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \
done
# FIXME: special case for device dependent base-files package
ifneq ($(strip $${ICONTROL_ADDON_$(1)}),)
@@ -146,6 +162,13 @@ $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $${_FAKE_COOKIE}
ifeq ($(ADK_DEBUG),)
$${RSTRIP} $${IDIR_$(1)} $(MAKE_TRACE)
endif
+ @for file in $$$$(ls ./files/*.init 2>/dev/null); do \
+ fname=$$$$(echo $$$$file| sed -e "s#.*/##" -e "s#.init##"); \
+ check=$$$$(grep PKG $$$$file|cut -d ' ' -f 2); \
+ if [ "$$$$check" == $(2) ];then \
+ mkdir -p $$(IDIR_$(1))/etc/init.d && cp $$$$file $$(IDIR_$(1))/etc/init.d/$$$$fname; \
+ fi; \
+ done
@cd $${IDIR_$(1)}; for script in etc/init.d/*; do \
[[ -e $$$$script ]] || continue; \
chmod 0755 "$$$$script"; \
diff --git a/mk/vars.mk b/mk/vars.mk
index f9e8798d6..5532cb07f 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -86,7 +86,11 @@ IPKG:= IPKG_TMP=$(BUILD_DIR)/tmp \
${BASH} ${SCRIPT_DIR}/ipkg -force-defaults -force-depends
IPKG_STATE_DIR:= $(TARGET_DIR)/usr/lib/ipkg
+ifeq ($(ADK_NATIVE),y)
+RSTRIP:= prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh
+else
RSTRIP:= prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh
+endif
EXTRACT_CMD= mkdir -p ${WRKDIR}; \
cd ${WRKDIR} && \