Changeset 2362

Show
Ignore:
Timestamp:
04/15/07 16:45:50 (5 years ago)
Author:
wbx
Message:

add some experimental stuff i would like to use for my linux laptop, not ready so far (initramfs with cryptotoken support, to encrypt a root partition with a usb cryptotoken..)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/Config.in

    r2360 r2362  
    111111config FWRT_LINUX_2_6_X86 
    112112        bool 
     113config FWRT_LINUX_2_4_X86 
     114        bool 
    113115 
    114116source "target/Config.in" 

  • trunk/freewrt/mk/pkg-depend.mk

    r2316 r2362  
    2323curl-compile: openssl-compile zlib-compile 
    2424ctorrent-compile: openssl-compile uclibc++-compile 
     25cryptsetup-luks-compile: libgcrypt-compile popt-compile e2fsprogs-compile 
    2526cxxtools-compile: libiconv-compile uclibc++-compile 
    2627cyrus-sasl-compile: openssl-compile 
    …… 
    9596obexftp-compile: openobex-compile libiconv-compile 
    9697opencdk-compile: libgcrypt-compile 
     98openct-compile: libtool-compile libusb-compile 
    9799openldap-compile: cyrus-sasl-compile openssl-compile 
    98100ifneq ($(FWRT_PACKAGE_OPENSER_MOD_AUTH_RADIUS)$(FWRT_PACKAGE_OPENSER_MOD_AVP_RADIUS),) 
    …… 
    101103openssh-compile: zlib-compile openssl-compile 
    102104openssl-compile: zlib-compile 
     105openssl-pkcs11-compile: libp11-compile 
    103106openswan-compile: gmp-compile 
    104107osiris-compile: openssl-compile 

  • trunk/freewrt/mk/targets.mk

    r2322 r2362  
    6363# PC engine WRAP 
    6464$(eval $(call target_template,2.6,x86,wrap,2_6_X86_WRAP)) 
     65$(eval $(call target_template,2.6,x86,cryptotoken,2_6_X86_CRYPTOTOKEN)) 
    6566 
    6667define rootfs_template 
    …… 
    7576$(eval $(call rootfs_template,ext2-cf,EXT2_CF)) 
    7677$(eval $(call rootfs_template,yaffs2,YAFFS2)) 
     78$(eval $(call rootfs_template,initramfs,INITRAMFS)) 
    7779 
    7880 

  • trunk/freewrt/package/Config.in

    r2360 r2362  
    234234endmenu 
    235235 
     236menu "Crypto" 
     237source "package/cryptsetup-luks/Config.in" 
     238source "package/libp11/Config.in" 
     239source "package/openct/Config.in" 
     240source "package/opensc/Config.in" 
     241source "package/openssl-pkcs11/Config.in" 
     242endmenu 
     243 
    236244menu "IPv6" 
    237245source "package/6tunnel/Config.in" 

  • trunk/freewrt/package/Makefile

    r2330 r2362  
    4242package-$(FWRT_COMPILE_CURL) += curl 
    4343package-$(FWRT_PACKAGE_CUTTER) += cutter 
     44package-$(FWRT_PACKAGE_CRYPTSETUP_LUKS) += cryptsetup-luks 
    4445package-$(FWRT_COMPILE_CYRUS_SASL) += cyrus-sasl 
    4546package-$(FWRT_PACKAGE_CXXTOOLS) += cxxtools 
    …… 
    136137package-$(FWRT_PACAKGE_LIBOL) += libol 
    137138package-$(FWRT_PACKAGE_LIBOSIP2) += libosip2 
     139package-$(FWRT_PACKAGE_LIBP11) += libp11 
    138140package-$(FWRT_PACKAGE_LIBPCAP) += libpcap 
    139141package-$(FWRT_PACKAGE_LIBPNG) += libpng 
    …… 
    194196package-$(FWRT_PACKAGE_OLSRD) += olsrd 
    195197package-$(FWRT_COMPILE_OPENCDK) += opencdk 
     198package-$(FWRT_PACKAGE_OPENCT) += openct 
    196199package-$(FWRT_PACKAGE_OPENOBEX) += openobex 
    197200package-$(FWRT_COMPILE_OPENLDAP) += openldap 
    198201package-$(FWRT_PACKAGE_OPENNTPD) += openntpd 
     202package-$(FWRT_PACKAGE_OPENSC) += opensc 
    199203package-$(FWRT_PACKAGE_OPENSER) += openser 
    200204package-$(FWRT_COMPILE_OPENSSH) += openssh 
    201205package-$(FWRT_COMPILE_OPENSSL) += openssl 
     206package-$(FWRT_PACKAGE_OPENSSL_PKCS11) += openssl-pkcs11 
    202207package-$(FWRT_PACKAGE_OPENSWAN) += openswan 
    203208package-$(FWRT_PACKAGE_OPENVPN) += openvpn 

  • trunk/freewrt/package/e2fsprogs/Makefile

    r1906 r2362  
    3939        ${CP} ${WRKINST}/usr/lib/lib{blkid,com_err,e2p,ext2fs,uuid}.so.* \ 
    4040                ${IDIR_E2FSPROGS}/usr/lib/ 
     41        # install some headers explicitely 
     42        ${INSTALL_DIR} ${STAGING_DIR}/usr/include/uuid 
     43        ${CP} ${WRKBUILD}/lib/uuid/uuid.h \ 
     44                ${STAGING_DIR}/usr/include/uuid 
    4145 
    4246include ${TOPDIR}/mk/pkg-bottom.mk 

  • trunk/freewrt/package/uclibc++/files/config.i386

    r1 r2362  
    22# Automatically generated make config: don't edit 
    33# 
    4 # TARGET_arm is not set 
    5 TARGET_i386=y 
    6 # TARGET_mips is not set 
    7 # TARGET_powerpc is not set 
    84 
    95# 
    10 # Target Architecture Features and Options 
     6# Target Features and Options 
    117# 
    12 HAVE_ELF=y 
    13 TARGET_ARCH="i386" 
    14 # CONFIG_GENERIC_386 is not set 
    15 # CONFIG_386 is not set 
    16 CONFIG_486=y 
    17 # CONFIG_586 is not set 
    18 # CONFIG_586MMX is not set 
    19 # CONFIG_686 is not set 
    20 # CONFIG_PENTIUMIII is not set 
    21 # CONFIG_PENTIUM4 is not set 
    22 # CONFIG_K6 is not set 
    23 # CONFIG_K7 is not set 
    24 # CONFIG_CRUSOE is not set 
    25 # CONFIG_WINCHIPC6 is not set 
    26 # CONFIG_WINCHIP2 is not set 
    27 # CONFIG_CYRIXIII is not set 
    28 ARCH_LITTLE_ENDIAN=y 
    29 # ARCH_BIG_ENDIAN is not set 
    308UCLIBCXX_HAS_FLOATS=y 
     9# UCLIBCXX_HAS_LONG_DOUBLE is not set 
     10# UCLIBCXX_HAS_TLS is not set 
    3111WARNINGS="-Wall" 
     12BUILD_EXTRA_LIBRARIES="" 
    3213HAVE_DOT_CONFIG=y 
    3314 

  • trunk/freewrt/target/Config.in

    r2360 r2362  
    5858                   FWRT_LINUX_2_6_RB || \ 
    5959                   FWRT_LINUX_2_4_X86 || \ 
    60                    FWRT_LINUX_2_6_X86 
     60                   FWRT_LINUX_2_6_X86 && \ 
     61                   ! FWRT_LINUX_2_6_X86_CRYPTOTOKEN 
    6162        help 
    6263          Use this option if you have a compact flash 
    …… 
    7071          Use this option if you want to install FreeWRT to RouterBoard's 
    7172          internal NAND flash. 
     73 
     74config FWRT_TARGET_ROOTFS_INITRAMFS 
     75        bool "initramfs image (cpio archive)" 
     76        depends on FWRT_LINUX_2_6_X86_CRYPTOTOKEN 
     77        help 
     78          create a initramfs only. 
    7279 
    7380endchoice 

  • trunk/freewrt/target/image/x86/Makefile

    r2035 r2362  
    1010 
    1111INSTPREPSCRIPT = instprep-wrap.sh 
    12 ROOTFSTARBALL = rootfs-$(BOARD)-$(KERNEL)-$(DEVICE)-$(FS).tar.gz 
     12ROOTFSTARBALL = $(FWRT_PREFIX)-$(DEVICE)-$(BOARD)-$(KERNEL)-$(FS).tar.gz 
     13INITRAMFS = $(FWRT_PREFIX)-$(DEVICE)-$(BOARD)-$(KERNEL)-$(FS).gz 
    1314CF_DOC_URL = https://www.freewrt.org/trac/wiki/Documentation/Filesystems/CompactFlash 
    1415 
    …… 
    2223        cp $(LINUX_DIR)/arch/i386/boot/bzImage $(KDIR)/root/kernel 
    2324 
    24 install-prepare_DEPS=   instprep-script kernel-install 
     25install-prepare_DEPS=   kernel-install 
    2526 
    2627install-prepare-md: 
    …… 
    2930$(KDIR)/root: install-prepare kernel-install 
    3031 
    31 $(BIN_DIR)/$(ROOTFSTARBALL): $(KDIR)/root 
     32$(BIN_DIR)/$(ROOTFSTARBALL): $(KDIR)/root instprep-script 
    3233        (cd $(KDIR)/root ; tar cf - * | gzip -9 > $(BIN_DIR)/$(ROOTFSTARBALL)) 
     34 
     35$(BIN_DIR)/$(INITRAMFS): $(KDIR)/root 
     36        (cd $(KDIR)/root ; find . | cpio -o -H newc | gzip > $(BIN_DIR)/$(INITRAMFS)) 
     37 
     38ifeq ($(FS),initramfs) 
     39install: $(BIN_DIR)/$(INITRAMFS) 
     40        @echo  
     41        @echo "The initramfs is: $(BIN_DIR)/$(INITRAMFS)" 
     42endif 
    3343 
    3444ifeq ($(FS),ext2-cf) 

  • trunk/freewrt/target/linux/x86-2.6/Config.in

    r2360 r2362  
    99        help 
    1010          PC Engine WRAP 
     11 
     12config FWRT_LINUX_2_6_X86_CRYPTOTOKEN 
     13        bool "Initramfs with tools for cryptotokens [Linux 2.6]" 
     14        select FWRT_i386 
     15        select FWRT_LINUX_2_6_X86 
     16        select BUSYBOX_CONFIG_MDEV 
     17        select BUSYBOX_CONFIG_FEATURE_MDEV_CONF 
     18        select BUSYBOX_CONFIG_FEATURE_MDEV_EXEC 
     19        select FWRT_PACKAGE_CRYPTSETUP_LUKS 
     20        select FWRT_PACKAGE_LIBOPENSSL 
     21        select FWRT_PACKAGE_OPENSSL_PKCS11 
     22        select FWRT_PACKAGE_OPENSC 
     23        select FWRT_PACKAGE_OPENCT 
     24        depends FWRT_DEVEL 
     25        help 
     26          Initramfs with tools for cryptotokens.