diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 16 | ||||
| -rw-r--r-- | mk/cpu.mk | 20 | ||||
| -rw-r--r-- | mk/image.mk | 38 | ||||
| -rw-r--r-- | mk/modules.mk | 25 | ||||
| -rw-r--r-- | mk/package.mk | 1 |
5 files changed, 43 insertions, 57 deletions
diff --git a/mk/build.mk b/mk/build.mk index 8791ebf1d..793145be0 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -16,6 +16,7 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \ ADK_MAKE_PARALLEL=y \ ADK_MAKE_JOBS=4 \ ADK_FORCE_PARALLEL=n \ + ADK_PACKAGE_BZR=n \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_XORG_SERVER_WITH_DRI=n \ ADK_PACKAGE_AUFS2_UTIL=n \ @@ -28,6 +29,7 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \ ADK_PACKAGE_LIBHEIMDAL_CLIENT=n \ BUSYBOX_BBCONFIG=n \ BUSYBOX_SELINUX=n \ + BUSYBOX_INSTALL_NO_USR=n \ BUSYBOX_MODPROBE_SMALL=n \ BUSYBOX_EJECT=n \ BUSYBOX_BUILD_LIBBUSYBOX=n \ @@ -64,8 +66,16 @@ noconfig_targets:= menuconfig \ POSTCONFIG= -@ \ if [ -f .config.old ];then \ + rebuild=0; \ if [ "$$(grep ^BUSYBOX .config|md5sum)" != "$$(grep ^BUSYBOX .config.old|md5sum)" ];then \ - touch .bbrebuild; \ + touch .rebuild.busybox;\ + rebuild=1;\ + fi; \ + if [ "$$(grep ^ADK_RUNTIME_PASSWORD .config|md5sum)" != "$$(grep ^ADK_RUNTIME_PASSWORD .config.old|md5sum)" ];then \ + touch .rebuild.base-files;\ + rebuild=1;\ + fi; \ + if [ $$rebuild -eq 1 ];then \ cp .config .config.old; \ fi; \ fi @@ -167,7 +177,7 @@ newpackage: $(SED) 's#@PKG@#$(PKG)#' $(TOPDIR)/package/$(PKG)/Makefile $(SED) 's#@VER@#$(VER)#' $(TOPDIR)/package/$(PKG)/Makefile @echo "Edit package/$(PKG)/Makefile to complete" - @echo "Do not forget to add package to package/Config.in" + @echo "choose PKG_SECTION to add it to an existent submenu" ############################################################# # @@ -475,10 +485,12 @@ bulkallmod: done <${TOPDIR}/target/bulk.lst menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) + @echo "Generating menu structure ..." mksh $(TOPDIR)/package/pkgmaker @:>.menu dep: + @echo "Generating dependencies ..." mksh $(TOPDIR)/package/depmaker .PHONY: menu dep diff --git a/mk/cpu.mk b/mk/cpu.mk deleted file mode 100644 index 1678e9311..000000000 --- a/mk/cpu.mk +++ /dev/null @@ -1,20 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. -# -# optimization configure options for CPU features - -ifeq ($(ADK_TARGET),alix1c) -CONFIGURE_CPU_OPTS:= --disable-ssse3 \ - --disable-sse \ - --enable-amd3dnow \ - --enable-amd3dnowext \ - --enable-mmx \ - --enable-mmx2 -else -CONFIGURE_CPU_OPTS:= --disable-ssse3 \ - --disable-sse \ - --disable-amd3dnow \ - --disable-amd3dnowext \ - --disable-mmx \ - --disable-mmx2 -endif diff --git a/mk/image.mk b/mk/image.mk index 4713d621d..b548aac29 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -13,37 +13,6 @@ image-prepare-post: rng=/dev/arandom; test -e $$rng || rng=/dev/urandom; \ dd if=$$rng bs=512 count=1 >>${TARGET_DIR}/etc/.rnd 2>/dev/null; \ chmod 600 ${TARGET_DIR}/etc/.rnd - @cd ${TARGET_DIR}; ls=; ln=; li=; x=1; md5sum $$(find . -type f) | \ - sed -e "s/*//" | \ - while read sum name; do \ - inode=$$(ls -i "$$name"); \ - echo "$$sum $${inode%% *} $$name"; \ - done | sort | while read sum inode name; do \ - if [[ $$sum = $$ls ]]; then \ - [[ $$li = $$inode ]] && continue; \ - case $$x in \ - 1) echo 'WARNING: duplicate files found' \ - 'in filesystem! Please fix them.' >&2; \ - echo -n "> $$ln "; \ - ;; \ - 2) echo -n "> $$ln "; \ - ;; \ - 3) echo -n ' '; \ - ;; \ - esac; \ - echo -n "$$name"; \ - x=3; \ - else \ - case $$x in \ - 3) echo; \ - x=2; \ - ;; \ - esac; \ - fi; \ - ls=$$sum; \ - ln=$$name; \ - li=$$inode; \ - done chmod 4511 ${TARGET_DIR}/bin/busybox chmod 1777 ${TARGET_DIR}/tmp @if [ -d ${TARGET_DIR}/usr/share/fonts/X11 ];then \ @@ -60,10 +29,11 @@ kernel-package: $(LINUX_DIR)/vmlinux rm -rf $(KERNEL_PKGDIR) @mkdir -p $(KERNEL_PKGDIR)/boot cp $(KERNEL) $(KERNEL_PKGDIR)/boot/vmlinuz-adk - ${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh ${KERNEL_PKGDIR} \ + @${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh ${KERNEL_PKGDIR} \ ../linux/kernel.control ${ADK_TARGET}-${KERNEL_VERSION} ${CPU_ARCH} - $(PKG_BUILD) $(KERNEL_PKGDIR) $(PACKAGE_DIR) - $(PKG_INSTALL) $(KERNEL_PKG) + $(PKG_BUILD) $(KERNEL_PKGDIR) $(PACKAGE_DIR) $(MAKE_TRACE) + $(TRACE) target/$(ADK_TARGET)-install-kernel-package + $(PKG_INSTALL) $(KERNEL_PKG) $(MAKE_TRACE) INITRAMFS= ${ADK_TARGET}-${ADK_LIBC}-${FS} ROOTFSSQUASHFS= ${ADK_TARGET}-${ADK_LIBC}-${FS}.img diff --git a/mk/modules.mk b/mk/modules.mk index 7dd4b232a..54c1deda0 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1062,7 +1062,6 @@ $(eval $(call KMOD_template,SND_CS5535AUDIO,sound-cs5535audio,\ $(eval $(call KMOD_template,VIDEO_DEV,video-dev,\ $(MODULES_DIR)/kernel/drivers/media/video/v4l1-compat \ - $(MODULES_DIR)/kernel/drivers/media/video/v4l2-compat-ioctl32 \ $(MODULES_DIR)/kernel/drivers/media/video/videodev \ ,65)) @@ -1177,6 +1176,10 @@ $(eval $(call KMOD_template,USB_PEGASUS,usb-pegasus,\ $(MODULES_DIR)/kernel/drivers/net/usb/pegasus \ ,75)) +$(eval $(call KMOD_template,USB_HSO,usb-hso,\ + $(MODULES_DIR)/kernel/drivers/net/usb/hso \ +,75)) + $(eval $(call KMOD_template,SND_USB_AUDIO,snd-usb-audio,\ $(MODULES_DIR)/kernel/sound/usb/snd-usb-lib \ $(MODULES_DIR)/kernel/sound/usb/snd-usb-audio \ @@ -1527,3 +1530,23 @@ $(eval $(call KMOD_template,PARPORT,parport,\ $(eval $(call KMOD_template,PLIP,plip,\ $(MODULES_DIR)/kernel/drivers/net/plip \ ,51)) + +# +# Profiling +# +$(eval $(call KMOD_template,OPROFILE,oprofile,\ + $(MODULES_DIR)/kernel/arch/x86/oprofile/oprofile \ +,10)) + +# +# I2C +# +$(eval $(call KMOD_template,I2C,i2c,\ + $(MODULES_DIR)/kernel/drivers/i2c/i2c-core \ + $(MODULES_DIR)/kernel/drivers/i2c/i2c-dev \ +,20)) + +$(eval $(call KMOD_template,SCx200_ACB,scx200-acb,\ + $(MODULES_DIR)/kernel/drivers/i2c/busses/scx200_acb \ +,25)) + diff --git a/mk/package.mk b/mk/package.mk index 4baa73bf0..acc387a48 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -143,6 +143,7 @@ ALL_PKGOPTS+= $(1) PKGNAME_$(1)= $(2) PKGDEPS_$(1)= $(4) PKGDESC_$(1)= $(5) +PKGSECT_$(1)= $(6) IPKG_$(1)= $(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.${PKG_SUFFIX} IDIR_$(1)= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2) ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},) |