From 6b084b4f47904135bcbe67c97262144460e7a24f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 7 Jun 2010 12:30:08 +0200 Subject: add basic MacOS X support --- mk/build.mk | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index cc6c447ff..c143bbab2 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -270,6 +270,9 @@ endif ifeq (${OStype},NetBSD) @echo ADK_HOST_NETBSD=y > $(TOPDIR)/.defconfig endif +ifeq (${OStype},Darwin) + @echo ADK_HOST_DARWIN=y > $(TOPDIR)/.defconfig +endif ifneq (,$(filter CYGWIN%,${OStype})) @echo ADK_HOST_CYGWIN=y > $(TOPDIR)/.defconfig endif @@ -278,10 +281,10 @@ endif |grep -i "$(TARGET)"\$$ \ |sed -e "s#^config \(.*\)#\1=y#" \ >> $(TOPDIR)/.defconfig; \ - for symbol in ${DEFCONFIG}; do \ - echo $$symbol >> $(TOPDIR)/.defconfig; \ - done; \ fi + for symbol in ${DEFCONFIG}; do \ + echo $$symbol >> $(TOPDIR)/.defconfig; \ + done; \ @if [ ! -z "$(FS)" ];then \ grep "^config" target/Config.in \ |grep -i "$(FS)" \ @@ -338,6 +341,9 @@ endif ifeq (${OStype},NetBSD) @echo ADK_HOST_NETBSD=y > $(TOPDIR)/all.config endif +ifeq (${OStype},Darwin) + @echo ADK_HOST_DARWIN=y > $(TOPDIR)/all.config +endif ifneq (,$(filter CYGWIN%,${OStype})) @echo ADK_HOST_CYGWIN=y > $(TOPDIR)/all.config endif @@ -346,10 +352,10 @@ endif |grep -i "$(TARGET)"\$$ \ |sed -e "s#^config \(.*\)#\1=y#" \ >> $(TOPDIR)/all.config; \ - for symbol in ${DEFCONFIG}; do \ - echo $$symbol >> $(TOPDIR)/all.config; \ - done; \ fi + for symbol in ${DEFCONFIG}; do \ + echo $$symbol >> $(TOPDIR)/all.config; \ + done; \ @if [ ! -z "$(FS)" ];then \ grep "^config" target/Config.in \ |grep -i "$(FS)" \ -- cgit v1.2.3 From 97c636279c04e0d01c64b2ba0a1f76b8a1cc5d48 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 8 Jun 2010 10:40:07 +0200 Subject: fix checksum and some typos --- mk/build.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index 359569826..0d807076a 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -284,9 +284,9 @@ endif |sed -e "s#^config \(.*\)#\1=y#" \ >> $(TOPDIR)/.defconfig; \ fi - for symbol in ${DEFCONFIG}; do \ + @for symbol in ${DEFCONFIG}; do \ echo $$symbol >> $(TOPDIR)/.defconfig; \ - done; \ + done @if [ ! -z "$(FS)" ];then \ grep "^config" target/Config.in \ |grep -i "$(FS)" \ @@ -355,9 +355,9 @@ endif |sed -e "s#^config \(.*\)#\1=y#" \ >> $(TOPDIR)/all.config; \ fi - for symbol in ${DEFCONFIG}; do \ + @for symbol in ${DEFCONFIG}; do \ echo $$symbol >> $(TOPDIR)/all.config; \ - done; \ + done @if [ ! -z "$(FS)" ];then \ grep "^config" target/Config.in \ |grep -i "$(FS)" \ -- cgit v1.2.3 From 3069ceb7f91acb37fde64731b8ac7eaa505b0a0e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 16 Jun 2010 09:44:54 +0200 Subject: add webcam and wireless-tools support for lemote --- mk/build.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index 0d807076a..3d2b69537 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -20,7 +20,6 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \ ADK_PACKAGE_XORG_SERVER_WITH_DRI=n \ ADK_PACKAGE_AUFS2_UTIL=n \ ADK_PACKAGE_BASE_FILES=y \ - ADK_PACKAGE_GCC=n \ ADK_PACKAGE_MGETTY=n \ ADK_COMPILE_HEIMDAL=n \ ADK_PACKAGE_HEIMDAL_PKINIT=n \ -- cgit v1.2.3 From e9e7c5715ae2cb168dfe56192a3a1d5aacc70b23 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 28 Jun 2010 10:38:59 +0200 Subject: fix busybox rebuild issue, simplify target Makefiles --- mk/build.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index 3d2b69537..c13694013 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -64,8 +64,9 @@ noconfig_targets:= menuconfig \ POSTCONFIG= -@ \ if [ -f .config.old ];then \ - if [ -f .busyboxcfg ];then \ - rm .busyboxcfg; \ + if [ "$$(grep ^BUSYBOX .config|md5sum)" != "$$(grep ^BUSYBOX .config.old|md5sum)" ];then \ + touch .bbrebuild; \ + cp .config .config.old; \ fi; \ fi -- cgit v1.2.3 From 36c8c2eb53bf2fb400f138b2177bea2fe0651d12 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 29 Jun 2010 17:45:03 +0200 Subject: optimize ipkg package management ipkg will automatically mount the normal read-only rootfs as read-write and after the command back to read-only. ipkg install/remove/upgrades are only supported for compact disk or disk based systems. On flash systems better reflash completely. make a kernel package containing the real kernel. Adjust ipkg.conf to contain a configurable server adress. --- mk/build.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index c13694013..2f4b367b9 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -95,7 +95,7 @@ else ifeq ($(ADK_TOOLCHAIN_ONLY),y) $(MAKE) -f mk/build.mk toolchain/install package/compile else - $(MAKE) -f mk/build.mk toolchain/install target/config-prepare target/compile package/compile root_clean package/install package_index target/install + $(MAKE) -f mk/build.mk toolchain/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index endif endif -- cgit v1.2.3 From 1879491b2b6e799b20ac06d1b510726eb200944f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 5 Jul 2010 15:32:35 +0200 Subject: add menu based configuration of a password --- mk/build.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index 2f4b367b9..8791ebf1d 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -90,12 +90,12 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M world: $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR) ${TOPDIR}/.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 + $(MAKE) -f mk/build.mk toolchain/kernel-headers-prepare tools/install target/config-prepare target/compile package/compile root_clean package/install package_index target/install else ifeq ($(ADK_TOOLCHAIN_ONLY),y) - $(MAKE) -f mk/build.mk toolchain/install package/compile + $(MAKE) -f mk/build.mk toolchain/install tools/install package/compile else - $(MAKE) -f mk/build.mk toolchain/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index + $(MAKE) -f mk/build.mk toolchain/install tools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index endif endif @@ -136,6 +136,9 @@ target/%: ${TOPDIR}/.ADK_HAVE_DOT_CONFIG toolchain/%: ${STAGING_DIR} $(MAKE) -C toolchain $(patsubst toolchain/%,%,$@) +tools/%: + $(MAKE) -C tools $(patsubst tools/%,%,$@) + image: $(MAKE) -C target image -- cgit v1.2.3