Changeset 707 for branches


Ignore:
Timestamp:
Nov 30, 2015, 6:09:45 AM (4 years ago)
Author:
ehem
Message:

Drag in changes to trunk

Coordination is interesting to deal with. Drag in changes that were done
on trunk.

Location:
branches/contrib
Files:
35 deleted
19 edited
101 copied

Legend:

Unmodified
Added
Removed
  • branches/contrib

  • branches/contrib/Config.in

    r501 r707  
    4747mainmenu "DebWrt Configuration"
    4848
    49 source "config/plugin.in"
     49source "config/kernel/config.in"
     50source "config/rootfs/config.in"
     51source "config/cross/config.in"
    5052
    51 source "config/archs.in"
    52 source "config/target.in"
    53 
    54 source "config/image_name.in"
    55 source "config/flash_ip.in"
    56 
    57 source "config/openwrt_version.in"
    58 source "config/openwrt_extra.in"
    59 
    60 source "config/kernel_version.in"
    61 source "config/kernel_config.in"
    62 
    63 source "config/debian_cross.in"
    64 source "config/debian_rootfs.in"
    65 
    66 source "config/debwrt_general.in"
    67 source "config/debwrt_boot.in"
    68 
    69 # End of file
  • branches/contrib/Makefile

    r596 r707  
    3434include rules/help.mk
    3535include config/config.mk
    36 include openwrt/openwrt.mk
    37 include openwrt/openwrt-deliver.mk
     36
     37ifeq ($(CONFIG_DEBWRT_FIRMWARE),y)
     38        include openwrt/openwrt.mk
     39        include openwrt/openwrt-deliver.mk
     40endif
     41
    3842include debian/debian.mk
    3943include plugins/plugins.mk
     
    6670        @echo "Note: wait a couple of minutes before rebooting your device. It takes time to write the firmware to the flash."
    6771
     72ifeq ($(CONFIG_DEBWRT_FIRMWARE),n)
    6873clean: openwrt/clean debian/clean config/clean plugins/clean
    6974        @rm -f .config .config.old
     75else
     76clean: debian/clean config/clean plugins/clean
     77        @rm -f .config .config.old
     78endif
    7079
    7180.PHONY: clean
  • branches/contrib/README

    r168 r707  
    11
    22This is the DebWrt build environment.
    3 It is heavily based on OpenWrt's build environment
    4 and heavily uses Emdebian and Debootstrap for all Debian related actions.
    53
    6 DebWrt connects two very powerfull technologies: Debian and OpenWrt.
    7 Debian has a great package management system and includes thousands of packages
    8 for many architectures.
    9 OpenWrt has great Linux kernel support for many embedded devices.
     4DebWrt connects two very powerfull technologies: Debian and OpenWrt. Debian
     5has a great package management system and includes thousands of packages for
     6many architectures. OpenWrt has great Linux kernel support for many embedded
     7devices.
    108
    119Bringing these two strenghts together opens a whole new world of possibilities.
    12 ..
     10
     11Regards,
     12
     13Johan van Zoomeren
  • branches/contrib/bitten/recipes/mips/ar71xx/ubntrspro/config

    r596 r707  
    1 #
    2 # Automatically generated make config: don't edit
    3 # DebWrt version: testing - 2.1-1 - [ 29 September 2012 (364) ]
    4 # Sat Sep 29 17:16:51 2012
    5 #
    6 CONFIG_HAVE_DOT_CONFIG=y
    7 CONFIG_HAS_SUBTARGETS=y
    8 CONFIG_BIG_ENDIAN=y
    9 CONFIG_mips=y
    10 CONFIG_ARCH="mips"
    11 # CONFIG_TARGET_ppc40x is not set
    12 # CONFIG_TARGET_ppc44x is not set
    13 # CONFIG_TARGET_atheros is not set
    14 CONFIG_TARGET_ar71xx=y
    15 # CONFIG_TARGET_avr32 is not set
    16 # CONFIG_TARGET_brcm63xx is not set
    17 # CONFIG_TARGET_brcm47xx is not set
    18 # CONFIG_TARGET_sibyte is not set
    19 # CONFIG_TARGET_octeon is not set
    20 # CONFIG_TARGET_ep93xx is not set
    21 # CONFIG_TARGET_cobalt is not set
    22 # CONFIG_TARGET_gemini is not set
    23 # CONFIG_TARGET_etrax is not set
    24 # CONFIG_TARGET_coldfire is not set
    25 # CONFIG_TARGET_mpc52xx is not set
    26 # CONFIG_TARGET_mpc83xx is not set
    27 # CONFIG_TARGET_mx2 is not set
    28 # CONFIG_TARGET_goldfish is not set
    29 # CONFIG_TARGET_amazon is not set
    30 # CONFIG_TARGET_ifxmips is not set
    31 # CONFIG_TARGET_adm5120 is not set
    32 # CONFIG_TARGET_xburst is not set
    33 # CONFIG_TARGET_iop32x is not set
    34 # CONFIG_TARGET_ixp4xx is not set
    35 # CONFIG_TARGET_malta is not set
    36 # CONFIG_TARGET_kirkwood is not set
    37 # CONFIG_TARGET_orion is not set
    38 # CONFIG_TARGET_pxa is not set
    39 # CONFIG_TARGET_rb532 is not set
    40 # CONFIG_TARGET_at91 is not set
    41 # CONFIG_TARGET_pxcab is not set
    42 # CONFIG_TARGET_rdc is not set
    43 # CONFIG_TARGET_au1000 is not set
    44 # CONFIG_TARGET_ramips is not set
    45 # CONFIG_TARGET_s3c24xx is not set
    46 # CONFIG_TARGET_ps3 is not set
    47 # CONFIG_TARGET_ar7 is not set
    48 # CONFIG_TARGET_omap35xx is not set
    49 # CONFIG_TARGET_ubicom32 is not set
    50 # CONFIG_TARGET_uml is not set
    51 # CONFIG_TARGET_x86 is not set
    52 # CONFIG_TARGET_au1000_au1500 is not set
    53 # CONFIG_TARGET_au1000_au1550 is not set
    54 # CONFIG_TARGET_xburst_qi_lb60 is not set
    55 # CONFIG_TARGET_xburst_n516 is not set
    56 # CONFIG_TARGET_xburst_n526 is not set
    57 # CONFIG_TARGET_orion_generic is not set
    58 # CONFIG_TARGET_orion_harddisk is not set
    59 # CONFIG_TARGET_ixp4xx_generic is not set
    60 # CONFIG_TARGET_ixp4xx_harddisk is not set
    61 # CONFIG_TARGET_malta_le is not set
    62 # CONFIG_TARGET_malta_be is not set
    63 # CONFIG_TARGET_x86_generic is not set
    64 # CONFIG_TARGET_x86_olpc is not set
    65 # CONFIG_TARGET_x86_xen_domu is not set
    66 # CONFIG_TARGET_x86_ep80579 is not set
    67 # CONFIG_TARGET_x86_net5501 is not set
    68 CONFIG_TARGET_ar71xx_generic=y
    69 # CONFIG_TARGET_ar71xx_nand is not set
    70 # CONFIG_TARGET_ifxmips_danube is not set
    71 # CONFIG_TARGET_ifxmips_ar9 is not set
    72 # CONFIG_TARGET_ps3_petitboot is not set
    73 # CONFIG_TARGET_ramips_rt288x is not set
    74 # CONFIG_TARGET_ramips_rt305x is not set
    75 # CONFIG_TARGET_adm5120_router_le is not set
    76 # CONFIG_TARGET_adm5120_router_be is not set
    77 # CONFIG_TARGET_omap35xx_beagleboard is not set
    78 # CONFIG_TARGET_omap35xx_gumstix is not set
    79 # CONFIG_TARGET_pxcab_Default is not set
    80 # CONFIG_TARGET_iop32x_Default is not set
    81 # CONFIG_TARGET_au1000_au1500_Atheros is not set
    82 # CONFIG_TARGET_au1000_au1500_InternetBox is not set
    83 # CONFIG_TARGET_au1000_au1500_MeshCube is not set
    84 # CONFIG_TARGET_au1000_au1550_DBAu1550 is not set
    85 # CONFIG_TARGET_coldfire_Default is not set
    86 # CONFIG_TARGET_ubicom32_Default is not set
    87 # CONFIG_TARGET_sibyte_Default is not set
    88 # CONFIG_TARGET_cobalt_Default is not set
    89 # CONFIG_TARGET_kirkwood_Default is not set
    90 # CONFIG_TARGET_xburst_qi_lb60_Default is not set
    91 # CONFIG_TARGET_xburst_n516_Default is not set
    92 # CONFIG_TARGET_xburst_n526_Default is not set
    93 # CONFIG_TARGET_ppc44x_Default is not set
    94 # CONFIG_TARGET_rb532_Default is not set
    95 # CONFIG_TARGET_orion_generic_Default is not set
    96 # CONFIG_TARGET_orion_harddisk_Default is not set
    97 # CONFIG_TARGET_avr32_Default is not set
    98 # CONFIG_TARGET_atheros_Default is not set
    99 # CONFIG_TARGET_ixp4xx_generic_Default is not set
    100 # CONFIG_TARGET_ixp4xx_generic_Atheros-ath5k is not set
    101 # CONFIG_TARGET_ixp4xx_generic_NSLU2 is not set
    102 # CONFIG_TARGET_ixp4xx_generic_NAS100d is not set
    103 # CONFIG_TARGET_ixp4xx_generic_DSMG600RevA is not set
    104 # CONFIG_TARGET_ixp4xx_generic_USR8200 is not set
    105 # CONFIG_TARGET_ixp4xx_harddisk_FSG3 is not set
    106 # CONFIG_TARGET_ep93xx_Default is not set
    107 # CONFIG_TARGET_s3c24xx_openmoko-gta02-minimal is not set
    108 # CONFIG_TARGET_s3c24xx_openmoko-gta02-full is not set
    109 # CONFIG_TARGET_gemini_Default is not set
    110 # CONFIG_TARGET_ppc40x_Default is not set
    111 # CONFIG_TARGET_etrax_default is not set
    112 # CONFIG_TARGET_etrax_vhdl_no_fb is not set
    113 # CONFIG_TARGET_uml_Default is not set
    114 # CONFIG_TARGET_mpc52xx_Default is not set
    115 # CONFIG_TARGET_pxa_Default is not set
    116 # CONFIG_TARGET_brcm47xx_Broadcom-b43 is not set
    117 # CONFIG_TARGET_brcm47xx_Broadcom-wl is not set
    118 # CONFIG_TARGET_brcm47xx_Atheros is not set
    119 # CONFIG_TARGET_brcm47xx_Atheros-ath5k is not set
    120 # CONFIG_TARGET_brcm47xx_None is not set
    121 # CONFIG_TARGET_brcm47xx_WGT634U is not set
    122 # CONFIG_TARGET_brcm47xx_WL500GPv1 is not set
    123 # CONFIG_TARGET_brcm47xx_WRT350Nv1 is not set
    124 # CONFIG_TARGET_brcm47xx_WRTSL54GS is not set
    125 # CONFIG_TARGET_at91_Default is not set
    126 # CONFIG_TARGET_malta_le_Default is not set
    127 # CONFIG_TARGET_malta_be_Default is not set
    128 # CONFIG_TARGET_x86_generic_Generic is not set
    129 # CONFIG_TARGET_x86_generic_Alix is not set
    130 # CONFIG_TARGET_x86_generic_Soekris45xx is not set
    131 # CONFIG_TARGET_x86_generic_Soekris48xx is not set
    132 # CONFIG_TARGET_x86_generic_Wrap is not set
    133 # CONFIG_TARGET_x86_olpc_Default is not set
    134 # CONFIG_TARGET_x86_xen_domu_Default is not set
    135 # CONFIG_TARGET_x86_ep80579_Default is not set
    136 # CONFIG_TARGET_x86_net5501_Default is not set
    137 # CONFIG_TARGET_brcm63xx_Broadcom-wl is not set
    138 # CONFIG_TARGET_brcm63xx_Broadcom is not set
    139 # CONFIG_TARGET_brcm63xx_Atheros is not set
    140 # CONFIG_TARGET_brcm63xx_Ralink is not set
    141 # CONFIG_TARGET_brcm63xx_NoWiFi is not set
    142 # CONFIG_TARGET_brcm63xx_GW6X00 is not set
    143 # CONFIG_TARGET_ar71xx_generic_Default is not set
    144 # CONFIG_TARGET_ar71xx_generic_Minimal is not set
    145 # CONFIG_TARGET_ar71xx_generic_Madwifi is not set
    146 # CONFIG_TARGET_ar71xx_generic_AP81 is not set
    147 # CONFIG_TARGET_ar71xx_generic_AP83 is not set
    148 # CONFIG_TARGET_ar71xx_generic_PB42 is not set
    149 # CONFIG_TARGET_ar71xx_generic_PB44 is not set
    150 # CONFIG_TARGET_ar71xx_generic_PB92 is not set
    151 # CONFIG_TARGET_ar71xx_generic_A02RBW300N is not set
    152 # CONFIG_TARGET_ar71xx_generic_WZRHPG300NH is not set
    153 # CONFIG_TARGET_ar71xx_generic_WP543 is not set
    154 # CONFIG_TARGET_ar71xx_generic_DIR600A1 is not set
    155 # CONFIG_TARGET_ar71xx_generic_DIR615C1 is not set
    156 # CONFIG_TARGET_ar71xx_generic_DIR825B1 is not set
    157 # CONFIG_TARGET_ar71xx_generic_WRT160NL is not set
    158 # CONFIG_TARGET_ar71xx_generic_WRT400N is not set
    159 # CONFIG_TARGET_ar71xx_generic_WNDR3700 is not set
    160 # CONFIG_TARGET_ar71xx_generic_MZKW04NU is not set
    161 # CONFIG_TARGET_ar71xx_generic_MZKW300NH is not set
    162 # CONFIG_TARGET_ar71xx_generic_TLWR741NDV1 is not set
    163 # CONFIG_TARGET_ar71xx_generic_TLWR841NV15 is not set
    164 # CONFIG_TARGET_ar71xx_generic_TLWR841NDV3 is not set
    165 # CONFIG_TARGET_ar71xx_generic_TLWR841NDV5 is not set
    166 # CONFIG_TARGET_ar71xx_generic_TLWR941NDV2 is not set
    167 # CONFIG_TARGET_ar71xx_generic_TLWR941NDV3 is not set
    168 # CONFIG_TARGET_ar71xx_generic_TLWR941NDV4 is not set
    169 # CONFIG_TARGET_ar71xx_generic_TLWR1043NDV1 is not set
    170 # CONFIG_TARGET_ar71xx_generic_TEW632BRP is not set
    171 # CONFIG_TARGET_ar71xx_generic_TEW652BRP is not set
    172 # CONFIG_TARGET_ar71xx_generic_UBNTRS is not set
    1731CONFIG_TARGET_ar71xx_generic_UBNTRSPRO=y
    174 # CONFIG_TARGET_ar71xx_generic_UBNT is not set
    175 # CONFIG_TARGET_ar71xx_generic_NBG_460N_550N_550NH is not set
    176 # CONFIG_TARGET_ar71xx_nand_DefaultNoWifi is not set
    177 # CONFIG_TARGET_ar71xx_nand_Madwifi is not set
    178 # CONFIG_TARGET_goldfish_Default is not set
    179 # CONFIG_TARGET_ifxmips_danube_None is not set
    180 # CONFIG_TARGET_ifxmips_danube_Atheros is not set
    181 # CONFIG_TARGET_ifxmips_danube_Ralink is not set
    182 # CONFIG_TARGET_ifxmips_ar9_None is not set
    183 # CONFIG_TARGET_ifxmips_ar9_Atheros is not set
    184 # CONFIG_TARGET_ifxmips_ar9_Ralink is not set
    185 # CONFIG_TARGET_ps3_petitboot_Default is not set
    186 # CONFIG_TARGET_ramips_rt288x_Default is not set
    187 # CONFIG_TARGET_ramips_rt305x_Default is not set
    188 # CONFIG_TARGET_mpc83xx_Default is not set
    189 # CONFIG_TARGET_rdc_ar525w is not set
    190 # CONFIG_TARGET_rdc_bifferboard is not set
    191 # CONFIG_TARGET_rdc_r8610 is not set
    192 # CONFIG_TARGET_rdc_sitecom is not set
    193 # CONFIG_TARGET_octeon_generic is not set
    194 # CONFIG_TARGET_octeon_mototech is not set
    195 # CONFIG_TARGET_mx2_Default is not set
    196 # CONFIG_TARGET_ar7_Annex-A is not set
    197 # CONFIG_TARGET_ar7_Annex-B is not set
    198 # CONFIG_TARGET_ar7_Texas is not set
    199 # CONFIG_TARGET_ar7_None is not set
    200 # CONFIG_TARGET_adm5120_router_le_Generic is not set
    201 # CONFIG_TARGET_adm5120_router_le_CAS630 is not set
    202 # CONFIG_TARGET_adm5120_router_le_CAS630W is not set
    203 # CONFIG_TARGET_adm5120_router_le_CAS670 is not set
    204 # CONFIG_TARGET_adm5120_router_le_CAS670W is not set
    205 # CONFIG_TARGET_adm5120_router_le_CAS700 is not set
    206 # CONFIG_TARGET_adm5120_router_le_CAS700W is not set
    207 # CONFIG_TARGET_adm5120_router_le_CAS771 is not set
    208 # CONFIG_TARGET_adm5120_router_le_CAS771W is not set
    209 # CONFIG_TARGET_adm5120_router_le_CAS790 is not set
    210 # CONFIG_TARGET_adm5120_router_le_CAS861 is not set
    211 # CONFIG_TARGET_adm5120_router_le_CAS861W is not set
    212 # CONFIG_TARGET_adm5120_router_le_NFS101U is not set
    213 # CONFIG_TARGET_adm5120_router_le_NFS101WU is not set
    214 # CONFIG_TARGET_adm5120_router_le_NP27G is not set
    215 # CONFIG_TARGET_adm5120_router_le_NP28G is not set
    216 # CONFIG_TARGET_adm5120_router_le_WP54 is not set
    217 # CONFIG_TARGET_adm5120_router_le_BR6104K is not set
    218 # CONFIG_TARGET_adm5120_router_le_BR6104KP is not set
    219 # CONFIG_TARGET_adm5120_router_le_BR6104WG is not set
    220 # CONFIG_TARGET_adm5120_router_le_BR6114WG is not set
    221 # CONFIG_TARGET_adm5120_router_le_EASY5120RT is not set
    222 # CONFIG_TARGET_adm5120_router_le_EASY5120PATA is not set
    223 # CONFIG_TARGET_adm5120_router_le_PMUGW is not set
    224 # CONFIG_TARGET_adm5120_router_le_5GXI is not set
    225 # CONFIG_TARGET_adm5120_router_le_RouterBoard is not set
    226 # CONFIG_TARGET_adm5120_router_be_Generic is not set
    227 # CONFIG_TARGET_adm5120_router_be_P334WT is not set
    228 # CONFIG_TARGET_adm5120_router_be_P335WT is not set
    229 # CONFIG_TARGET_amazon_Default is not set
    230 # CONFIG_TARGET_omap35xx_beagleboard_Beagleboard is not set
    231 # CONFIG_TARGET_omap35xx_gumstix_Gumstix is not set
    232 CONFIG_TARGET_BOARD="ar71xx"
    233 CONFIG_DEFAULT_TARGET_OPTIMIZATION="-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time"
    234 CONFIG_DEBWRT_TARGET_IMAGE_NAME_BIN="openwrt-ar71xx-generic-ubnt-rspro-squashfs-factory.bin"
    235 CONFIG_DEBWRT_TARGET_IMAGE_NAME_TRX="unknown"
    236 CONFIG_FLASH_IP="unknown"
    237 CONFIG_OPENWRT_BRANCH_TRUNK=y
    238 # CONFIG_OPENWRT_BRANCH_ATTITUDE_ADJUSTMENT is not set
    239 # CONFIG_OPENWRT_BRANCH_BACKFIRE is not set
    240 # CONFIG_OPENWRT_BRANCH_OTHER is not set
    241 CONFIG_OPENWRT_BRANCH="trunk"
    242 CONFIG_OPENWRT_REVISION="HEAD"
    243 CONFIG_DEBWRT_KERNEL_DEFAULT=y
    244 CONFIG_DEBWRT_KERNEL_VERSION="default"
    245 
    246 #
    247 # Kernel Configuration
    248 #
    249 
    250 #
    251 # General configuration
    252 #
    253 CONFIG_MIPS_FPU_EMU=y
    254 CONFIG_INOTIFY=y
    255 CONFIG_INOTIFY_USER=y
    256 CONFIG_BLK_DEV_LOOP=y
    257 
    258 #
    259 # IDE Configuration
    260 #
    261 CONFIG_IDEPCI_PCIBUS_ORDER=y
    262 CONFIG_IDE_XFER_MODE=y
    263 CONFIG_BLK_DEV_IDEDMA_SFF=y
    264 CONFIG_BLK_DEV_IDEPCI=y
    265 CONFIG_BLK_DEV_IDEDMA_PCI=y
    266 CONFIG_BLK_DEV_IDEDMA=y
    267 # CONFIG_IDE_GD_ATAPI is not set
    268 CONFIG_IDE=y
    269 CONFIG_IDE_GD=y
    270 CONFIG_IDE_GD_ATA=y
    271 CONFIG_IDE_PROC_FS=y
    272 CONFIG_BLK_DEV_PDC202XX_OLD=y
    273 
    274 #
    275 # SCSI configuration
    276 #
    277 CONFIG_SCSI=y
    278 CONFIG_SCSI_DMA=y
    279 CONFIG_SCSI_PROC_FS=y
    280 # CONFIG_SCSI_WAIT_SCAN is not set
    281 CONFIG_BLK_DEV_SD=y
    282 
    283 #
    284 # USB configuration
    285 #
    286 CONFIG_USB=y
    287 # CONFIG_USB_DEBUG is not set
    288 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
    289 CONFIG_USB_DEVICEFS=y
    290 CONFIG_USB_DEVICE_CLASS=y
    291 CONFIG_USB_MON=y
    292 CONFIG_USB_EHCI_HCD=y
    293 CONFIG_USB_OHCI_HCD=y
    294 CONFIG_USB_UHCI_HCD=y
    295 CONFIG_USB_EHCI_AR71XX=y
    296 CONFIG_USB_OHCI_AR71XX=y
    297 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
    298 CONFIG_USB_STORAGE=y
    299 
    300 #
    301 # Filesystem support
    302 #
    303 CONFIG_EXT3_FS=y
    304 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
    305 CONFIG_EXT3_FS_XATTR=y
    306 # CONFIG_EXT3_FS_POSIX_ACL is not set
    307 # CONFIG_EXT3_FS_SECURITY is not set
    308 CONFIG_FS_POSIX_ACL=y
    309 CONFIG_JBD=y
    310 CONFIG_FS_MBCACHE=y
    311 
    312 #
    313 # OpenWrt Kernel Module Packages
    314 #
    315 
    316 #
    317 # Wireless Kernel Modules
    318 #
    319 CONFIG_PACKAGE_kmod-ath5k=y
    320 CONFIG_PACKAGE_kmod-ath9k=y
    321 CONFIG_PACKAGE_kmod-madwifi=y
    322 CONFIG_PACKAGE_kmod-b43=y
    323 CONFIG_PACKAGE_kmod-b43legacy=y
    324 CONFIG_PACKAGE_kmod-rt2500-pci=y
    325 CONFIG_PACKAGE_kmod-rt2500-usb=y
    326 CONFIG_NETCONSOLE=y
    327 # CONFIG_NETCONSOLE_DYNAMIC is not set
    328 # CONFIG_NETPOLL_TRAP is not set
    329 
    330 #
    331 # Debian Cross-Compile Environment Configuration
    332 #
    333 CONFIG_DEBIAN_BUILDENV_REPOSITORY="http://localhost:3142/ftp.debian.org/debian"
    334 CONFIG_EMDEBIAN_BUILDENV_REPOSITORY="http://localhost:3142/www.emdebian.org/debian"
    335 CONFIG_DEBIAN_BUILDENV_INCLUDE_PACKAGES="file,less,strace,sudo"
    336 CONFIG_DEBIAN_BUILDENV_QEMU_VERSION="0.15.0-rc0"
    337 CONFIG_DEBWRT_DEBIAN_RELEASE="wheezy"
    338 
    339 #
    340 # Debian Root Filesystem Configuration
    341 #
    342 # CONFIG_DEBWRT_DEBIAN_RELEASE_SID is not set
    343 CONFIG_DEBWRT_DEBIAN_RELEASE_WHEEZY=y
    344 # CONFIG_DEBWRT_DEBIAN_RELEASE_SQUEEZE is not set
    345 # CONFIG_DEBWRT_DEBIAN_RELEASE_LENNY is not set
    346 CONFIG_DEBIAN_ROOTFS_INCLUDE_PACKAGES="debian/rootfs/include_packages.list"
    347 CONFIG_DEBIAN_ROOTFS_QEMU_2ND_STAGE=y
    348 
    349 #
    350 # DebWrt boot options
    351 #
    352 CONFIG_BOOT_METHOD_SCRIPT=y
    353 # CONFIG_BOOT_METHOD_DEVICE is not set
    354 CONFIG_KEXEC=y
    355 CONFIG_PACKAGE_block-mount=y
    356 CONFIG_PACKAGE_busybox=y
    357 CONFIG_PACKAGE_hotplug2=y
    358 CONFIG_PACKAGE_libc=y
    359 CONFIG_PACKAGE_libgcc=y
    360 CONFIG_PACKAGE_libpthread=y
    361 CONFIG_PACKAGE_mtd=y
    362 CONFIG_PACKAGE_nvram=y
    363 CONFIG_PACKAGE_libblkid=y
    364 CONFIG_PACKAGE_libcom_err=y
    365 CONFIG_PACKAGE_libext2fs=y
    366 CONFIG_PACKAGE_libuuid=y
    367 CONFIG_PACKAGE_zlib=y
    368 CONFIG_PACKAGE_blkid=y
    369 CONFIG_PACKAGE_e2fsprogs=y
    370 CONFIG_PACKAGE_uuidgen=y
    371 CONFIG_PACKAGE_swap-utils=y
    372 CONFIG_PACKAGE_kexec-tools=y
    373 CONFIG_PACKAGE_mount-utils=y
    374 CONFIG_OPENWRT_DOWNLOAD_DIR="~/dl"
    375 CONFIG_OPENWRT_MAKE_OPTIONS=""
  • branches/contrib/bitten/recipes/mipsel/brcm47xx/broadcom-b43/config

    r596 r707  
    1 #
    2 # Automatically generated make config: don't edit
    3 # DebWrt version: testing - 2.1-1 - [ 30 September 2012 (364) ]
    4 # Sun Sep 30 00:27:45 2012
    5 #
    6 CONFIG_HAVE_DOT_CONFIG=y
    7 CONFIG_mipsel=y
    8 CONFIG_ARCH="mipsel"
    9 # CONFIG_TARGET_ppc40x is not set
    10 # CONFIG_TARGET_ppc44x is not set
    11 # CONFIG_TARGET_atheros is not set
    12 # CONFIG_TARGET_ar71xx is not set
    13 # CONFIG_TARGET_avr32 is not set
    14 # CONFIG_TARGET_brcm63xx is not set
    15 CONFIG_TARGET_brcm47xx=y
    16 # CONFIG_TARGET_sibyte is not set
    17 # CONFIG_TARGET_octeon is not set
    18 # CONFIG_TARGET_ep93xx is not set
    19 # CONFIG_TARGET_cobalt is not set
    20 # CONFIG_TARGET_gemini is not set
    21 # CONFIG_TARGET_etrax is not set
    22 # CONFIG_TARGET_coldfire is not set
    23 # CONFIG_TARGET_mpc52xx is not set
    24 # CONFIG_TARGET_mpc83xx is not set
    25 # CONFIG_TARGET_mx2 is not set
    26 # CONFIG_TARGET_goldfish is not set
    27 # CONFIG_TARGET_amazon is not set
    28 # CONFIG_TARGET_ifxmips is not set
    29 # CONFIG_TARGET_adm5120 is not set
    30 # CONFIG_TARGET_xburst is not set
    31 # CONFIG_TARGET_iop32x is not set
    32 # CONFIG_TARGET_ixp4xx is not set
    33 # CONFIG_TARGET_malta is not set
    34 # CONFIG_TARGET_kirkwood is not set
    35 # CONFIG_TARGET_orion is not set
    36 # CONFIG_TARGET_pxa is not set
    37 # CONFIG_TARGET_rb532 is not set
    38 # CONFIG_TARGET_at91 is not set
    39 # CONFIG_TARGET_pxcab is not set
    40 # CONFIG_TARGET_rdc is not set
    41 # CONFIG_TARGET_au1000 is not set
    42 # CONFIG_TARGET_ramips is not set
    43 # CONFIG_TARGET_s3c24xx is not set
    44 # CONFIG_TARGET_ps3 is not set
    45 # CONFIG_TARGET_ar7 is not set
    46 # CONFIG_TARGET_omap35xx is not set
    47 # CONFIG_TARGET_ubicom32 is not set
    48 # CONFIG_TARGET_uml is not set
    49 # CONFIG_TARGET_x86 is not set
    50 # CONFIG_TARGET_pxcab_Default is not set
    51 # CONFIG_TARGET_iop32x_Default is not set
    52 # CONFIG_TARGET_au1000_au1500_Atheros is not set
    53 # CONFIG_TARGET_au1000_au1500_InternetBox is not set
    54 # CONFIG_TARGET_au1000_au1500_MeshCube is not set
    55 # CONFIG_TARGET_au1000_au1550_DBAu1550 is not set
    56 # CONFIG_TARGET_coldfire_Default is not set
    57 # CONFIG_TARGET_ubicom32_Default is not set
    58 # CONFIG_TARGET_sibyte_Default is not set
    59 # CONFIG_TARGET_cobalt_Default is not set
    60 # CONFIG_TARGET_kirkwood_Default is not set
    61 # CONFIG_TARGET_xburst_qi_lb60_Default is not set
    62 # CONFIG_TARGET_xburst_n516_Default is not set
    63 # CONFIG_TARGET_xburst_n526_Default is not set
    64 # CONFIG_TARGET_ppc44x_Default is not set
    65 # CONFIG_TARGET_rb532_Default is not set
    66 # CONFIG_TARGET_orion_generic_Default is not set
    67 # CONFIG_TARGET_orion_harddisk_Default is not set
    68 # CONFIG_TARGET_avr32_Default is not set
    69 # CONFIG_TARGET_atheros_Default is not set
    70 # CONFIG_TARGET_ixp4xx_generic_Default is not set
    71 # CONFIG_TARGET_ixp4xx_generic_Atheros-ath5k is not set
    72 # CONFIG_TARGET_ixp4xx_generic_NSLU2 is not set
    73 # CONFIG_TARGET_ixp4xx_generic_NAS100d is not set
    74 # CONFIG_TARGET_ixp4xx_generic_DSMG600RevA is not set
    75 # CONFIG_TARGET_ixp4xx_generic_USR8200 is not set
    76 # CONFIG_TARGET_ixp4xx_harddisk_FSG3 is not set
    77 # CONFIG_TARGET_ep93xx_Default is not set
    78 # CONFIG_TARGET_s3c24xx_openmoko-gta02-minimal is not set
    79 # CONFIG_TARGET_s3c24xx_openmoko-gta02-full is not set
    80 # CONFIG_TARGET_gemini_Default is not set
    81 # CONFIG_TARGET_ppc40x_Default is not set
    82 # CONFIG_TARGET_etrax_default is not set
    83 # CONFIG_TARGET_etrax_vhdl_no_fb is not set
    84 # CONFIG_TARGET_uml_Default is not set
    85 # CONFIG_TARGET_mpc52xx_Default is not set
    86 # CONFIG_TARGET_pxa_Default is not set
    871CONFIG_TARGET_brcm47xx_Broadcom-b43=y
    88 # CONFIG_TARGET_brcm47xx_Broadcom-wl is not set
    89 # CONFIG_TARGET_brcm47xx_Atheros is not set
    90 # CONFIG_TARGET_brcm47xx_Atheros-ath5k is not set
    91 # CONFIG_TARGET_brcm47xx_None is not set
    92 # CONFIG_TARGET_brcm47xx_WGT634U is not set
    93 # CONFIG_TARGET_brcm47xx_WL500GPv1 is not set
    94 # CONFIG_TARGET_brcm47xx_WRT350Nv1 is not set
    95 # CONFIG_TARGET_brcm47xx_WRTSL54GS is not set
    96 # CONFIG_TARGET_at91_Default is not set
    97 # CONFIG_TARGET_malta_le_Default is not set
    98 # CONFIG_TARGET_malta_be_Default is not set
    99 # CONFIG_TARGET_x86_generic_Generic is not set
    100 # CONFIG_TARGET_x86_generic_Alix is not set
    101 # CONFIG_TARGET_x86_generic_Soekris45xx is not set
    102 # CONFIG_TARGET_x86_generic_Soekris48xx is not set
    103 # CONFIG_TARGET_x86_generic_Wrap is not set
    104 # CONFIG_TARGET_x86_olpc_Default is not set
    105 # CONFIG_TARGET_x86_xen_domu_Default is not set
    106 # CONFIG_TARGET_x86_ep80579_Default is not set
    107 # CONFIG_TARGET_x86_net5501_Default is not set
    108 # CONFIG_TARGET_brcm63xx_Broadcom-wl is not set
    109 # CONFIG_TARGET_brcm63xx_Broadcom is not set
    110 # CONFIG_TARGET_brcm63xx_Atheros is not set
    111 # CONFIG_TARGET_brcm63xx_Ralink is not set
    112 # CONFIG_TARGET_brcm63xx_NoWiFi is not set
    113 # CONFIG_TARGET_brcm63xx_GW6X00 is not set
    114 # CONFIG_TARGET_ar71xx_generic_Default is not set
    115 # CONFIG_TARGET_ar71xx_generic_Minimal is not set
    116 # CONFIG_TARGET_ar71xx_generic_Madwifi is not set
    117 # CONFIG_TARGET_ar71xx_generic_AP81 is not set
    118 # CONFIG_TARGET_ar71xx_generic_AP83 is not set
    119 # CONFIG_TARGET_ar71xx_generic_PB42 is not set
    120 # CONFIG_TARGET_ar71xx_generic_PB44 is not set
    121 # CONFIG_TARGET_ar71xx_generic_PB92 is not set
    122 # CONFIG_TARGET_ar71xx_generic_A02RBW300N is not set
    123 # CONFIG_TARGET_ar71xx_generic_WZRHPG300NH is not set
    124 # CONFIG_TARGET_ar71xx_generic_WP543 is not set
    125 # CONFIG_TARGET_ar71xx_generic_DIR600A1 is not set
    126 # CONFIG_TARGET_ar71xx_generic_DIR615C1 is not set
    127 # CONFIG_TARGET_ar71xx_generic_DIR825B1 is not set
    128 # CONFIG_TARGET_ar71xx_generic_WRT160NL is not set
    129 # CONFIG_TARGET_ar71xx_generic_WRT400N is not set
    130 # CONFIG_TARGET_ar71xx_generic_WNDR3700 is not set
    131 # CONFIG_TARGET_ar71xx_generic_MZKW04NU is not set
    132 # CONFIG_TARGET_ar71xx_generic_MZKW300NH is not set
    133 # CONFIG_TARGET_ar71xx_generic_TLWR741NDV1 is not set
    134 # CONFIG_TARGET_ar71xx_generic_TLWR841NV15 is not set
    135 # CONFIG_TARGET_ar71xx_generic_TLWR841NDV3 is not set
    136 # CONFIG_TARGET_ar71xx_generic_TLWR841NDV5 is not set
    137 # CONFIG_TARGET_ar71xx_generic_TLWR941NDV2 is not set
    138 # CONFIG_TARGET_ar71xx_generic_TLWR941NDV3 is not set
    139 # CONFIG_TARGET_ar71xx_generic_TLWR941NDV4 is not set
    140 # CONFIG_TARGET_ar71xx_generic_TLWR1043NDV1 is not set
    141 # CONFIG_TARGET_ar71xx_generic_TEW632BRP is not set
    142 # CONFIG_TARGET_ar71xx_generic_TEW652BRP is not set
    143 # CONFIG_TARGET_ar71xx_generic_UBNTRS is not set
    144 # CONFIG_TARGET_ar71xx_generic_UBNTRSPRO is not set
    145 # CONFIG_TARGET_ar71xx_generic_UBNT is not set
    146 # CONFIG_TARGET_ar71xx_generic_NBG_460N_550N_550NH is not set
    147 # CONFIG_TARGET_ar71xx_nand_DefaultNoWifi is not set
    148 # CONFIG_TARGET_ar71xx_nand_Madwifi is not set
    149 # CONFIG_TARGET_goldfish_Default is not set
    150 # CONFIG_TARGET_ifxmips_danube_None is not set
    151 # CONFIG_TARGET_ifxmips_danube_Atheros is not set
    152 # CONFIG_TARGET_ifxmips_danube_Ralink is not set
    153 # CONFIG_TARGET_ifxmips_ar9_None is not set
    154 # CONFIG_TARGET_ifxmips_ar9_Atheros is not set
    155 # CONFIG_TARGET_ifxmips_ar9_Ralink is not set
    156 # CONFIG_TARGET_ps3_petitboot_Default is not set
    157 # CONFIG_TARGET_ramips_rt288x_Default is not set
    158 # CONFIG_TARGET_ramips_rt305x_Default is not set
    159 # CONFIG_TARGET_mpc83xx_Default is not set
    160 # CONFIG_TARGET_rdc_ar525w is not set
    161 # CONFIG_TARGET_rdc_bifferboard is not set
    162 # CONFIG_TARGET_rdc_r8610 is not set
    163 # CONFIG_TARGET_rdc_sitecom is not set
    164 # CONFIG_TARGET_octeon_generic is not set
    165 # CONFIG_TARGET_octeon_mototech is not set
    166 # CONFIG_TARGET_mx2_Default is not set
    167 # CONFIG_TARGET_ar7_Annex-A is not set
    168 # CONFIG_TARGET_ar7_Annex-B is not set
    169 # CONFIG_TARGET_ar7_Texas is not set
    170 # CONFIG_TARGET_ar7_None is not set
    171 # CONFIG_TARGET_adm5120_router_le_Generic is not set
    172 # CONFIG_TARGET_adm5120_router_le_CAS630 is not set
    173 # CONFIG_TARGET_adm5120_router_le_CAS630W is not set
    174 # CONFIG_TARGET_adm5120_router_le_CAS670 is not set
    175 # CONFIG_TARGET_adm5120_router_le_CAS670W is not set
    176 # CONFIG_TARGET_adm5120_router_le_CAS700 is not set
    177 # CONFIG_TARGET_adm5120_router_le_CAS700W is not set
    178 # CONFIG_TARGET_adm5120_router_le_CAS771 is not set
    179 # CONFIG_TARGET_adm5120_router_le_CAS771W is not set
    180 # CONFIG_TARGET_adm5120_router_le_CAS790 is not set
    181 # CONFIG_TARGET_adm5120_router_le_CAS861 is not set
    182 # CONFIG_TARGET_adm5120_router_le_CAS861W is not set
    183 # CONFIG_TARGET_adm5120_router_le_NFS101U is not set
    184 # CONFIG_TARGET_adm5120_router_le_NFS101WU is not set
    185 # CONFIG_TARGET_adm5120_router_le_NP27G is not set
    186 # CONFIG_TARGET_adm5120_router_le_NP28G is not set
    187 # CONFIG_TARGET_adm5120_router_le_WP54 is not set
    188 # CONFIG_TARGET_adm5120_router_le_BR6104K is not set
    189 # CONFIG_TARGET_adm5120_router_le_BR6104KP is not set
    190 # CONFIG_TARGET_adm5120_router_le_BR6104WG is not set
    191 # CONFIG_TARGET_adm5120_router_le_BR6114WG is not set
    192 # CONFIG_TARGET_adm5120_router_le_EASY5120RT is not set
    193 # CONFIG_TARGET_adm5120_router_le_EASY5120PATA is not set
    194 # CONFIG_TARGET_adm5120_router_le_PMUGW is not set
    195 # CONFIG_TARGET_adm5120_router_le_5GXI is not set
    196 # CONFIG_TARGET_adm5120_router_le_RouterBoard is not set
    197 # CONFIG_TARGET_adm5120_router_be_Generic is not set
    198 # CONFIG_TARGET_adm5120_router_be_P334WT is not set
    199 # CONFIG_TARGET_adm5120_router_be_P335WT is not set
    200 # CONFIG_TARGET_amazon_Default is not set
    201 # CONFIG_TARGET_omap35xx_beagleboard_Beagleboard is not set
    202 # CONFIG_TARGET_omap35xx_gumstix_Gumstix is not set
    203 CONFIG_TARGET_BOARD="brcm47xx"
    204 CONFIG_DEFAULT_TARGET_OPTIMIZATION="-Os -pipe -mips32 -mtune=mips32 -funit-at-a-time"
    205 CONFIG_DEBWRT_TARGET_IMAGE_NAME_BIN="unknown"
    206 CONFIG_DEBWRT_TARGET_IMAGE_NAME_TRX="debwrt-firmware-brcm47xx-squashfs.trx"
    207 CONFIG_FLASH_IP="192.168.1.1"
    208 CONFIG_OPENWRT_BRANCH_TRUNK=y
    209 # CONFIG_OPENWRT_BRANCH_ATTITUDE_ADJUSTMENT is not set
    210 # CONFIG_OPENWRT_BRANCH_BACKFIRE is not set
    211 # CONFIG_OPENWRT_BRANCH_OTHER is not set
    212 CONFIG_OPENWRT_BRANCH="trunk"
    213 CONFIG_OPENWRT_REVISION="HEAD"
    214 CONFIG_DEBWRT_KERNEL_DEFAULT=y
    215 CONFIG_DEBWRT_KERNEL_VERSION="default"
    216 
    217 #
    218 # Kernel Configuration
    219 #
    220 
    221 #
    222 # General configuration
    223 #
    224 CONFIG_MIPS_FPU_EMU=y
    225 CONFIG_INOTIFY=y
    226 CONFIG_INOTIFY_USER=y
    227 CONFIG_BLK_DEV_LOOP=y
    228 
    229 #
    230 # IDE Configuration
    231 #
    232 CONFIG_IDEPCI_PCIBUS_ORDER=y
    233 CONFIG_IDE_XFER_MODE=y
    234 CONFIG_BLK_DEV_IDEDMA_SFF=y
    235 CONFIG_BLK_DEV_IDEPCI=y
    236 CONFIG_BLK_DEV_IDEDMA_PCI=y
    237 CONFIG_BLK_DEV_IDEDMA=y
    238 # CONFIG_IDE_GD_ATAPI is not set
    239 CONFIG_IDE=y
    240 CONFIG_IDE_GD=y
    241 CONFIG_IDE_GD_ATA=y
    242 CONFIG_IDE_PROC_FS=y
    243 CONFIG_BLK_DEV_PDC202XX_OLD=y
    244 
    245 #
    246 # SCSI configuration
    247 #
    248 CONFIG_SCSI=y
    249 CONFIG_SCSI_DMA=y
    250 CONFIG_SCSI_PROC_FS=y
    251 # CONFIG_SCSI_WAIT_SCAN is not set
    252 CONFIG_BLK_DEV_SD=y
    253 
    254 #
    255 # USB configuration
    256 #
    257 CONFIG_USB=y
    258 # CONFIG_USB_DEBUG is not set
    259 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
    260 CONFIG_USB_DEVICEFS=y
    261 CONFIG_USB_DEVICE_CLASS=y
    262 CONFIG_USB_MON=y
    263 CONFIG_USB_EHCI_HCD=y
    264 CONFIG_USB_OHCI_HCD=m
    265 CONFIG_USB_UHCI_HCD=y
    266 CONFIG_USB_EHCI_AR71XX=y
    267 CONFIG_USB_OHCI_AR71XX=y
    268 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
    269 CONFIG_USB_STORAGE=y
    270 
    271 #
    272 # Filesystem support
    273 #
    274 CONFIG_EXT3_FS=y
    275 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
    276 CONFIG_EXT3_FS_XATTR=y
    277 # CONFIG_EXT3_FS_POSIX_ACL is not set
    278 # CONFIG_EXT3_FS_SECURITY is not set
    279 CONFIG_FS_POSIX_ACL=y
    280 CONFIG_JBD=y
    281 CONFIG_FS_MBCACHE=y
    282 
    283 #
    284 # OpenWrt Kernel Module Packages
    285 #
    286 
    287 #
    288 # Wireless Kernel Modules
    289 #
    290 CONFIG_PACKAGE_kmod-ath5k=y
    291 CONFIG_PACKAGE_kmod-ath9k=y
    292 CONFIG_PACKAGE_kmod-madwifi=y
    293 CONFIG_PACKAGE_kmod-b43=y
    294 CONFIG_PACKAGE_kmod-b43legacy=y
    295 CONFIG_PACKAGE_kmod-rt2500-pci=y
    296 CONFIG_PACKAGE_kmod-rt2500-usb=y
    297 CONFIG_NETCONSOLE=y
    298 # CONFIG_NETCONSOLE_DYNAMIC is not set
    299 # CONFIG_NETPOLL_TRAP is not set
    300 
    301 #
    302 # Debian Cross-Compile Environment Configuration
    303 #
    304 CONFIG_DEBIAN_BUILDENV_REPOSITORY="http://localhost:3142/ftp.debian.org/debian"
    305 CONFIG_EMDEBIAN_BUILDENV_REPOSITORY="http://localhost:3142/www.emdebian.org/debian"
    306 CONFIG_DEBIAN_BUILDENV_INCLUDE_PACKAGES="file,less,strace,sudo"
    307 CONFIG_DEBIAN_BUILDENV_QEMU_VERSION="0.15.0-rc0"
    308 CONFIG_DEBWRT_DEBIAN_RELEASE="wheezy"
    309 
    310 #
    311 # Debian Root Filesystem Configuration
    312 #
    313 # CONFIG_DEBWRT_DEBIAN_RELEASE_SID is not set
    314 CONFIG_DEBWRT_DEBIAN_RELEASE_WHEEZY=y
    315 # CONFIG_DEBWRT_DEBIAN_RELEASE_SQUEEZE is not set
    316 # CONFIG_DEBWRT_DEBIAN_RELEASE_LENNY is not set
    317 CONFIG_DEBIAN_ROOTFS_INCLUDE_PACKAGES="debian/rootfs/include_packages.list"
    318 CONFIG_DEBIAN_ROOTFS_QEMU_2ND_STAGE=y
    319 
    320 #
    321 # DebWrt boot options
    322 #
    323 CONFIG_BOOT_METHOD_SCRIPT=y
    324 # CONFIG_BOOT_METHOD_DEVICE is not set
    325 CONFIG_KEXEC=y
    326 CONFIG_PACKAGE_block-mount=y
    327 CONFIG_PACKAGE_busybox=y
    328 CONFIG_PACKAGE_hotplug2=y
    329 CONFIG_PACKAGE_libc=y
    330 CONFIG_PACKAGE_libgcc=y
    331 CONFIG_PACKAGE_libpthread=y
    332 CONFIG_PACKAGE_mtd=y
    333 CONFIG_PACKAGE_nvram=y
    334 CONFIG_PACKAGE_libblkid=y
    335 CONFIG_PACKAGE_libcom_err=y
    336 CONFIG_PACKAGE_libext2fs=y
    337 CONFIG_PACKAGE_libuuid=y
    338 CONFIG_PACKAGE_zlib=y
    339 CONFIG_PACKAGE_blkid=y
    340 CONFIG_PACKAGE_e2fsprogs=y
    341 CONFIG_PACKAGE_uuidgen=y
    342 CONFIG_PACKAGE_swap-utils=y
    343 CONFIG_PACKAGE_kexec-tools=y
    344 CONFIG_PACKAGE_mount-utils=y
    345 CONFIG_OPENWRT_DOWNLOAD_DIR="~/dl"
    346 CONFIG_OPENWRT_MAKE_OPTIONS=""
  • branches/contrib/debian/buildenv/debian.mk

    r667 r707  
    11# DebWrt - Debian on Embedded devices
    22#
    3 # Copyright (C) 2010 Johan van Zoomeren <amain@debwrt.net>
     3# Copyright (C) 2010-2015 Johan van Zoomeren <amain@debwrt.net>
    44#
    55# This program is free software: you can redistribute it and/or modify
     
    1616# along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717
    18 SB2_ARCH:=$(call qstrip,$(CONFIG_ARCH))
    1918CHROOT:=$(SUROOT) chroot $(DEBIAN_BUILD_DIR)
    2019CHROOT_USER:=$(CHROOT) su - $(USER)
    21 SB2:=$(CHROOT_USER) -c bash -c "export LC_ALL=C; cd $(SB2_ARCH)-lenny && sb2"
    22 SB2E:=$(CHROOT_USER) -c bash -c "export LC_ALL=C; cd $(SB2_ARCH)-lenny && sb2 -e"
    23 SB2EF:=$(CHROOT_USER) -c bash -c "export LC_ALL=C; cd $(SB2_ARCH)-lenny && sb2 -eR"
    24 QEMU_BIN=$(DEBIAN_BUILD_DIR)/usr/local/bin/qemu-$(TARGET_ARCH)
    25 QEMU_BIN_STATIC=$(QEMU_BIN)-static
    26 QEMU_INTERPRETER=$(shell cat /proc/sys/fs/binfmt_misc/qemu-$(TARGET_ARCH) 2>/dev/null | grep interpreter | awk '{print $$2}')
    2720
    28 sb2:
    29         $(SB2)
    30 sb2e:
    31         $(SB2E)
    32 sbef:
    33         $(SB2EF)
    3421ch: chroot
    3522chu: chroot-user
     
    3926        $(CHROOT_USER) bash -c "cd /usr/src; exec bash"
    4027
    41 debian/buildenv/create: debian/buildenv/prepare debian/buildenv/emdebian-prepare debian/buildenv/qemu-build
    42         touch $@
     28include $(TOPDIR)/debian/buildenv/buildenv.mk
     29include $(TOPDIR)/debian/buildenv/qemu.mk
     30include $(TOPDIR)/debian/buildenv/emdebian.mk
    4331
    44 debian/buildenv/prepare:
    45         mkdir -p $(DEBIAN_BUILD_DIR)
    46         # Due to various bugs in debootstrap in combination with fakechroot it is not
    47         # possible to create a fakechroot here - and therefore we need to use chroot
    48         # with sudo
    49         #fakeroot fakechroot debootstrap
    50                                                 #--variant=fakechroot
    51         $(SUROOT) debootstrap    --include=$(subst $(space),$(empty),$(CONFIG_DEBIAN_BUILDENV_INCLUDE_PACKAGES)) \
    52                                             $(DEBIAN_BUILD_VERSION) \
    53                                                 $(DEBIAN_BUILD_DIR) \
    54                                                 $(CONFIG_DEBIAN_BUILDENV_REPOSITORY)
    55         $(SUROOT) bash -c "echo 127.0.0.1 `hostname -s` localhost >$(DEBIAN_BUILD_DIR)/etc/hosts"
    56         $(SUROOT) bash -c "echo debwrt-$(TARGET_ARCH)-$(DEBIAN_BUILD_VERSION) > $(DEBIAN_BUILD_DIR)/etc/debian_chroot"
    57         $(SUROOT) bash -c "echo syntax on >$(DEBIAN_BUILD_DIR)/etc/vimrc"
    58         $(SUROOT) bash -c "echo 0 > /proc/sys/vm/mmap_min_addr" # for ARM targets
    59         $(SUROOT) bash -c "echo \"deb $(call qstrip,$(CONFIG_DEBIAN_BUILDENV_REPOSITORY)) $(DEBIAN_BUILD_VERSION) main\" >> $(DEBIAN_BUILD_DIR)/etc/apt/sources.list"
    60         $(SUROOT) bash -c "echo \"deb-src $(call qstrip,$(CONFIG_DEBIAN_BUILDENV_REPOSITORY)) $(DEBIAN_BUILD_VERSION) main\" >> $(DEBIAN_BUILD_DIR)/etc/apt/sources.list"
    61         $(SUROOT) chown $(USER):$(GROUP) $(DEBIAN_BUILD_DIR)/usr/src
    62         $(CHROOT) apt-get update
    63         $(CHROOT) groupadd -g $(shell id -g) debwrt
    64         $(CHROOT) useradd -g debwrt -s /bin/bash -m -u $(shell id -u) $$USER
    65         $(SUROOT) mkdir -p $(DEBIAN_BUILD_DIR)/etc/sudoers.d
    66         $(SUROOT) bash -c "echo \"$(USER) ALL=(ALL) NOPASSWD: ALL\" >$(DEBIAN_BUILD_DIR)/etc/sudoers.d/debwrt"
    67         $(SUROOT) chmod 0440 $(DEBIAN_BUILD_DIR)/etc/sudoers.d/debwrt
    68         touch $@
     32.PHONY: ch \
     33        chu \
     34        chroot \
     35        chroot-user
    6936
    70 debian/buildenv/prepare-sb2:
    71         $(CHROOT) bash -c "export LC_ALL=C; apt-get -y --force-yes install g++-4.3-$(SB2_ARCH)-linux-gnu libc6-dev-$(SB2_ARCH)-cross build-essential debootstrap fakeroot zlib1g-dev qemu-user scratchbox2 dh-make"
    72         touch $@
    73 
    74 #
    75 # -- Emdebian sources.list entries
    76 #
    77 # deb http://www.emdebian.org/debian/ unstable main
    78 # deb http://www.emdebian.org/debian/ testing main
    79 # deb http://www.emdebian.org/debian/ lenny main
    80 #
    81 # Once you have that then install whichever version of the tools you want. e.g:
    82 # apt-get install libc6-armel-cross libc6-dev-armel-cross binutils-arm-linux-gnueabi gcc-4.3-arm-linux-gnueabi g++-4.3-arm-linux-gnueabi
    83 # will install the gcc-4.3 C and C++ toolchain for armel cross-compiling.
    84 #
    85 # Use emdebian stable/lenny cross compiler. Unstable seems to be broken now for a long time
    86 #
    87 # Emdebian suggests to use squeeze, even if on wheezey or higher:
    88 # Currently, toolchains for Squeeze are preferred. If using Wheezy or unstable, add
    89 # a Squeeze source for your own architecture using your normal Debian mirror for
    90 # dependencies which are no longer in wheezy or unstable.
    91 #
    92 #EMDEBIAN_RELEASE:=$(DEBIAN_BUILD_VERSION)
    93 EMDEBIAN_RELEASE:=squeeze
    94 
    95 # Automatic installing of build dependencies
    96 #
    97 # <= Lenny = apt-cross
    98 # >  Lenny = xapt
    99 #
    100 # Squeeze needs some backorts to get xapt working, so from now on
    101 # DebWrt will only support wheezy and up.
    102 #
    103 # Link: https://wiki.debian.org/EmdebianToolchain
    104 
    105 # note: to speed up setting up: do not install devscripts
    106 # note: a mailservers seems to be installed and started: bad - needs removal
    107 
    108 debian/buildenv/emdebian-prepare: debian/buildenv/prepare
    109         @echo "I: Adding squeeze source incase Emdebiand squeeze is missing packages in wheezy or higher..."
    110         $(SUROOT) bash -c "echo \"deb $(call qstrip,$(CONFIG_EMDEBIAN_BUILDENV_REPOSITORY)) $(EMDEBIAN_RELEASE) main\" >> $(DEBIAN_BUILD_DIR)/etc/apt/sources.list"
    111         $(SUROOT) bash -c "echo \"deb $(call qstrip,$(CONFIG_DEBIAN_BUILDENV_REPOSITORY)) squeeze main\" >> $(DEBIAN_BUILD_DIR)/etc/apt/sources.list"
    112         $(SUROOT) bash -c "echo \"deb-src $(call qstrip,$(CONFIG_DEBIAN_BUILDENV_REPOSITORY)) squeeze main\" >> $(DEBIAN_BUILD_DIR)/etc/apt/sources.list"
    113         # Add lenny repo, just for apt-cross
    114         #$(SUROOT) bash -c "echo \"deb  http://archive.debian.org/debian lenny main\" >> $(DEBIAN_BUILD_DIR)/etc/apt/sources.list"
    115         #$(SUROOT) bash -c "echo -e \"Package: *\nPin: release a=lenny\nPin-Priority: 200\" > $(DEBIAN_BUILD_DIR)/etc/apt/preferences"
    116         $(CHROOT) apt-get update
    117         #$(CHROOT) apt-get -y install apt-cross
    118         #$(CHROOT) apt-get -y install libmpfr1ldbl
    119         $(CHROOT) apt-get -y install emdebian-archive-keyring xapt dpkg-cross
    120         $(CHROOT) bash -c "export LC_ALL=C; apt-get -y --force-yes install build-essential dh-make debootstrap fakeroot zlib1g-dev openssh-client vim pkg-config dpatch libncurses5-dev devscripts subversion automake gcc-multilib g++-multilib quilt"
    121 ifeq ($(TARGET_ARCH),arm)
    122         $(CHROOT) bash -c "export LC_ALL=C; apt-get -y --force-yes install libc6-armel-cross libc6-dev-armel-cross binutils-arm-linux-gnueabi gcc-4.3-arm-linux-gnu g++-4.4-arm-linux-gnueabi linux-kernel-headers-armel-cross"
    123 else
    124         $(CHROOT) bash -c "export LC_ALL=C; apt-get -y --force-yes install libc6-$(TARGET_ARCH)-cross libc6-dev-$(TARGET_ARCH)-cross binutils-$(TARGET_ARCH)-linux-gnu gcc-4.3-$(TARGET_ARCH)-linux-gnu g++-4.3-$(TARGET_ARCH)-linux-gnu linux-kernel-headers-$(TARGET_ARCH)-cross"
    125 endif
    126         touch $@
    127 
    128 debian/buildenv/qemu: debian/buildenv/qemu-prepare debian/buildenv/qemu-build
    129         touch $@
    130 
    131 debian/buildenv/qemu-clean:
    132         rm -rf $(DEBIAN_BUILD_DIR)/usr/src/qemu
    133         rm -f debian/buildenv/qemu-prepare
    134         rm -f debian/buildenv/qemu-build
    135 
    136 debian/buildenv/qemu-prepare:
    137         $(CHROOT) bash -c "export LC_ALL=C; apt-get -y install libglib2.0-dev"
    138         mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/qemu
    139         wget -O $(DEBIAN_BUILD_DIR)/usr/src/qemu/qemu-$(call qstrip,$(CONFIG_DEBIAN_BUILDENV_QEMU_VERSION)).tar.gz http://download.savannah.gnu.org/releases/qemu/qemu-$(call qstrip,$(CONFIG_DEBIAN_BUILDENV_QEMU_VERSION)).tar.gz
    140         tar xzf $(DEBIAN_BUILD_DIR)/usr/src/qemu/qemu-$(call qstrip,$(CONFIG_DEBIAN_BUILDENV_QEMU_VERSION)).tar.gz -C $(DEBIAN_BUILD_DIR)/usr/src/qemu
    141         touch $@
    142 
    143 debian/buildenv/qemu-build: debian/buildenv/qemu-prepare
    144         $(CHROOT_USER) bash -c "cd /usr/src/qemu/qemu-$(call qstrip,$(CONFIG_DEBIAN_BUILDENV_QEMU_VERSION)) && ./configure --static --target-list=$(TARGET_ARCH)-linux-user && make"
    145         $(CHROOT) bash -c "cd /usr/src/qemu/qemu-$(call qstrip,$(CONFIG_DEBIAN_BUILDENV_QEMU_VERSION)) && make install"
    146         $(CHROOT) cp /usr/local/bin/qemu-$(TARGET_ARCH) /usr/local/bin/qemu-$(TARGET_ARCH)-static
    147         $(CHROOT_USER) bash -c "cd /usr/src/qemu/qemu-$(call qstrip,$(CONFIG_DEBIAN_BUILDENV_QEMU_VERSION)) && ./configure --target-list=$(TARGET_ARCH)-linux-user && make"
    148         $(CHROOT) bash -c "cd /usr/src/qemu/qemu-$(call qstrip,$(CONFIG_DEBIAN_BUILDENV_QEMU_VERSION)) && make install"
    149         touch $@
    150 
    151 debian/buildenv/scratchbox-prepare:
    152         $(CHROOT_USER) -c bash -c "mkdir -p $(SB2_ARCH)-lenny"
    153         $(CHROOT_USER) -c bash -c "cd $(SB2_ARCH)-lenny && sb2-init -c /usr/local/bin/qemu-$(SB2_ARCH) MIPS \"$(SB2_ARCH)-linux-gnu-gcc\""
    154         $(CHROOT_USER) -c bash -c "fakeroot /usr/sbin/debootstrap --include=file,iputils-ping,netbase,strace,vim,wget,tcpdump --variant=scratchbox --foreign --arch $(SB2_ARCH) lenny $(SB2_ARCH)-lenny/ $(CONFIG_DEBIAN_BUILDENV_REPOSITORY)"
    155         $(CHROOT_USER) -c bash -c  "cd $(SB2_ARCH)-lenny && sb2 -eR ./debootstrap/debootstrap --second-stage"
    156 
    157 debian/buildenv/clean: debian/buildenv/qemu-clean
    158         # sudo should not be needed if fakechroot would have worked
    159         $(SUROOT) rm -rf $(DEBIAN_BUILD_DIR)
    160         rm -f debian/buildenv/prepare
    161         rm -f debian/buildenv/qemu-prepare
    162         rm -f debian/buildenv/qemu-build
    163 
    164 .PHONY: debian/buildenv/clean debian/buildenv
    165 
  • branches/contrib/debian/debian.mk

    r666 r707  
    1616# along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717
    18 DEBIAN_BUILD_METHOD:=sudo
    19 SUROOT:=sudo
    20 CHROOT:=chroot
    21 
    22 # add - onto this? (consistency between these macros)
    23 chroot_root=$(SUROOT) $(CHROOT) $(1)
    24 # add -c onto chroot_user? (consistency between these macros)
    25 chroot_user=$(SUROOT) $(CHROOT) $(1) su - $(USER)
    26 
    27 ifeq (0,1)
    28 # hopefully something along these lines will work to make use of fakeroot...
    29 # the main issue is: http://bugs.debian.org/650234
    30 DEBIAN_BUILD_METHOD:=fake
    31 FAKEROOT_DB:=$(DEBIAN_BUILD_DIR).fakeroot.perms
    32 
    33 SUROOT:=fakeroot -i $(FAKEROOT_DB) -s $(FAKEROOT_DB)
    34 CHROOT:=fakechroot chroot
    35 
    36 chroot_root=$(SUROOT) $(CHROOT) $(1)
    37 chroot_user=$(CHROOT) $(1)
     18ifeq ($(CONFIG_DEBWRT_CROSS),y)
     19        include $(TOPDIR)/debian/buildenv/debian.mk
     20        include $(TOPDIR)/debian/package/debian.mk
     21        DEBIAN_CLEAN+=debian/package/clean debian/buildenv/clean
    3822endif
    3923
    40 export SUROOT CHROOT
    41 
    42 include $(TOPDIR)/debian/buildenv/debian.mk
    43 include $(TOPDIR)/debian/linux-image/linux-image.mk
    44 include $(TOPDIR)/debian/package-build/package-build.mk
    45 include $(TOPDIR)/debian/package-host/package-host.mk
    46 include $(TOPDIR)/debian/rootfs/debian.mk
     24ifeq ($(CONFIG_ROOTFS_DEBIAN),y)
     25        include $(TOPDIR)/debian/rootfs/debian.mk
     26        DEBIAN_CLEAN+=debian/rootfs/clean
     27endif
    4728
    4829debian/all:
    4930
    50 debian/clean: debian/package-build/clean debian/package-host/clean debian/buildenv/clean debian/rootfs/clean
     31debian/clean: $(DEBIAN_CLEAN)
    5132
    5233.PHONY: debian/all \
  • branches/contrib/debian/package-host

  • branches/contrib/debian/package-host/debwrt-kernel-headers/build.mk

    r635 r707  
    4747
    4848debian/package-host/debwrt-kernel-headers/all: debian/package-host/debwrt-kernel-headers/chrootinstall
     49        rm -f debian/package/debwrt-kernel-headers/all
    4950
  • branches/contrib/debian/package-host/nvram/debian/rules

    r84 r707  
    2929        install -d debian/libnvram/usr/lib
    3030        install -o root -g root -m 755 src/nvram debian/nvram/usr/sbin/nvram
    31         install -o root -g root -m 644 src/libnvram.so.0.1 debian/libnvram/usr/lib/libnvram.so.0.1
    32         ln -snf libnvram.so.0.1 debian/libnvram/usr/lib/libnvram.so
    3331
    3432override_dh_auto_clean:
  • branches/contrib/debian/package-host/package-host.mk

    r636 r707  
    2121CH                        := "[\(\)]"
    2222
    23 DEBWRT_ROOTFS_PKGLST      := libnl iw debwrt-kernel-headers robocfg nvram \
    24                              debwrt-hostapd shellinabox libnl-tiny swconfig \
    25                              broadcom-wl debwrt-net mjpg-streamer
     23DEBWRT_ROOTFS_PKGLST      := libnl iw debwrt-kernel-headers nvram \
     24                             libnl-tiny \
     25                             broadcom-wl mjpg-streamer
    2626
     27ifeq ($(CONFIG_DEBWRT_DEBIAN_RELEASE_JESSIE),y)
     28DEBWRT_ROOTFS_PKGLST_DEPS := libjpeg62-turbo
     29else
    2730DEBWRT_ROOTFS_PKGLST_DEPS := libjpeg8
     31endif
    2832
    29 
    30 debian/package-host/rootfs:
     33debian/package-host/rootfs: debian/buildenv/emdebian-prepare
    3134        for pkg in $(DEBWRT_ROOTFS_PKGLST); do \
    3235                $(MAKE) -f $(DEBIAN_PACKAGES_HOST_DIR)/$${pkg}/build.mk debian/package-host/$${pkg}/all; \
    33                 if [ ! 0 -eq $$? ]; then echo "Failed building package for rootfs: $${pkg}"; exit 1; fi; \
     36                if [ ! 0 -eq $$? ]; then echo "Failed building host package for rootfs: $${pkg}"; exit 1; fi; \
    3437        done
    3538        touch $@
     
    3841        rm -rf $(DEBIAN_BUILD_DIR)/usr/src/*   
    3942        rm -f $(TOPDIR)/debian/package-host/rootfs
     43        rm -f $(TOPDIR)/debian/package-host/*/all
    4044        rm -f $(TOPDIR)/debian/package-host/*/build
    4145        rm -f $(TOPDIR)/debian/package-host/*/prepare
     
    4549debian/package-host/%:
    4650        echo make me: $@
    47         $(MAKE) -f debian/package-host/$(dir $*)build.mk $@
     51        $(MAKE) -f debian/package-host/$(dir $(subst debian/package-host/,,$@))build.mk $@
    4852
     53
  • branches/contrib/debian/rootfs/debian.mk

    r667 r707  
    11# DebWrt - Debian on Embedded devices
    22#
    3 # Copyright (C) 2010 Johan van Zoomeren <amain@debwrt.net>
     3# Copyright (C) 2010,2015 Johan van Zoomeren <amain@debwrt.net>
    44#
    55# This program is free software: you can redistribute it and/or modify
     
    1616# along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717
    18 DEBIAN_ROOTFS_INCLUDE_PACKAGES:=$(call qstrip,$(CONFIG_DEBIAN_ROOTFS_INCLUDE_PACKAGES))
    19 DEBIAN_ROOTFS_QEMU_2ND_STAGE:=$(call qstrip, $(CONFIG_DEBIAN_ROOTFS_QEMU_2ND_STAGE))
    20 DEBWRT_EXTRA_ROOTFS_FILES_DIR:=$(TOPDIR)/debian/rootfs/files
    21 DEBWRT_MODULES_ARCHIVE=$(shell ls $(INSTALL_DIR)/debwrt-modules-*.tar.gz 2>/dev/null)
     18QEMU_BIN=/usr/bin/qemu-$(ROOTFS_DEBIAN_ARCH)
     19QEMU_BIN_STATIC=$(QEMU_BIN)-static
     20QEMU_INTERPRETER=$(shell cat /proc/sys/fs/binfmt_misc/qemu-$(ROOTFS_DEBIAN_ARCH) 2>/dev/null | grep interpreter | awk '{print $$2}')
     21
     22ROOTFS_DEBIAN_INCLUDE_PACKAGES:=$(call qstrip,$(CONFIG_ROOTFS_DEBIAN_INCLUDE_PACKAGES))
     23ROOTFS_DEBIAN_QEMU_2ND_STAGE:=$(call qstrip, $(CONFIG_ROOTFS_DEBIAN_QEMU_2ND_STAGE))
     24DEBWRT_EXTRA_ROOTFS_FILES_DIR:=$(TOPDIR)/debian/rootfs/files/all
     25DEBWRT_EXTRA_ROOTFS_FILES_BOARD_DIR:=$(TOPDIR)/debian/rootfs/files/$(call qstrip, $(CONFIG_TARGET_BOARD))
    2226MODULES_VERSION=$(shell echo `basename $(DEBWRT_MODULES_ARCHIVE) 2>/dev/null` | awk -F '-' '{print $$6}')
    23 DEBIAN_ROOTFS_INCLUDE_PACKAGES_DEBIAN_VERSION:=$(wildcard debian/rootfs/include_packages.list.$(DEBIAN_BUILD_VERSION))
     27ROOTFS_DEBIAN_INCLUDE_PACKAGES_DEBIAN_VERSION:=$(wildcard debian/rootfs/include_packages.list.$(ROOTFS_DEBIAN_RELEASE))
    2428
    2529### temporary during work towards functioning fakeroot/fakechroot
     
    3034define qemu-prepare
    3135        @if [ ! -x $(QEMU_BIN_STATIC) ]; then echo "E: can't find qemu ($(QEMU_BIN_STATIC))"; fi
    32         @if [ ! -e /proc/sys/fs/binfmt_misc/qemu-$(TARGET_ARCH) ]; then echo "E: can't find binfmt_misc qemu-$(TARGET_ARCH) ( /proc/sys/fs/binfmt_misc/qemu-$(TARGET_ARCH)).\nE: install qemu-user-static, or\nE: disable second stage with qemu with menuconfig (DEBIAN_ROOTFS_QEMU_2ND_STAGE)."; fi
    33         @if [ ! -x $(QEMU_BIN_STATIC) -o ! -e /proc/sys/fs/binfmt_misc/qemu-$(TARGET_ARCH) ]; then echo "E: abort - qemu not available in chroot"; exit 1; fi
    34         @if [ ! -e $(ROOTFS_BUILD_DIR)$(QEMU_INTERPRETER) ]; then $(SUROOT) cp $(QEMU_BIN_STATIC) $(ROOTFS_BUILD_DIR)$(QEMU_INTERPRETER); fi
    35         @if ! $(CHROOT) /bin/ls >/dev/null; then echo "E: qemu can't execute binaries for $(TARGET_ARCH)"; echo "E: abort"; exit 1; fi
    36         @if ! (mount | grep -q $(ROOTFS_BUILD_DIR)/proc); then $(CHROOT) mount -t proc none /proc; fi
    37         @if ! (mount | grep -q $(ROOTFS_BUILD_DIR)/sys ); then $(CHROOT) mount -t sysfs none /sys; fi
     36        @if [ ! -e /proc/sys/fs/binfmt_misc/qemu-$(ROOTFS_DEBIAN_ARCH) ]; then echo "E: can't find binfmt_misc qemu-$(ROOTFS_DEBIAN_ARCH) ( /proc/sys/fs/binfmt_misc/qemu-$(ROOTFS_DEBIAN_ARCH)).\nE: install qemu-user-static, or\nE: disable second stage with qemu with menuconfig (ROOTFS_DEBIAN_QEMU_2ND_STAGE)."; fi
     37        @if [ ! -x $(QEMU_BIN_STATIC) -o ! -e /proc/sys/fs/binfmt_misc/qemu-$(ROOTFS_DEBIAN_ARCH) ]; then echo "E: abort - qemu not available in chroot"; exit 1; fi
     38        @if [ ! -e $(ROOTFS_BUILD_DIR)$(QEMU_INTERPRETER) ]; then sudo cp $(QEMU_BIN_STATIC) $(ROOTFS_BUILD_DIR)$(QEMU_INTERPRETER); fi
     39        @if ! sudo chroot $(ROOTFS_BUILD_DIR) /bin/ls >/dev/null; then echo "E: qemu can't execute binaries for $(ROOTFS_DEBIAN_ARCH)"; echo "E: abort"; exit 1; fi
     40        @if ! (mount | grep -q $(ROOTFS_BUILD_DIR)/proc); then sudo chroot $(ROOTFS_BUILD_DIR) mount -t proc none /proc; fi
     41        @if ! (mount | grep -q $(ROOTFS_BUILD_DIR)/sys ); then sudo chroot $(ROOTFS_BUILD_DIR) mount -t sysfs none /sys; fi
    3842        @mount
    3943endef
     
    5054         >$(TMP_DIR)/include_packages_list.debwrt-package-deps; \
    5155        grep -hv '^#' \
    52                  $(DEBIAN_ROOTFS_INCLUDE_PACKAGES) \
    53                  $(DEBIAN_ROOTFS_INCLUDE_PACKAGES_DEBIAN_VERSION) \
     56                 $(ROOTFS_DEBIAN_INCLUDE_PACKAGES) \
     57                 $(ROOTFS_DEBIAN_INCLUDE_PACKAGES_DEBIAN_VERSION) \
    5458                 $(TMP_DIR)/include_packages_list.debwrt-package-deps \
    5559          | sort -u | tr '\n' ',' | sed 's/,$$//')
     
    5862chr:
    5963        $(call qemu-prepare)
    60         @$(SUROOT) bash -c "echo "debwrt-$(TARGET_ARCH)" > $(ROOTFS_BUILD_DIR)/etc/debian_chroot"
    61         @$(SUROOT) cp $(ROOTFS_BUILD_DIR)/etc/resolv.conf $(ROOTFS_BUILD_DIR)/etc/resolv.conf_debwrt
    62         @$(SUROOT) bash -c "cat /etc/resolv.conf | grep nameserver >$(ROOTFS_BUILD_DIR)/etc/resolv.conf"
    63         @$(CHROOT)
    64         @$(SUROOT) rm -f $(ROOTFS_BUILD_DIR)/etc/debian_chroot
    65         @$(SUROOT) cp $(ROOTFS_BUILD_DIR)/etc/resolv.conf_debwrt $(ROOTFS_BUILD_DIR)/etc/resolv.conf
     64        @sudo bash -c "echo "debwrt-$(ROOTFS_DEBIAN_ARCH)" > $(ROOTFS_BUILD_DIR)/etc/debian_chroot"
     65        @sudo cp $(ROOTFS_BUILD_DIR)/etc/resolv.conf $(ROOTFS_BUILD_DIR)/etc/resolv.conf_debwrt
     66        @sudo bash -c "cat /etc/resolv.conf | grep nameserver >$(ROOTFS_BUILD_DIR)/etc/resolv.conf"
     67        @sudo chroot $(ROOTFS_BUILD_DIR)
     68        @sudo rm -f $(ROOTFS_BUILD_DIR)/etc/debian_chroot
     69        @sudo cp $(ROOTFS_BUILD_DIR)/etc/resolv.conf_debwrt $(ROOTFS_BUILD_DIR)/etc/resolv.conf
    6670        $(call qemu-cleanup)
    6771
     
    6973               debian/rootfs/unpack               \
    7074               debian/rootfs/files-install        \
    71                debian/rootfs/debwrt-packages      \
    72                debian/rootfs/modules-install      \
    7375               debian/rootfs/post-setup           \
    74                debian/rootfs/second-stage-qemu    \
     76               debian/rootfs/second-stage         \
    7577               debian/rootfs/verify               \
    7678               debian/rootfs/save
    77         @echo "I: root filesystem $(DEBIAN_BUILD_VERSION) $(TARGET_ARCH) prepared in $(ROOTFS_BUILD_DIR)"
    78         @echo "I: if the DebWrt kernel wasn't build, then no kernel modules have been installed, install them by:"
    79         @echo "I: - make openwrt/all"
    80         @echo "I: - make debian/rootfs/modules-install"
    81         @echo "I: - or: install manually from alternative source"
     79        @echo "I: Root filesystem $(ROOTFS_DEBIAN_RELEASE) $(ROOTFS_DEBIAN_ARCH) prepared in $(ROOTFS_BUILD_DIR) and archived in $(ROOTFS_INSTALL_DIR)/$(ROOTFS_TAR_BZ2)."
    8280        @echo "I:"
    83         @echo "I: install the image to USB-Disk/USB-Stick/SD-Card (make sure it is already mounted at /media/DEBWRT_ROOTFS)"
     81        @echo "I: Install the image to USB-Disk/USB-Stick/SD-Card (make sure it is already mounted at /media/DEBWRT_ROOTFS)"
    8482        @echo "I: - make debian/rootfs/install"
    8583        @echo "I:"
    86         @echo "I: enter the change root(with qemu) and perform additional post install steps:"
     84        @echo "I: Enter the change root(with qemu) and perform additional post install steps:"
    8785        @echo "I: - make chr"
    8886        @echo "I: - apt-get update # example statement ;-) - networking works!"
     
    107105
    108106debian/rootfs/save:
    109 ifeq ($(DEBIAN_ROOTFS_QEMU_2ND_STAGE),y)
    110         $(SUROOT) bash -c "tar cjf $(INSTALL_DIR)/$(ROOTFS_TAR_BZ2) -C $(ROOTFS_BUILD_DIR) ."
    111 else
    112         if [ -d /media/DEBWRT_ROOT ]; then \
    113                 $(SUROOT) bash -c "tar cjf $(ROOTFS_TAR_BZ2) -C /media/DEBWRT_ROOT ."; \
    114         fi
    115 endif
     107        mkdir -p $(ROOTFS_INSTALL_DIR)
     108        sudo bash -c "tar cjf $(ROOTFS_INSTALL_DIR)/$(ROOTFS_TAR_BZ2) -C $(ROOTFS_BUILD_DIR) ."
     109#ifeq ($(ROOTFS_DEBIAN_QEMU_2ND_STAGE),y)
     110#else
     111#       if [ -d /media/DEBWRT_ROOT ]; then \
     112#               sudo bash -c "tar cjf $(ROOTFS_TAR_BZ2) -C /media/DEBWRT_ROOT ."; \
     113#       fi
     114#endif
    116115
    117116debian/rootfs/files-install: debian/rootfs/bootstrap
     
    125124        chmod 600 $(DEBWRT_EXTRA_ROOTFS_FILES_DIR)/etc/ssh/ssh_host_rsa_key
    126125        chmod 600 $(DEBWRT_EXTRA_ROOTFS_FILES_DIR)/etc/ssh/ssh_host_dsa_key
    127         $(SUROOT) bash -c "tar cf - --exclude=".svn" -C $(DEBWRT_EXTRA_ROOTFS_FILES_DIR) . | tar -xovf - -C $(ROOTFS_BUILD_DIR)"
    128         $(SUROOT) cat $(ROOTFS_BUILD_DIR)/etc/securetty \
     126        sudo bash -c "tar cf - --exclude=".svn" -C $(DEBWRT_EXTRA_ROOTFS_FILES_DIR) . | tar -xovf - -C $(ROOTFS_BUILD_DIR)"
     127        sudo bash -c "if [ -d $(DEBWRT_EXTRA_ROOTFS_FILES_BOARD_DIR) ]; then tar cf - --exclude=".svn" -C $(DEBWRT_EXTRA_ROOTFS_FILES_BOARD_DIR) . | tar -xovf - -C $(ROOTFS_BUILD_DIR); fi"
     128        sudo cat $(ROOTFS_BUILD_DIR)/etc/securetty \
    129129                $(TOPDIR)/debian/rootfs/securetty.tail \
    130130                >> $(TOPDIR)/securetty.temp
     
    132132        touch $@
    133133
    134 debian/rootfs/modules-install: debian/rootfs/bootstrap
    135 ifneq ($(DEBWRT_MODULES_ARCHIVE),)
    136         $(SUROOT) tar xof $(DEBWRT_MODULES_ARCHIVE) -C $(ROOTFS_BUILD_DIR)
    137         #$(SUROOT) depmod -a -b $(ROOTFS_BUILD_DIR) $(MODULES_VERSION)
    138 else
    139         @echo "W: Can't install kernel module to the change root. Kernel modules archive missing. ($(DEBWRT_MODULES_ARCHIVE))"
    140 endif
    141         touch $@
    142 
    143134# Fow now: Include debwrt-packages dependencies staticly. This
    144135#          list(DEBWRT_ROOTFS_PKGLST_DEPS) is managed in debian/package-host/debian.mk.
    145136debian/rootfs/bootstrap: debian/rootfs/clean-rootfs-dir
    146         $(SUROOT) debootstrap --arch=$(TARGET_ARCH)\
     137        mkdir -p $(ROOTFS_BUILD_DIR)
     138        sudo debootstrap --arch=$(ROOTFS_DEBIAN_ARCH)\
    147139                     --foreign \
    148140                     --include=$(call rootfs-package-list) \
    149                      $(DEBIAN_BUILD_VERSION) \
     141                     $(ROOTFS_DEBIAN_RELEASE) \
    150142                     $(ROOTFS_BUILD_DIR) \
    151143                     $(CONFIG_DEBIAN_BUILDENV_REPOSITORY)
     
    165157
    166158# install all available cross-compiled debwrt debian packages, except for the kernel-headers package and the cross packages
    167 debian/rootfs/debwrt-packages: debian/rootfs/bootstrap debian/package-host/rootfs
    168         ls ${INSTALL_DIR_DEBIAN_PACKAGES}/*.deb | grep -v -e"debwrt-kernel-headers" -e"cross" | while read package; do \
    169                 pfname=`basename $$package`; \
    170                 pname=`echo $$pfname | sed 's/_.*//'`; \
    171                 echo "Installing DebWrt package: $$pname"; \
    172                 $(SUROOT) cp $$package $(ROOTFS_BUILD_DIR)/var/cache/apt/archives; \
    173                 $(SUROOT) dpkg-deb -x $$package $(ROOTFS_BUILD_DIR); \
    174                 $(SUROOT) bash -c "echo \"$$pname /var/cache/apt/archives/$$pfname\" >>$(ROOTFS_BUILD_DIR)/debootstrap/debpaths" ;\
    175                 $(SUROOT) sed -i "s/$$/$$pname /" $(ROOTFS_BUILD_DIR)/debootstrap/base ;\
    176         done
    177         touch $@
    178        
     159
    179160debian/rootfs/clean-rootfs-dir:
    180161        mkdir -p $(BUILD_DIR_BASE)
     
    185166        $(SUROOT) mkdir -p $(ROOTFS_BUILD_DIR)/etc/apt
    186167        # note: unfortunately /etc/apt/sources.list is cleaned after running second stage install
    187         $(SUROOT) bash -c "echo \"deb http://ftp.debian.org/debian $(DEBIAN_BUILD_VERSION) main\" > $(ROOTFS_BUILD_DIR)/etc/apt/sources.list"
    188         $(SUROOT) bash -c "echo \"$(DEBWRTVERSION)\" >$(ROOTFS_BUILD_DIR)/etc/debwrt_version"
    189         $(SUROOT) bash -c "echo \"$(DEBIAN_BUILD_VERSION)\" >$(ROOTFS_BUILD_DIR)/etc/debian_release"
     168        sudo bash -c "echo \"deb http://ftp.debian.org/debian $(ROOTFS_DEBIAN_RELEASE) main\" > $(ROOTFS_BUILD_DIR)/etc/apt/sources.list"
     169        sudo bash -c "echo \"$(DEBWRTVERSION)\" >$(ROOTFS_BUILD_DIR)/etc/debwrt_version"
     170        sudo bash -c "echo \"$(ROOTFS_DEBIAN_RELEASE)\" >$(ROOTFS_BUILD_DIR)/etc/debian_release"
    190171        touch $@
    191172
    192 ifeq ($(DEBIAN_ROOTFS_QEMU_2ND_STAGE),y)
    193 debian/rootfs/second-stage-qemu: debian/rootfs/bootstrap debian/buildenv/qemu-build
     173ifeq ($(ROOTFS_DEBIAN_QEMU_2ND_STAGE),y)
     174debian/rootfs/second-stage: debian/rootfs/bootstrap debian/buildenv/qemu
    194175        $(call qemu-prepare)
    195176        $(CHROOT) /usr/sbin/PostInstall && $(SUROOT) rm -f $(ROOTFS_BUILD_DIR)/usr/sbin/PostInstall
    196177        $(call qemu-cleanup)
    197178else
    198 debian/rootfs/second-stage-qemu: debian/rootfs/bootstrap
     179debian/rootfs/second-stage: debian/rootfs/bootstrap
    199180        @echo "I: Qemu 2nd stage install disabled. Second stage needs now to be performend on the target device itself."
    200         @echo "I: Qemu 2nd stage install can be enabled using menuconfig (DEBIAN_ROOTFS_QEMU_2ND_STAGE)."
     181        @echo "I: Qemu 2nd stage install can be enabled using menuconfig (ROOTFS_DEBIAN_QEMU_2ND_STAGE)."
    201182endif
    202183        touch $@
     
    204185debian/rootfs/clean:
    205186        $(SUROOT) rm -rf $(ROOTFS_BUILD_DIR)
    206         rm -f debian/rootfs/debwrt-packages
    207187        rm -f debian/rootfs/bootstrap
    208188        rm -f debian/rootfs/install
    209189        rm -f debian/rootfs/files-install
    210         rm -f debian/rootfs/modules-install
    211190
  • branches/contrib/debian/rootfs/files/all/etc/fstab

    r706 r707  
    33# <file system>     <mount point>   <type>  <options>       <dump>  <pass>
    44proc                /proc           proc    defaults        0          0
    5 /dev/sda1           /               ext3    defaults,noatime,nodiratime,errors=remount-ro  0       0
    6 /dev/sda2           none            swap    sw              0          0
    7 /dev/mtdblock2      /mnt            jffs2   defaults,ro     0          0
     5LABEL=DEBWRT_ROOT   /               ext3    defaults,noatime,nodiratime,errors=remount-ro  0       0
     6LABEL=DEBWRT_SWAP   swap            swap    sw              0          0
     7#/dev/mtdblock?      /mnt            jffs2   defaults,ro     0          0
    88
  • branches/contrib/debian/rootfs/include_packages.list

    r262 r707  
    4040vlan
    4141wireless-tools
     42sslh
     43wpasupplicant
     44hostapd
  • branches/contrib/openwrt/openwrt-deliver.mk

    r596 r707  
    7171
    7272openwrt/deliver/image: openwrt/deliver/prepare
    73         mkdir -p $(INSTALL_DIR)
     73        mkdir -p $(INSTALL_DIR_OPENWRT)
    7474        find $(OPENWRT_BIN_DIR) -maxdepth 1 -type f | while read fname; do \
    7575                tfname=`basename $$fname`; \
    7676                tfname=`echo $$tfname | sed 's/openwrt/debwrt-firmware/'`; \
    77                 cp -av $$fname $(INSTALL_DIR)/$$tfname; \
     77                cp -av $$fname $(INSTALL_DIR_OPENWRT)/$$tfname; \
    7878        done
    7979
    8080openwrt/deliver/kernel-modules: openwrt/deliver/prepare
    81         mkdir -p $(INSTALL_DIR) $(INSTALL_DIR_OPENWRT) $(INSTALL_DIR_OPENWRT_MODULES)
     81        mkdir -p $(INSTALL_DIR_OPENWRT) $(INSTALL_DIR_OPENWRT_MODULES)
    8282        mkdir -p $(INSTALL_DIR_OPENWRT_MODULES)/lib/modules
    8383        cp -r $(OPENWRT_TMP_DIR)/modules/lib/modules/$(OPENWRT_LINUX_UNAME_VERSION) $(INSTALL_DIR_OPENWRT_MODULES)/lib/modules
     
    8888        done
    8989        PATH="/sbin:/bin:/usr/sbin:/usr/bin" depmod -a -b $(INSTALL_DIR_OPENWRT_MODULES) $(OPENWRT_LINUX_UNAME_VERSION)
    90         tar czf $(INSTALL_DIR)/$(MODULES_TAR_GZ) -C $(INSTALL_DIR_OPENWRT_MODULES) .
     90        tar czf $(INSTALL_DIR_OPENWRT)/$(MODULES_TAR_GZ) -C $(INSTALL_DIR_OPENWRT_MODULES) .
    9191
    9292openwrt/deliver/kernel-headers: openwrt/deliver/prepare
     
    9898        #cp $(OPENWRT_LINUX_DIR)/include/linux/switch.h $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-$(OPENWRT_LINUX_UNAME_VERSION)/include/linux/switch.h
    9999        cp $(OPENWRT_LINUX_DIR)/.config $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-$(OPENWRT_LINUX_UNAME_VERSION)
    100         tar czf $(INSTALL_DIR)/$(HEADERS_TAR_GZ) -C $(INSTALL_DIR_OPENWRT_HEADERS) .
     100        tar czf $(INSTALL_DIR_OPENWRT)/$(HEADERS_TAR_GZ) -C $(INSTALL_DIR_OPENWRT_HEADERS) .
    101101
    102102openwrt/deliver/packages: openwrt/deliver/prepare
     
    105105
    106106openwrt/deliver/config: openwrt/deliver/prepare
    107         cp $(TOPDIR)/.config $(INSTALL_DIR)/config-debwrt
    108         cp $(OPENWRT_BUILD_DIR)/.config $(INSTALL_DIR)/config-openwrt
    109         cp $(OPENWRT_LINUX_DIR)/.config $(INSTALL_DIR)/config-kernel-$(OPENWRT_LINUX_VERSION)
    110         $(SCRIPT_GET_SVN_REVISION) $(OPENWRT_LINUX_DIR) > $(INSTALL_DIR)/openwrt-svn-revision
    111         $(SCRIPT_GET_SVN_REVISION) $(TOPDIR) > $(INSTALL_DIR)/debwrt-svn-revision
     107        cp $(TOPDIR)/.config $(INSTALL_DIR_OPENWRT)/config-debwrt
     108        cp $(OPENWRT_BUILD_DIR)/.config $(INSTALL_DIR_OPENWRT)/config-openwrt
     109        cp $(OPENWRT_LINUX_DIR)/.config $(INSTALL_DIR_OPENWRT)/config-kernel-$(OPENWRT_LINUX_VERSION)
     110        $(SCRIPT_GET_SVN_REVISION) $(OPENWRT_LINUX_DIR) > $(INSTALL_DIR_OPENWRT)/openwrt-svn-revision
     111        $(SCRIPT_GET_SVN_REVISION) $(TOPDIR) > $(INSTALL_DIR_OPENWRT)/debwrt-svn-revision
    112112
    113113openwrt/deliver/clean:
    114         rm -rf $(INSTALL_DIR)
     114        rm -rf $(INSTALL_DIR_OPENWRT)
    115115
  • branches/contrib/openwrt/openwrt.mk

    r513 r707  
    2121# along with this program.  If not, see <http://www.gnu.org/licenses/>.
    2222
     23ifneq ($(findstring openwrt,$(MAKECMDGOALS)),)
     24$(info Architecture: $(TARGET_ARCH))
     25$(info Target      : $(TARGET))
     26$(info Sub rarget  : $(SUB_TARGET))
     27$(info Profile     : $(PROFILE))
     28$(info )
     29endif
     30 
    2331OPENWRT_PATCHES_DIR=$(TOPDIR)/openwrt/patches
    2432OPENWRT_PATCH_DIRS:= "$(OPENWRT_PATCHES_DIR)/all" \
  • branches/contrib/openwrt/patches/all/012_disable_all_openwrt_packages

    r430 r707  
    22+++ openwrt/include/toplevel.mk 2010-01-02 00:14:07.000000000 +0100
    33@@ -49,6 +49,11 @@
    4                 f=tmp/.$${type}info; t=tmp/.config-$${type}.in; \
    54                [ "$$t" -nt "$$f" ] || ./scripts/metadata.pl $${type}_config "$$f" > "$$t" || { rm -f "$$t"; echo "Failed to build $$t"; false; break; }; \
    65        done
     6        [ tmp/.config-feeds.in -nt tmp/.packagefeeds ] || ./scripts/feeds feed_config > tmp/.config-feeds.in
    77+       # DebWrt: we don't need to build any packages by default, so we disable them
    88+       #         all. This allows us to have fine control over which packages we
     
    1212        ./scripts/metadata.pl package_mk tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; }
    1313        touch $(TOPDIR)/tmp/.build
    14  
  • branches/contrib/rules/debwrt.mk

    r650 r707  
    1616# along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717
    18 RELEASE:=testing
    19 BUILD_CYCLE_ID:=-1
    20 VERSION:=2.1$(BUILD_CYCLE_ID)
     18RELEASE:=unstable
     19BUILD_CYCLE_ID:=
     20VERSION:=$(BUILD_CYCLE_ID)
    2121RELEASE_DATE=$(shell LC_ALL=c date +"%d %B %Y")
    2222SVN_REVISION:=$(call get_svn_revision)
    2323DEBWRTVERSION:=$(RELEASE) - $(VERSION) - [ $(RELEASE_DATE) ($(SVN_REVISION)) ]
    24 DEBWRT_VERSION:=$(RELEASE)-$(VERSION)
     24ifeq ($(VERSION),)
     25    DEBWRT_VERSION:=$(RELEASE)
     26else
     27    DEBWRT_VERSION:=$(RELEASE)-$(VERSION)
     28endif
    2529
    2630empty:=
     
    3337TARGET_ARCH:=$(call qstrip,$(CONFIG_ARCH))
    3438
    35 # Board [example: ar7xx]
    36 BOARD:=$(call qstrip,$(CONFIG_TARGET_BOARD))
    37 
    38 # Sub board [example: ubnt-rspro]
    39 SUB_BOARD:=$(shell $(SCRIPT_GET_BOARD) $(TOPDIR)/.config $(BOARD))
     39# Board
     40# Example:
     41#      target    : ar71xx
     42#      sub_target: generic
     43#      profile   : ubntrspro
     44TARGET:=$(shell $(SCRIPT_GET_TARGET) target $(TOPDIR)/.config)
     45SUB_TARGET:=$(shell $(SCRIPT_GET_TARGET) subtarget $(TOPDIR)/.config)
     46PROFILE:=$(shell $(SCRIPT_GET_TARGET) profile $(TOPDIR)/.config)
    4047
    4148# Linux version [2.6.X(.X)]
     
    5158OPENWRT_REVISION:=$(call qstrip,$(CONFIG_OPENWRT_REVISION))
    5259
    53 # Base BuildDir
    54 BUILD_DIR_BASE:=$(TOPDIR)/build
     60# bin/delivery dir
     61BIN_DIR:=$(TOPDIR)/bin
     62
     63# build dir
     64BUILD_DIR:=$(TOPDIR)/build
     65
     66# tmp dir
     67TMP_DIR:=$(TOPDIR)/tmp
    5568
    5669# Config dir
     
    6073PLUGINS_DIR:=$(TOPDIR)/plugins
    6174
    62 # bin/delivery dir
    63 BIN_DIR:=$(TOPDIR)/bin
    64 
    65 # tmp dir
    66 TMP_DIR:=$(TOPDIR)/tmp
     75# Base BuildDir
     76BUILD_DIR_BASE:=$(BUILD_DIR)/$(DEBWRT_VERSION)
    6777
    6878# Install dir
    69 INSTALL_DIR:=$(BIN_DIR)/$(BOARD)-$(SUB_BOARD)-$(DEBWRT_VERSION)
     79INSTALL_DIR_BASE:=$(BIN_DIR)/$(DEBWRT_VERSION)
    7080
    7181# Install dir for OpenWrt binaries
    72 INSTALL_DIR_OPENWRT:=$(INSTALL_DIR)/openwrt
     82INSTALL_DIR_OPENWRT:=$(INSTALL_DIR_BASE)/firmware/${TARGET_ARCH}/$(TARGET)/$(SUB_TARGET)
    7383
    7484# Install dir OpenWrt kernel modules
     
    8292
    8393# Image file containing OpenWrt kernel modules
    84 MODULES_TAR_GZ=debwrt-modules-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).tar.gz
     94MODULES_TAR_GZ=debwrt-modules-$(TARGET_ARCH)-$(TARGET)-$(SUB_TARGET)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).tar.gz
    8595
    8696# Image file containing OpenWrt kernel headers
    87 HEADERS_TAR_GZ=debwrt-headers-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).tar.gz
    88 
    89 # Image file containing DebWrt rootfs
    90 ROOTFS_TAR_BZ2=debwrt-rootfs-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).tar.bz2
     97HEADERS_TAR_GZ=debwrt-headers-$(TARGET_ARCH)-$(TARGET)-$(SUB_TARGET)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).tar.gz
    9198
    9299# Filename of DebWrt firmware image
    93 TARGET_IMAGE_NAME_BIN=debwrt-firmware-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).bin
    94 TARGET_IMAGE_NAME_TRX=debwrt-firmware-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).trx
     100TARGET_IMAGE_NAME_BIN=debwrt-firmware-$(TARGET)-$(SUB_TARGET)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).bin
     101TARGET_IMAGE_NAME_TRX=debwrt-firmware-$(TARGET)-$(SUB_TARGET)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).trx
    95102
    96103# OpenWrt patches directory
     
    102109# OpenWrt Build (checkout) directory
    103110ifeq ($(OPENWRT_TAG),)
    104 OPENWRT_BUILD_DIR:=$(BUILD_DIR_BASE)/openwrt-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_BRANCH)-$(OPENWRT_REVISION)
     111OPENWRT_BUILD_DIR:=$(BUILD_DIR_BASE)/openwrt/$(TARGET_ARCH)/$(TARGET)/$(SUB_TARGET)/$(OPENWRT_BRANCH)-$(OPENWRT_REVISION)
    105112else
    106 OPENWRT_BUILD_DIR:=$(BUILD_DIR_BASE)/openwrt-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_TAG)
     113OPENWRT_BUILD_DIR:=$(BUILD_DIR_BASE)/openwrt/$(TARGET_ARCH)/$(TARGET)/$(SUB_TARGET)/$(OPENWRT_TAG)
    107114endif
    108115
     
    113120OPENWRT_DOWNLOAD_DIR:=$(call qstrip,$(CONFIG_OPENWRT_DOWNLOAD_DIR))
    114121
    115 # Debian build environment version
    116 DEBIAN_BUILD_VERSION:=$(call qstrip,$(CONFIG_DEBWRT_DEBIAN_RELEASE))
    117 
    118122# Debian
    119 DEBIAN_BUILD_DIR:=$(BUILD_DIR_BASE)/debian-$(BOARD)-$(SUB_BOARD)-$(DEBIAN_BUILD_VERSION)
     123DEBIAN_BUILD_DIR:=$(BUILD_DIR_BASE)/debian-$(TARGET)-$(SUB_TARGET)-$(DEBIAN_BUILD_VERSION)
    120124
    121125DEBIAN_BUILD_PKG_DIR:=$(BUILD_DIR_BASE)/debian-buildhost-$(DEBIAN_BUILD_VERSION)
     
    129133
    130134# Debian rootfs
    131 ROOTFS_BUILD_DIR:=$(BUILD_DIR_BASE)/rootfs-$(TARGET_ARCH)-$(DEBWRT_VERSION)
     135ROOTFS_DEBIAN_ARCH:=$(call qstrip,$(CONFIG_ROOTFS_DEBIAN_ARCH))
     136ROOTFS_DEBIAN_RELEASE:=$(call qstrip,$(CONFIG_ROOTFS_DEBIAN_RELEASE))
     137ROOTFS_BUILD_DIR:=$(BUILD_DIR_BASE)/rootfs/$(ROOTFS_DEBIAN_RELEASE)/${ROOTFS_DEBIAN_ARCH}
     138ROOTFS_INSTALL_DIR:=$(INSTALL_DIR_BASE)/rootfs/$(ROOTFS_DEBIAN_RELEASE)/${ROOTFS_DEBIAN_ARCH}
     139
     140# Image file containing DebWrt rootfs
     141ROOTFS_TAR_BZ2=debwrt-rootfs-$(ROOTFS_DEBIAN_RELEASE)-$(ROOTFS_DEBIAN_ARCH)-$(DEBWRT_VERSION).tar.bz2
    132142
    133143# Export defaults to other Makefiles
  • branches/contrib/rules/scripts.mk

    r17 r707  
    2222SCRIPT_EXTRACT_KMODPKG:=$(SCRIPT_DIR)/extract_kmodpkg.sh
    2323SCRIPT_FLASH:=$(SCRIPT_DIR)/flash.sh
    24 SCRIPT_GET_BOARD:=$(SCRIPT_DIR)/get_sub_board.sh
     24SCRIPT_GET_TARGET:=$(SCRIPT_DIR)/get_config_target.sh
Note: See TracChangeset for help on using the changeset viewer.