Browse Source

more cleanup, *-enabled feature is unused, simplify

Waldemar Brodkorb 9 years ago
parent
commit
f89ae85454
59 changed files with 23 additions and 211 deletions
  1. 1 9
      .gitignore
  2. 1 1
      Config.in
  3. 0 2
      Makefile
  4. 0 6
      mk/build.mk
  5. 4 9
      scripts/create-pkg
  6. 7 14
      scripts/create-sys
  7. 0 8
      scripts/update-pkg
  8. 0 16
      scripts/update-sys
  9. 0 0
      target/aarch64/systems/arm-fm
  10. 1 1
      target/aarch64/systems/toolchain-aarch64
  11. 0 17
      target/arm/sys-available/acmesystems-foxg20
  12. 0 0
      target/arm/systems/cubox-i
  13. 0 0
      target/arm/systems/keyasic-ka2000
  14. 2 1
      target/arm/systems/qemu-arm
  15. 0 0
      target/arm/systems/raspberry-pi
  16. 1 0
      target/arm/systems/sharp-zaurus
  17. 0 0
      target/arm/systems/toolchain-arm
  18. 0 0
      target/collections/console
  19. 0 0
      target/collections/development
  20. 0 0
      target/collections/mpdbox
  21. 0 0
      target/collections/test
  22. 0 0
      target/collections/xorg
  23. 2 0
      target/config/Config.in.arch
  24. 2 0
      target/config/Config.in.system
  25. 0 0
      target/m68k/systems/aranym-m68k
  26. 1 1
      target/m68k/systems/toolchain-m68k
  27. 0 0
      target/microblaze/systems/qemu-microblaze
  28. 0 0
      target/microblaze/systems/toolchain-microblaze
  29. 0 12
      target/mips/sys-available/broadcom-bcm47xx
  30. 0 12
      target/mips/sys-available/fon-fon2100
  31. 0 16
      target/mips/sys-available/linksys-ag241
  32. 0 12
      target/mips/sys-available/mikrotik-rb4xx
  33. 0 0
      target/mips/systems/mikrotik-rb532
  34. 0 0
      target/mips/systems/qemu-mips
  35. 0 0
      target/mips/systems/toolchain-mips
  36. 0 0
      target/mips64/systems/lemote-yeelong
  37. 0 0
      target/mips64/systems/qemu-mips64
  38. 0 0
      target/mips64/systems/toolchain-mips64
  39. 0 0
      target/ppc/systems/qemu-ppc
  40. 0 0
      target/ppc/systems/toolchain-ppc
  41. 0 0
      target/ppc64/systems/qemu-ppc64
  42. 0 0
      target/ppc64/systems/toolchain-ppc64
  43. 0 0
      target/sh/systems/qemu-sh4
  44. 0 0
      target/sh/systems/toolchain-sh4
  45. 0 0
      target/sparc/systems/qemu-sparc
  46. 0 0
      target/sparc/systems/toolchain-sparc
  47. 1 0
      target/sparc64/systems/qemu-sparc64
  48. 0 0
      target/sparc64/systems/toolchain-sparc64
  49. 0 23
      target/x86/sys-available/pcengines-alix1c
  50. 0 19
      target/x86/sys-available/pcengines-alix2d13
  51. 0 19
      target/x86/sys-available/pcengines-alix2d2
  52. 0 13
      target/x86/sys-available/pcengines-wrap
  53. 0 0
      target/x86/systems/generic-pc
  54. 0 0
      target/x86/systems/ibm-x40
  55. 0 0
      target/x86/systems/qemu-x86
  56. 0 0
      target/x86/systems/toolchain-x86
  57. 0 0
      target/x86/systems/vbox-i686
  58. 0 0
      target/x86_64/systems/qemu-x86_64
  59. 0 0
      target/x86_64/systems/toolchain-x86_64

+ 1 - 9
.gitignore

@@ -46,22 +46,14 @@
 /make.log
 /dl
 /package/Config.in.auto*
+/package/Config.in.collections
 /package/pkgconfigs.d/
-/package/*/Config.in
-/package/*/Config.in.lib
-/package/*/Config.in.kmod
 /extra/
 /.menu
 /.adkinit
 /target/*/Config.in.systems
-/target/*/sys-enabled
-/target/packages/pkg-enabled
-/target/packages/Config.in
 /target/config/Config.in.system.default
-/target/config/Config.in.system
 /target/config/Config.in.scripts
-/target/config/Config.in.native
-/target/config/Config.in.arch
 /target/config/Config.in.prereq
 /target/m68k/aranym.cfg
 /scripts/toolchain.cmake

+ 1 - 1
Config.in

@@ -42,7 +42,7 @@ source "target/config/Config.in"
 
 menu "Package collection"
 depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM
-source "target/packages/Config.in"
+source "package/Config.in.collections"
 endmenu
 
 menu "Package selection"

+ 0 - 2
Makefile

@@ -133,8 +133,6 @@ allconfig: .prereq_done
 	@${GMAKE_INV} _mconfig W=-y RCONFIG=Config.in
 
 allmodconfig: .prereq_done
-	@${BASH} ${TOPDIR}/scripts/update-sys
-	@${BASH} ${TOPDIR}/scripts/update-pkg
 	@${GMAKE_INV} _mconfig W=-o RCONFIG=Config.in
 
 package_index: .prereq_done

+ 0 - 6
mk/build.mk

@@ -138,8 +138,6 @@ world:
 	mkdir -p $(DL_DIR) $(HOST_BUILD_DIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \
 		$(STAGING_HOST_DIR) $(TOOLCHAIN_BUILD_DIR) $(STAGING_PKG_DIR)/stamps
 	${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
-	${BASH} ${TOPDIR}/scripts/update-sys
-	${BASH} ${TOPDIR}/scripts/update-pkg
 ifeq ($(ADK_TOOLCHAIN),y)
 ifeq ($(ADK_TOOLCHAIN_ONLY),y)
 	$(MAKE) -f mk/build.mk package/hostcompile toolchain/fixup package/compile
@@ -273,8 +271,6 @@ $(CONFIG)/mconf:
 	@$(MAKE) -C $(CONFIG)
 
 defconfig: .menu $(CONFIG)/conf
-	@${BASH} ${TOPDIR}/scripts/update-sys
-	@${BASH} ${TOPDIR}/scripts/update-pkg
 ifeq (${OStype},Linux)
 	@echo ADK_HOST_LINUX=y > $(TOPDIR)/.defconfig
 endif
@@ -394,8 +390,6 @@ endif
 	fi
 
 menuconfig: $(CONFIG)/mconf defconfig .menu package/Config.in.auto
-	@${BASH} ${TOPDIR}/scripts/update-sys
-	@${BASH} ${TOPDIR}/scripts/update-pkg
 	@if [ ! -f .config ];then \
 		$(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \
 	fi

+ 4 - 9
scripts/create-pkg

@@ -1,11 +1,6 @@
 #!/usr/bin/env bash
 topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P))
-
-mkdir -p $topdir/target/packages/pkg-enabled
-rm $topdir/target/packages/pkg-enabled/* 2>/dev/null
-count=1
-for i in $(ls $topdir/target/packages/pkg-available/);do
-	cd $topdir/target/packages/pkg-enabled &&
-	ln -sf ../pkg-available/$i $count-$i
-	count=$((count+1))
-done
+if [ -d "$topdir/target/collections" ];then
+	cat $topdir/target/collections/* > $topdir/package/Config.in.collections 2>/dev/null
+fi
+exit 0

+ 7 - 14
scripts/create-sys

@@ -1,21 +1,8 @@
 #!/usr/bin/env bash
 topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P))
-systems=$(grep -h config target/*/sys-available/*|cut -d " " -f 2)
-
-while read arch; do
-	count=0
-	rm -rf $topdir/target/$arch/sys-enabled &&
-	mkdir -p $topdir/target/$arch/sys-enabled &&
-	cd $topdir/target/$arch/sys-enabled &&
-	for i in $(ls $topdir/target/$arch/sys-available/);do
-		cd $topdir/target/$arch/sys-enabled/ &&
-		ln -sf ../sys-available/$i $count-$i
-		count=$((count+1))
-	done
-done <${topdir}/target/arch.lst
+systems=$(grep -h config target/*/systems/*|cut -d " " -f 2)
 
 echo '' > $topdir/target/config/Config.in.system.default
-
 for j in $systems;do
 	system=${j#ADK_TARGET_SYSTEM_}
 	systemu=$(echo $system|tr '[:upper:]' '[:lower:]')
@@ -38,4 +25,10 @@ for i in $systems;do
 		printf "\tdefault \"${system}\" if ADK_$systemu\n" >> $topdir/target/config/Config.in.system.default
 	fi
 done
+
+for i in $(ls $topdir/target/);do
+	if [ -d "$topdir/target/$i/systems" ];then
+		cat $topdir/target/$i/systems/* > $topdir/target/$i/Config.in.systems 2>/dev/null
+	fi
+done
 exit 0

+ 0 - 8
scripts/update-pkg

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-# create package collection Config.in file
-
-topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P))
-if [ -d "$topdir/target/packages/pkg-enabled" ];then
-	cat $topdir/target/packages/pkg-enabled/* > $topdir/target/packages/Config.in 2>/dev/null
-fi
-exit 0

+ 0 - 16
scripts/update-sys

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-# create Config.in.systems with all available target systems for each architecture
-
-topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P))
-
-echo 'source "target/config/Config.in.arch.default"' > $topdir/target/config/Config.in.arch
-echo 'source "target/config/Config.in.arch.choice"' >> $topdir/target/config/Config.in.arch
-echo 'source "target/config/Config.in.system.default"' > $topdir/target/config/Config.in.system
-echo 'source "target/config/Config.in.system.choice"' >> $topdir/target/config/Config.in.system
-
-for i in $(ls $topdir/target/);do
-	if [ -d "$topdir/target/$i/sys-enabled" ];then
-		cat $topdir/target/$i/sys-enabled/* > $topdir/target/$i/Config.in.systems 2>/dev/null
-	fi
-done
-exit 0

+ 0 - 0
target/aarch64/sys-available/arm-fm → target/aarch64/systems/arm-fm


+ 1 - 1
target/aarch64/sys-available/toolchain-aarch64 → target/aarch64/systems/toolchain-aarch64

@@ -1,5 +1,5 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_AARCH64
-	bool "Toolchain only (little endian)"
+	bool "Toolchain only"
 	select ADK_aarch64
 	select ADK_toolchain_aarch64
 	select ADK_little

+ 0 - 17
target/arm/sys-available/acmesystems-foxg20

@@ -1,17 +0,0 @@
-config ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	bool "Foxboard FOXG20"
-	select ADK_arm
-	select ADK_little
-	select ADK_soft_float
-	select ADK_eabi
-	select ADK_acmesystems_foxg20
-	select ADK_KERNEL_AEABI
-	select ADK_TARGET_WITH_SD
-	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_WITH_RTC
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_KERNEL_IMAGE
-	depends on ADK_BROKEN
-	help
-	  Acme Systems Foxboard FOXG20
-

+ 0 - 0
target/arm/sys-available/cubox-i → target/arm/systems/cubox-i


+ 0 - 0
target/arm/sys-available/keyasic-ka2000 → target/arm/systems/keyasic-ka2000


+ 2 - 1
target/arm/sys-available/qemu-arm → target/arm/systems/qemu-arm

@@ -7,4 +7,5 @@ config ADK_TARGET_SYSTEM_QEMU_ARM
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help
-	  Qemu Emulator for arm architecture.
+	  Qemu Emulator for ARM architecture.
+

+ 0 - 0
target/arm/sys-available/raspberry-pi → target/arm/systems/raspberry-pi


+ 1 - 0
target/arm/sys-available/sharp-zaurus → target/arm/systems/sharp-zaurus

@@ -14,3 +14,4 @@ config ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	 Support for Sharp Zaurus CL3200 (Terrier)
+

+ 0 - 0
target/arm/sys-available/toolchain-arm → target/arm/systems/toolchain-arm


+ 0 - 0
target/packages/pkg-available/console → target/collections/console


+ 0 - 0
target/packages/pkg-available/development → target/collections/development


+ 0 - 0
target/packages/pkg-available/mpdbox → target/collections/mpdbox


+ 0 - 0
target/packages/pkg-available/test → target/collections/test


+ 0 - 0
target/packages/pkg-available/xorg → target/collections/xorg


+ 2 - 0
target/config/Config.in.arch

@@ -0,0 +1,2 @@
+source "target/config/Config.in.arch.default"
+source "target/config/Config.in.arch.choice"

+ 2 - 0
target/config/Config.in.system

@@ -0,0 +1,2 @@
+source "target/config/Config.in.system.default"
+source "target/config/Config.in.system.choice"

+ 0 - 0
target/m68k/sys-available/aranym-m68k → target/m68k/systems/aranym-m68k


+ 1 - 1
target/m68k/sys-available/toolchain-m68k → target/m68k/systems/toolchain-m68k

@@ -5,5 +5,5 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_M68K
 	select ADK_TARGET_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
 	help
-	  Build a m68k toolchain.
+	  M68K toolchain.
 

+ 0 - 0
target/microblaze/sys-available/qemu-microblaze → target/microblaze/systems/qemu-microblaze


+ 0 - 0
target/microblaze/sys-available/toolchain-microblaze → target/microblaze/systems/toolchain-microblaze


+ 0 - 12
target/mips/sys-available/broadcom-bcm47xx

@@ -1,12 +0,0 @@
-config ADK_TARGET_SYSTEM_BROADCOM_BCM47XX
-	bool "Broadcom BCM47XX"
-	select ADK_mips
-	select ADK_little
-	select ADK_broadcom_bcm47xx
-	select ADK_TARGET_WITH_MTD
-	select ADK_TARGET_WITH_SSB
-	select ADK_TARGET_WITH_WATCHDOG
-	depends on ADK_BROKEN
-	help
-	  Broadcom BCM47xx systems.
-

+ 0 - 12
target/mips/sys-available/fon-fon2100

@@ -1,12 +0,0 @@
-config ADK_TARGET_SYSTEM_FON_FON2100
-	bool "FON's FON2100"
-	select ADK_mips
-	select ADK_big
-	select ADK_fon_fon2100
-	select ADK_TARGET_WITH_MTD
-	select ADK_TARGET_WITH_AHB
-	select ADK_TARGET_KERNEL_VMLINUZ
-	depends on ADK_BROKEN
-	help
-	  Support for FON's FON2100.
-

+ 0 - 16
target/mips/sys-available/linksys-ag241

@@ -1,16 +0,0 @@
-config ADK_TARGET_SYSTEM_LINKSYS_AG241
-	bool "Linksys AG241"
-	select ADK_mips
-	select ADK_little
-	select ADK_linksys_ag241
-	select ADK_TARGET_WITH_DSL
-	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_WITH_MTD
-	select ADK_KPACKAGE_KMOD_ATM_BR2684
-	select ADK_PACKAGE_KMOD_SANGAM_ATM
-	select ADK_PACKAGE_BR2684CTL
-	depends on ADK_BROKEN
-	help
-	  Linksys AG241 DSL router.
-	  (Texas Instruments AR7 platform)
-

+ 0 - 12
target/mips/sys-available/mikrotik-rb4xx

@@ -1,12 +0,0 @@
-config ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
-	bool "Mikrotik Routerboard 4xx"
-	select ADK_mips
-	select ADK_big
-	select ADK_mikrotik_rb4xx
-	select ADK_TARGET_WITH_MINIPCI
-	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_WITH_NAND
-	depends on ADK_BROKEN
-	help
-	  Support for Mikrotik RB411/RB433.
-

+ 0 - 0
target/mips/sys-available/mikrotik-rb532 → target/mips/systems/mikrotik-rb532


+ 0 - 0
target/mips/sys-available/qemu-mips → target/mips/systems/qemu-mips


+ 0 - 0
target/mips/sys-available/toolchain-mips → target/mips/systems/toolchain-mips


+ 0 - 0
target/mips64/sys-available/lemote-yeelong → target/mips64/systems/lemote-yeelong


+ 0 - 0
target/mips64/sys-available/qemu-mips64 → target/mips64/systems/qemu-mips64


+ 0 - 0
target/mips64/sys-available/toolchain-mips64 → target/mips64/systems/toolchain-mips64


+ 0 - 0
target/ppc/sys-available/qemu-ppc → target/ppc/systems/qemu-ppc


+ 0 - 0
target/ppc/sys-available/toolchain-ppc → target/ppc/systems/toolchain-ppc


+ 0 - 0
target/ppc64/sys-available/qemu-ppc64 → target/ppc64/systems/qemu-ppc64


+ 0 - 0
target/ppc64/sys-available/toolchain-ppc64 → target/ppc64/systems/toolchain-ppc64


+ 0 - 0
target/sh/sys-available/qemu-sh4 → target/sh/systems/qemu-sh4


+ 0 - 0
target/sh/sys-available/toolchain-sh4 → target/sh/systems/toolchain-sh4


+ 0 - 0
target/sparc/sys-available/qemu-sparc → target/sparc/systems/qemu-sparc


+ 0 - 0
target/sparc/sys-available/toolchain-sparc → target/sparc/systems/toolchain-sparc


+ 1 - 0
target/sparc64/sys-available/qemu-sparc64 → target/sparc64/systems/qemu-sparc64

@@ -8,3 +8,4 @@ config ADK_TARGET_SYSTEM_QEMU_SPARC64
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	 Support for Qemu Emulator SPARC64 architecture.
+

+ 0 - 0
target/sparc64/sys-available/toolchain-sparc64 → target/sparc64/systems/toolchain-sparc64


+ 0 - 23
target/x86/sys-available/pcengines-alix1c

@@ -1,23 +0,0 @@
-config ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
-	bool "PCEngines ALIX1C"
-	select ADK_x86
-	select ADK_pcengines_alix1c
-	select ADK_CPU_GEODE
-	select ADK_TARGET_CPU_WITH_3DNOW
-        select ADK_TARGET_CPU_WITH_3DNOWEXT
-        select ADK_TARGET_CPU_WITH_MMX
-        select ADK_TARGET_CPU_WITH_MMXEXT
-	select ADK_TARGET_WITH_GEODE_CRYPTO
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_USB_BOOT
-	select ADK_TARGET_WITH_PCI
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_INPUT
-	select ADK_TARGET_WITH_RTC
-	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_WITH_USB_BOOT
-	select ADK_TARGET_KERNEL_BZIMAGE
-	depends on ADK_BROKEN
-	help
-         System profile for PCEngines ALIX1C. 
-

+ 0 - 19
target/x86/sys-available/pcengines-alix2d13

@@ -1,19 +0,0 @@
-config ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
-	bool "PCEngines ALIX2D13"
-	select ADK_x86
-	select ADK_pcengines_alix2d13
-	select ADK_CPU_GEODE
-	select ADK_TARGET_CPU_WITH_3DNOW
-        select ADK_TARGET_CPU_WITH_3DNOWEXT
-        select ADK_TARGET_CPU_WITH_MMX
-        select ADK_TARGET_CPU_WITH_MMXEXT
-	select ADK_TARGET_WITH_GEODE_CRYPTO
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_RTC
-	select ADK_TARGET_WITH_LEDS
-	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_KERNEL_BZIMAGE
-	depends on ADK_BROKEN
-	help
-         System profile for PCEngines ALIX2D13.
-

+ 0 - 19
target/x86/sys-available/pcengines-alix2d2

@@ -1,19 +0,0 @@
-config ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
-	bool "PCEngines ALIX2D2"
-	select ADK_x86
-	select ADK_pcengines_alix2d2
-	select ADK_CPU_GEODE
-	select ADK_KERNEL_MGEODE_LX
-	select ADK_TARGET_CPU_WITH_3DNOW
-	select ADK_TARGET_CPU_WITH_3DNOWEXT
-	select ADK_TARGET_CPU_WITH_MMX
-	select ADK_TARGET_CPU_WITH_MMXEXT
-	select ADK_TARGET_WITH_GEODE_CRYPTO
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_LEDS
-	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_KERNEL_BZIMAGE
-	depends on ADK_BROKEN
-	help
-         System profile for PCEngines ALIX2D2.
-

+ 0 - 13
target/x86/sys-available/pcengines-wrap

@@ -1,13 +0,0 @@
-config ADK_TARGET_SYSTEM_PCENGINES_WRAP
-	bool "PCEngines WRAP"
-	select ADK_x86
-	select ADK_pcengines_wrap
-	select ADK_CPU_I486
-	select ADK_KERNEL_I486
-	select ADK_TARGET_WITH_MINIPCI
-	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_KERNEL_BZIMAGE
-	depends on ADK_BROKEN
-	help
-         System profile for PCEngines WRAP board.
-

+ 0 - 0
target/x86/sys-available/generic-pc → target/x86/systems/generic-pc


+ 0 - 0
target/x86/sys-available/ibm-x40 → target/x86/systems/ibm-x40


+ 0 - 0
target/x86/sys-available/qemu-x86 → target/x86/systems/qemu-x86


+ 0 - 0
target/x86/sys-available/toolchain-x86 → target/x86/systems/toolchain-x86


+ 0 - 0
target/x86/sys-available/vbox-i686 → target/x86/systems/vbox-i686


+ 0 - 0
target/x86_64/sys-available/qemu-x86_64 → target/x86_64/systems/qemu-x86_64


+ 0 - 0
target/x86_64/sys-available/toolchain-x86_64 → target/x86_64/systems/toolchain-x86_64