diff options
88 files changed, 128448 insertions, 657 deletions
@@ -7,7 +7,6 @@ - fix init scripts pidof? vs. killall - rpath libtool problem fix - bind isc 9.6.1 -- check mips -mno-abicalls - check ac_cv_func_setpgrp_void=no - freebsd build - win cygwin build diff --git a/mk/build.mk b/mk/build.mk index 9f2683642..00875e71d 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -127,7 +127,7 @@ clean: $(MAKE) -C $(CONFIG) clean for d in ${STAGING_PARENT_PFX}; do \ echo "clean: entering $$d" ; \ - for f in $$d/pkg/[a-z]*; do \ + for f in $$(ls $$d/pkg/[a-z]* 2>/dev/null); do \ echo "clean: cleaning for $$f" ; \ while read file ; do \ rm $$d/target/$$file ; \ diff --git a/mk/image.mk b/mk/image.mk index e80ac5d1e..9c0053727 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -57,9 +57,11 @@ ${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR} PATH='${TARGET_PATH}' \ mksquashfs ${TARGET_DIR} ${BUILD_DIR}/root.squashfs \ -nopad -noappend -root-owned $(MAKE_TRACE) - # padding of images is required cat ${BIN_DIR}/${DEVICE}-${ARCH}-kernel ${BUILD_DIR}/root.squashfs > \ ${BUILD_DIR}/${ROOTFSSQUASHFS} + # padding of images is required + dd if=${BUILD_DIR}/${ROOTFSSQUASHFS} of=${BIN_DIR}/${ROOTFSSQUASHFS} \ + bs=4063232 conv=sync $(MAKE_TRACE) imageclean: rm -f $(BIN_DIR)/$(DEVICE)-* diff --git a/mk/modules.mk b/mk/modules.mk index ca494e300..875b93c62 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -751,6 +751,10 @@ $(eval $(call KMOD_template,OCF_TALITOS,cryptodev-talitos,\ # # Filesystems # +$(eval $(call KMOD_template,AUFS_FS,fs-aufs,\ + $(MODULES_DIR)/kernel/fs/aufs/aufs \ +,30)) + $(eval $(call KMOD_template,CIFS,fs-cifs,\ $(MODULES_DIR)/kernel/fs/cifs/cifs \ ,30)) diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 67f2ec80c..4ab2f71e2 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -19,5 +19,6 @@ $(eval $(call rootfs_template,initramfs,INITRAMFS)) $(eval $(call rootfs_template,squashfs,SQUASHFS)) $(eval $(call rootfs_template,yaffs,YAFFS)) $(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp)) +$(eval $(call rootfs_template,encrypted,ENCRYPTED)) export FS diff --git a/package/Config.in b/package/Config.in index ff123d48e..c0cb91511 100644 --- a/package/Config.in +++ b/package/Config.in @@ -9,6 +9,7 @@ menu "Basesystem" source "package/base-files/Config.in" source "package/busybox/Config.in" source "package/cfgfs/Config.in" +source "package/cryptinit/Config.in" source "package/uclibc/Config.in" source "package/glibc/Config.in" source "package/eglibc/Config.in" @@ -47,6 +48,7 @@ source "package/vim/Config.in" endmenu menu "Filesystem utilities" +source "package/aufs2-util/Config.in" source "package/dosfstools/Config.in" source "package/e2fsprogs/Config.in" source "package/fuse/Config.in" diff --git a/package/Depends.mk b/package/Depends.mk index fc07c3ade..46fab2a02 100644 --- a/package/Depends.mk +++ b/package/Depends.mk @@ -16,6 +16,7 @@ cbtt-compile: uclibc++-compile endif cbtt-compile: mysql-compile zlib-compile collectd-compile: libpthread-compile +cryptinit-compile: cryptsetup-compile cryptsetup-compile: libgcrypt-compile popt-compile e2fsprogs-compile lvm-compile ifeq (${ADK_COMPILE_CTORRENT_WITH_UCLIBCXX},y) ctorrent-compile: uclibc++-compile diff --git a/package/Makefile b/package/Makefile index 6af55aee0..9597d5269 100644 --- a/package/Makefile +++ b/package/Makefile @@ -27,6 +27,7 @@ package-$(ADK_PACKAGE_ARPD) += arpd package-$(ADK_PACKAGE_ARPWATCH) += arpwatch package-$(ADK_PACKAGE_ASTERISK) += asterisk package-$(ADK_COMPILE_ATFTP) += atftp +package-$(ADK_PACKAGE_AUFS_UTIL) += aufs2-util package-$(ADK_PACKAGE_AUTOSSH) += autossh package-$(ADK_COMPILE_AVAHI) += avahi package-$(ADK_COMPILE_AXTLS) += axtls @@ -34,6 +35,7 @@ package-$(ADK_PACKAGE_BASH) += bash package-$(ADK_COMPILE_BC) += bc package-$(ADK_PACKAGE_CA_CERTS) += ca-certificates package-$(ADK_PACKAGE_CFGFS) += cfgfs +package-$(ADK_PACKAGE_CRYPTINIT) += cryptinit package-$(ADK_PACKAGE_BIGREQSPROTO) += bigreqsproto package-$(ADK_COMPILE_BIND) += bind package-$(ADK_PACKAGE_BINUTILS) += binutils diff --git a/package/aufs2-util/Config.in b/package/aufs2-util/Config.in new file mode 100644 index 000000000..4e3b34dcc --- /dev/null +++ b/package/aufs2-util/Config.in @@ -0,0 +1,9 @@ +config ADK_PACKAGE_AUFS_UTIL + prompt "aufs2-util........................ aufs2 utilities" + tristate + default n + select ADK_KPACKAGE_KMOD_AUFS_FS + help + Utilities for use with aufs2. + + http://aufs.sf.net diff --git a/package/aufs2-util/Makefile b/package/aufs2-util/Makefile new file mode 100644 index 000000000..4457775b9 --- /dev/null +++ b/package/aufs2-util/Makefile @@ -0,0 +1,33 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= aufs2-util +PKG_VERSION:= 130809 +PKG_RELEASE:= 1 +PKG_DESCR:= aufs2 utilities +PKG_SECTION:= admin +PKG_URL:= http://aufs.sf.net/ + +NO_DISTFILES:= 1 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,AUFS_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +MAKE_FLAGS+= KDIR=${LINUX_DIR} +BUILD_STYLE= auto +INSTALL_STYLE= auto + +do-extract: + mkdir -p ${WRKBUILD} + ${CP} ./src/* ${WRKBUILD}/ + +do-configure: + +#post-install: +# $(INSTALL_DIR) $(IDIR_BASH)/bin +# $(INSTALL_BIN) $(WRKINST)/usr/bin/bash $(IDIR_BASH)/bin/ + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/aufs2-util/patches/patch-Makefile b/package/aufs2-util/patches/patch-Makefile new file mode 100644 index 000000000..5cfb193c3 --- /dev/null +++ b/package/aufs2-util/patches/patch-Makefile @@ -0,0 +1,33 @@ + - explicitly use the host cc to compile c2sh and c2tmac + (using per-target local variable assignments is an elegant + way for not having to define explicit rules for the targets) + - dont try setting owner and group of installed files +--- aufs2-util-130809.orig/Makefile 2009-08-13 14:59:49.000000000 +0200 ++++ aufs2-util-130809/Makefile 2009-08-23 18:05:03.909726416 +0200 +@@ -54,6 +54,11 @@ ${Dummy}: ${LibSoObj} + ${LibSo}: ${Dummy} + ln -f $< $@ + ++c2sh c2tmac: CC = ${HOSTCC} ++c2sh c2tmac: CFLAGS="-I${KDIR}/include" ++c2sh c2tmac: LDFLAGS= ++c2sh c2tmac: CPPFLAGS= ++ + etc_default_aufs: c2sh aufs.shlib + ${RM} $@ + echo '# aufs variables for shell scripts' > $@ +@@ -86,12 +91,12 @@ install_ulib: File = ${LibSo} + install_ulib: Tgt = ${DESTDIR}/ulib + install_sbin install_ubin install_man install_ulib: ${File} + install -d ${Tgt} +- install -m 755 -o root -g root -p ${Opt} ${File} ${Tgt} ++ install -m 755 -p ${Opt} ${File} ${Tgt} + install_etc: File = etc_default_aufs + install_etc: Tgt = ${DESTDIR}/etc/default/aufs + install_etc: ${File} + install -d $(dir ${Tgt}) +- install -m 644 -o root -g root -p -T ${File} ${Tgt} ++ install -m 644 -p -T ${File} ${Tgt} + + # do not inlcude install_ulib here + install: install_man install_sbin install_ubin install_etc diff --git a/package/aufs2-util/src/COPYING b/package/aufs2-util/src/COPYING new file mode 100644 index 000000000..f90922eea --- /dev/null +++ b/package/aufs2-util/src/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring |