diff options
43 files changed, 511 insertions, 517 deletions
@@ -5,6 +5,3 @@ - check for gcc and SSP again - port full blown perl - port w3m -- port libcec for xbmc -- check xbmc samba/nfs support -- add support for librtmp in xbmc diff --git a/mk/build.mk b/mk/build.mk index 0b3d2cc73..ad2d42b40 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -36,6 +36,7 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_URLGRABBER=n \ ADK_PACKAGE_PERL=n \ ADK_PACKAGE_LIBSSP=n \ + ADK_PACKAGE_OPENAFS=n \ ADK_PKG_XORG=n \ ADK_PKG_MPDBOX=n \ ADK_PKG_DEVELOPMENT=n \ @@ -572,8 +573,9 @@ release: $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/$(SYSTEM)_$(ARCH)_$$libc/build.log; \ - if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; break;fi \ + if [ -f .exit ];then echo "Bulk build failed!"; break;fi \ done + if [ -f .exit ];then rm .exit;exit 1;fi # build all target architecture, target systems and libc combinations bulk: diff --git a/mk/image.mk b/mk/image.mk index 2273b4af7..7c519d7f5 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -121,12 +121,14 @@ INITRAMFS= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS} ROOTFSSQUASHFS= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img ROOTFSTARBALL= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz ROOTFSUSERTARBALL= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.gz +ROOTFSISO= ${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.iso else TARGET_KERNEL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_FS}-kernel INITRAMFS= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS} ROOTFSSQUASHFS= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img ROOTFSTARBALL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz ROOTFSUSERTARBALL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.gz +ROOTFSISO= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.iso endif ${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR} kernel-package @@ -197,5 +199,16 @@ endif $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH=$(ARCH) CC="$(TARGET_CC)" -j${ADK_MAKE_JOBS} $(ADK_TARGET_KERNEL) $(MAKE_TRACE) +${BIN_DIR}/${ROOTFSISO}: ${TARGET_DIR} kernel-package + mkdir -p ${TARGET_DIR}/boot/syslinux + cp ${STAGING_HOST_DIR}/usr/share/syslinux/{isolinux.bin,ldlinux.c32} \ + ${TARGET_DIR}/boot/syslinux + echo 'DEFAULT /boot/kernel root=/dev/sr0 init=/init' > \ + ${TARGET_DIR}/boot/syslinux/isolinux.cfg + ${TOOLS_DIR}/mkisofs -R -uid 0 -gid 0 -o $@ \ + -b boot/syslinux/isolinux.bin \ + -c boot/syslinux/boot.cat -no-emul-boot \ + -boot-load-size 4 -boot-info-table ${TARGET_DIR} + imageclean: rm -f $(BIN_DIR)/$(ADK_TARGET_SYSTEM)-* ${BUILD_DIR}/$(ADK_TARGET_SYSTEM)-* diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 283c87aa7..18d4f83dc 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -52,5 +52,6 @@ $(eval $(call rootfs_template,squashfs,SQUASHFS,$(ROOTFS))) $(eval $(call rootfs_template,yaffs,YAFFS,$(MTDDEV) panic=3)) $(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp init=/init)) $(eval $(call rootfs_template,encrypted,ENCRYPTED)) +$(eval $(call rootfs_template,iso,ISO)) export ADK_TARGET_FS diff --git a/package/dbus-python/Makefile b/package/dbus-python/Makefile index e76d508a7..9645f7269 100644 --- a/package/dbus-python/Makefile +++ b/package/dbus-python/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= dbus-python PKG_VERSION:= 1.2.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= b09cd2d1a057cc432ce944de3fc06bf7 PKG_DESCR:= DBUS python bindings PKG_SECTION:= libs diff --git a/package/dbus-python/patches/patch-configure b/package/dbus-python/patches/patch-configure new file mode 100644 index 000000000..f13116469 --- /dev/null +++ b/package/dbus-python/patches/patch-configure @@ -0,0 +1,11 @@ +--- dbus-python-1.2.0.orig/configure 2013-05-08 09:48:42.000000000 +0200 ++++ dbus-python-1.2.0/configure 2013-12-13 12:52:44.522656370 +0100 +@@ -11762,7 +11762,7 @@ $as_echo "$as_me: PYTHON_INCLUDES overri + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python headers using $PYTHON-config --includes" >&5 + $as_echo_n "checking for Python headers using $PYTHON-config --includes... " >&6; } +- PYTHON_INCLUDES=`$PYTHON-config --includes` ++ PYTHON_INCLUDES=`python-config --includes` + if test $? = 0; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_INCLUDES" >&5 + $as_echo "$PYTHON_INCLUDES" >&6; } diff --git a/package/libXt/Makefile b/package/libXt/Makefile index 4e4e8a8db..69cd67d2f 100644 --- a/package/libXt/Makefile +++ b/package/libXt/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 7a80ed7aba06668b12ebd0910318a1f1 PKG_DESCR:= X Toolkit Intrinsics libraries PKG_SECTION:= x11/libs PKG_DEPENDS:= libsm libice libuuid libx11 libxau libxdmcp libxcb -PKG_BUILDDEP:= libSM libX11 kbproto +PKG_BUILDDEP:= autotool libSM libX11 kbproto util-macros PKG_SITES:= ${MASTER_SITE_XORG} PKG_LIBNAME:= libxt PKG_OPTS:= dev @@ -19,6 +19,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +AUTOTOOL_STYLE:= autoreconf TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --disable-malloc0returnsnull diff --git a/package/libXt/patches/patch-util_Makefile_in b/package/libXt/patches/patch-util_Makefile_in index a92166c93..b20260a8e 100644 --- a/package/libXt/patches/patch-util_Makefile_in +++ b/package/libXt/patches/patch-util_Makefile_in @@ -5,7 +5,7 @@ CHANGELOG_CMD = @CHANGELOG_CMD@ CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -+CPPFLAGS = ++CPPFLAGS = @CPPFLAGS_FOR_BUILD@ CWARNFLAGS = @CWARNFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ diff --git a/package/libbluray/Makefile b/package/libbluray/Makefile index 1988ce7d6..4fe695207 100644 --- a/package/libbluray/Makefile +++ b/package/libbluray/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= c7a1cc71cb9747f93122ec650d4ae933 PKG_DESCR:= bluray library PKG_SECTION:= libs +PKG_BUILDDEP:= libxml2 PKG_URL:= http://www.videolan.org/developers/libbluray.html PKG_SITES:= ftp://ftp.videolan.org/pub/videolan/libbluray/${PKG_VERSION}/ PKG_OPTS:= dev diff --git a/package/libcec/Makefile b/package/libcec/Makefile new file mode 100644 index 000000000..e085df139 --- /dev/null +++ b/package/libcec/Makefile @@ -0,0 +1,34 @@ +# 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:= libcec +PKG_VERSION:= 2.1.4 +PKG_RELEASE:= 1 +PKG_MD5SUM:= d65e52ab3295e9e4b73bf4580f3bd4f7 +PKG_DESCR:= control your device with your TV remote control +PKG_SECTION:= libs +PKG_BUILDDEP:= autotool +PKG_URL:= http://libcec.pulse-eight.com/ +PKG_SITES:= http://www.openadk.org/distfiles +PKG_OPTS:= dev + +PKG_SYSTEM_DEPENDS:= raspberry-pi +PKG_LIBC_DEPENDS:= eglibc glibc musl + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBCEC,libcec,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +AUTOTOOL_STYLE:= autoreconf +CONFIGURE_ARGS+= --enable-rpi \ + --with-rpi-include-path=$(STAGING_TARGET_DIR)/opt/vc/include \ + --with-rpi-lib-path=$(STAGING_TARGET_DIR)/opt/vc/lib + +libcec-install: + $(INSTALL_DIR) $(IDIR_LIBCEC)/usr/lib + $(CP) $(WRKINST)/usr/lib/libcec*.so* \ + $(IDIR_LIBCEC)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/liblzo/Makefile b/package/liblzo/Makefile index 37955a774..3f79d0317 100644 --- a/package/liblzo/Makefile +++ b/package/liblzo/Makefile @@ -4,11 +4,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= lzo -PKG_VERSION:= 2.04 -PKG_RELEASE:= 2 -PKG_MD5SUM:= a383c7055a310e2a71b9ecd19cfea238 +PKG_VERSION:= 2.06 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 95380bd4081f85ef08c5209f4107e9f8 PKG_DESCR:= a real-time data compression library PKG_SECTION:= libs +PKG_BUILDDEP:= liblzo-host PKG_URL:= http://www.oberhumer.com/opensource/lzo PKG_SITES:= http://www.oberhumer.com/opensource/lzo/download/ PKG_LIBNAME:= liblzo @@ -18,10 +19,13 @@ ifeq ($(ADK_STATIC),y) PKG_OPTS+= libonly endif +include ${TOPDIR}/mk/host.mk include ${TOPDIR}/mk/package.mk +$(eval $(call HOST_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS))) +HOST_STYLE:= auto CONFIGURE_ARGS+= --enable-static MAKE_FLAGS+= CFLAGS_O="${TARGET_CFLAGS}" @@ -29,4 +33,5 @@ liblzo-install: ${INSTALL_DIR} ${IDIR_LIBLZO}/usr/lib ${CP} ${WRKINST}/usr/lib/liblzo2.so* ${IDIR_LIBLZO}/usr/lib +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libnfs/Makefile b/package/libnfs/Makefile new file mode 100644 index 000000000..2ad21801f --- /dev/null +++ b/package/libnfs/Makefile @@ -0,0 +1,28 @@ +# 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:= libnfs +PKG_VERSION:= 1.8.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 0f20c7c104aa2e2ee563169b7e164aab +PKG_DESCR:= NFS client library +PKG_SECTION:= libs +PKG_BUILDDEP:= autotool +PKG_URL:= https://github.com/sahlberg/libnfs +PKG_SITES:= https://sites.google.com/site/libnfstarballs/li/ +PKG_OPTS:= dev + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBNFS,libnfs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +AUTOTOOL_STYLE:= autoreconf + +libnfs-install: + $(INSTALL_DIR) $(IDIR_LIBNFS)/usr/lib + $(CP) $(WRKINST)/usr/lib/libnfs*.so* \ + $(IDIR_LIBNFS)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libssh/Makefile b/package/libssh/Makefile new file mode 100644 index 000000000..8d7b455fb --- /dev/null +++ b/package/libssh/Makefile @@ -0,0 +1,37 @@ +# 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:= libssh +PKG_VERSION:= 0.5.3 +PKG_RELEASE:= 3 +PKG_MD5SUM:= 9ad01838d3b89d98e900e0f6260a88cc +PKG_DESCR:= SSH library +PKG_SECTION:= libs +PKG_DEPENDS:= libopenssl zlib +PKG_BUILDDEP:= openssl zlib +PKG_URL:= http://www.libssh.org/ +PKG_SITES:= http://www.libssh.org/files/0.5/ +PKG_OPTS:= dev + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBSSH,libssh,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +WRKBUILD= ${WRKDIR}/${PKG_NAME}-obj +CONFIG_STYLE:= manual + +do-configure: + (cd $(WRKBUILD) && PATH='${TARGET_PATH}' \ + cmake -DCMAKE_SYSTEM_NAME=Linux \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DOPENSSL_ROOT_DIR='$(STAGING_TARGET_DIR)/usr' \ + -DZLIB_ROOT_DIR='$(STAGING_TARGET_DIR)/usr' $(WRKSRC)/) + +libssh-install: + $(INSTALL_DIR) $(IDIR_LIBSSH)/usr/lib + $(CP) $(WRKINST)/usr/lib/libssh*.so* \ + $(IDIR_LIBSSH)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake b/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake new file mode 100644 index 000000000..a67998250 --- /dev/null +++ b/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake @@ -0,0 +1,14 @@ +--- libssh-0.5.3.orig/cmake/Modules/DefineCompilerFlags.cmake 2012-11-20 12:41:49.000000000 +0100 ++++ libssh-0.5.3/cmake/Modules/DefineCompilerFlags.cmake 2013-12-17 13:20:04.073723090 +0100 +@@ -20,11 +20,6 @@ if (UNIX AND NOT WIN32) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") + endif (WITH_FPIC) + +- check_c_compiler_flag_ssp("-fstack-protector" WITH_STACK_PROTECTOR) +- if (WITH_STACK_PROTECTOR) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector") +- endif (WITH_STACK_PROTECTOR) +- + check_c_compiler_flag("-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE) + if (WITH_FORTIFY_SOURCE) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2") diff --git a/package/openafs/Makefile b/package/openafs/Makefile index a5a81dcc0..d22a1d691 100644 --- a/package/openafs/Makefile +++ b/package/openafs/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= openafs -PKG_VERSION:= 1.6.5 +PKG_VERSION:= 1.6.5.1 PKG_RELEASE:= 1 PKG_MD5SUM:= e33e0b031760d4f90815d40b8ab3c540 PKG_DESCR:= AFS implementation diff --git a/package/pam/Makefile b/package/pam/Makefile index bf322e71e..c9a15a4b5 100644 --- a/package/pam/Makefile +++ b/package/pam/Makefile @@ -24,6 +24,10 @@ XAKE_FLAGS+= GCC_HONOUR_COPTS=s CONFIGURE_ARGS+= --disable-nis \ --enable-db=no +post-install: + # /lib is not automatically installed to staging area + $(CP) $(WRKINST)/lib/libpam*.so* $(STAGING_TARGET_DIR)/usr/lib + pam-install: $(INSTALL_DIR) $(IDIR_PAM)/etc/security $(CP) $(WRKINST)/etc/security/* $(IDIR_PAM)/etc/security @@ -31,7 +35,5 @@ pam-install: $(CP) $(WRKINST)/lib/libpam*.so* $(IDIR_PAM)/lib $(CP) $(WRKINST)/lib/security/*.so* $(IDIR_PAM)/lib/security $(CP) ./files/pam.conf $(IDIR_PAM)/etc - # /lib is not automatically installed to staging area - $(CP) $(WRKINST)/lib/libpam*.so* $(STAGING_DIR)/usr/lib include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/rtmpdump/Makefile b/package/rtmpdump/Makefile new file mode 100644 index 000000000..c85f823fd --- /dev/null +++ b/package/rtmpdump/Makefile @@ -0,0 +1,40 @@ +# 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:= rtmpdump +PKG_VERSION:= 2.4 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 61509a2ae8987691f1fa28175461be96 +PKG_DESCR:= toolkit for RTMP streams +PKG_DEPENDS:= librtmp zlib libopenssl +PKG_BUILDDEP:= openssl zlib +PKG_SECTION:= multimedia +PKG_URL:= http://rtmpdump.mplayerhq.hu/ +PKG_SITES:= http://www.openadk.org/distfiles +PKG_LIBNAME:= librtmp +PKG_OPTS:= dev + +PKG_SUBPKGS:= RTMPDUMP LIBRTMP +PKGSD_LIBRTMP:= library for RTMP streams +PKGSC_LIBRTMP:= libs + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,RTMPDUMP,rtmpdump,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBRTMP,librtmp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBRTMP},${PKGSC_LIBRTMP})) + +CONFIG_STYLE:= manual + +rtmpdump-install: + $(INSTALL_DIR) $(IDIR_RTMPDUMP)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/rtmpdump \ + $(IDIR_RTMPDUMP)/usr/bin + +librtmp-install: + $(INSTALL_DIR) $(IDIR_LIBRTMP)/usr/lib + $(CP) $(WRKINST)/usr/lib/librtmp*so.* \ + $(IDIR_LIBRTMP)/usr/lib + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/rtmpdump/patches/patch-Makefile b/package/rtmpdump/patches/patch-Makefile new file mode 100644 index 000000000..64f950750 --- /dev/null +++ b/package/rtmpdump/patches/patch-Makefile @@ -0,0 +1,28 @@ +--- rtmpdump-2.4.orig/Makefile 2013-12-15 14:24:48.000000000 +0100 ++++ rtmpdump-2.4/Makefile 2013-12-15 15:18:27.000000000 +0100 +@@ -1,9 +1,9 @@ + VERSION=v2.4 + +-prefix=/usr/local ++prefix=/usr + +-CC=$(CROSS_COMPILE)gcc +-LD=$(CROSS_COMPILE)ld ++CC?=$(CROSS)gcc ++LD?=$(CROSS)ld + + SYS=posix + #SYS=mingw +@@ -21,8 +21,10 @@ CRYPTO_DEF=$(DEF_$(CRYPTO)) + + DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) + OPT=-O2 +-CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) +-LDFLAGS=-Wall $(XLDFLAGS) ++CFLAGS?= ++CFLAGS+=-Wall $(XCFLAGS) $(INC) $(DEF) ++LDFLAGS?= ++LDFLAGS+=-Wall $(XLDFLAGS) + + bindir=$(prefix)/bin + sbindir=$(prefix)/sbin diff --git a/package/rtmpdump/patches/patch-Makefile.orig b/package/rtmpdump/patches/patch-Makefile.orig new file mode 100644 index 000000000..9b10246bb --- /dev/null +++ b/package/rtmpdump/patches/patch-Makefile.orig @@ -0,0 +1,28 @@ +--- rtmpdump-2.4.orig/Makefile 2013-12-15 14:24:48.000000000 +0100 ++++ rtmpdump-2.4/Makefile 2013-12-15 15:17:36.000000000 +0100 +@@ -1,9 +1,9 @@ + VERSION=v2.4 + +-prefix=/usr/local ++prefix=/usr + +-CC=$(CROSS_COMPILE)gcc +-LD=$(CROSS_COMPILE)ld ++CC=$(CROSS)gcc ++LD=$(CROSS)ld + + SYS=posix + #SYS=mingw +@@ -21,8 +21,10 @@ CRYPTO_DEF=$(DEF_$(CRYPTO)) + + DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) + OPT=-O2 +-CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) +-LDFLAGS=-Wall $(XLDFLAGS) ++CFLAGS?= ++CFLAGS+=-Wall $(XCFLAGS) $(INC) $(DEF) ++LDFLAGS?= ++LDFLAGS+=-Wall $(XLDFLAGS) + + bindir=$(prefix)/bin + sbindir=$(prefix)/sbin diff --git a/package/rtmpdump/patches/patch-librtmp_Makefile b/package/rtmpdump/patches/patch-librtmp_Makefile new file mode 100644 index 000000000..8efd7ecb8 --- /dev/null +++ b/package/rtmpdump/patches/patch-librtmp_Makefile @@ -0,0 +1,36 @@ +--- rtmpdump-2.4.orig/librtmp/Makefile 2013-12-15 14:24:48.000000000 +0100 ++++ rtmpdump-2.4/librtmp/Makefile 2013-12-15 15:20:13.000000000 +0100 +@@ -1,6 +1,6 @@ + VERSION=v2.4 + +-prefix=/usr/local ++prefix=/usr + + incdir=$(prefix)/include/librtmp + bindir=$(prefix)/bin +@@ -11,9 +11,9 @@ INCDIR=$(DESTDIR)$(incdir) + LIBDIR=$(DESTDIR)$(libdir) + MANDIR=$(DESTDIR)$(mandir) + +-CC=$(CROSS_COMPILE)gcc +-LD=$(CROSS_COMPILE)ld +-AR=$(CROSS_COMPILE)ar ++CC?=$(CROSS_COMPILE)gcc ++LD?=$(CROSS_COMPILE)ld ++AR?=$(CROSS_COMPILE)ar + + SYS=posix + CRYPTO=OPENSSL +@@ -74,8 +74,10 @@ SO_INST=$(SOINST_$(SHARED)) + + DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) + OPT=-O2 +-CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF) +-LDFLAGS=$(XLDFLAGS) ++CFLAGS?= ++CFLAGS+=-Wall $(XCFLAGS) $(INC) $(DEF) $(SO_DEF) ++LDFLAGS?= ++LDFLAGS+=$(XLDFLAGS) + + + OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o diff --git a/package/samba/Makefile b/package/samba/Makefile index 7d04d4ee2..5c090d1b8 100644 --- a/package/samba/Makefile +++ b/package/samba/Makefile @@ -62,8 +62,6 @@ samba-install: ${IDIR_SAMBA}/usr/lib/samba/charset ${INSTALL_DATA} ./files/smb.conf ${IDIR_SAMBA}/etc/samba ${INSTALL_BIN} ${WRKINST}/usr/sbin/{nmbd,smbd} ${IDIR_SAMBA}/usr/sbin - ${CP} ${WRKINST}/usr/lib/samba/{libsmbclient,libsmbsharemodes,libnetapi}.so* \ - ${IDIR_SAMBA}/usr/lib/samba ${CP} ${WRKINST}/usr/lib/samba/vfs/*.so* ${IDIR_SAMBA}/usr/lib/samba/vfs ${INSTALL_DATA} ${WRKINST}/usr/lib/samba/*.dat ${IDIR_SAMBA}/usr/lib/samba @@ -79,6 +77,8 @@ samba-client-install: samba-lib-install: ${INSTALL_DIR} ${IDIR_SAMBA_LIB}/usr/lib/samba + ${CP} ${WRKINST}/usr/lib/samba/{libsmbclient,libsmbsharemodes,libnetapi}.so* \ + ${IDIR_SAMBA}/usr/lib/samba $(CP) ${WRKINST}/usr/lib/samba/{libtalloc,libtdb,libtevent}.* \ ${IDIR_SAMBA_LIB}/usr/lib/samba diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile index 7aa1d1930..3f5e2b06d 100644 --- a/package/sdl-image/Makefile +++ b/package/sdl-image/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 6c06584b31559e2b59f2b982d0d1f628 PKG_DESCR:= Simple DirectMedia Layer PKG_SECTION:= libs PKG_DEPENDS:= libpng libtiff libjpeg libsdl -PKG_BUILDDEP:= libpng libtiff jpeg sdl +PKG_BUILDDEP:= sdl-image-host libpng libtiff jpeg sdl PKG_URL:= http://www.libsdl.org/ PKG_SITES:= http://www.libsdl.org/projects/SDL_image/release/ PKG_NEED_CXX:= 1 @@ -20,10 +20,13 @@ PKG_OPTS:= dev DISTFILES:= SDL_image-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/SDL_image-${PKG_VERSION} +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto CONFIGURE_ARGS+= --enable-png \ --enable-jpg \ --enable-bmp \ @@ -33,4 +36,5 @@ libsdl-image-install: $(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE)/usr/lib $(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL_IMAGE)/usr/lib +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/sdl/Makefile b/package/sdl/Makefile index bb20aad1d..3a76249ae 100644 --- a/package/sdl/Makefile +++ b/package/sdl/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= e52086d1b508fa0b76c52ee30b55bec4 PKG_DESCR:= Simple DirectMedia Layer PKG_SECTION:= libs PKG_DEPENDS:= libusb alsa-lib libpthread libx11 libxext -PKG_BUILDDEP:= libusb alsa-lib libX11 libXext +PKG_BUILDDEP:= sdl-host libusb alsa-lib libX11 libXext PKG_URL:= http://www.libsdl.org/ PKG_SITES:= http://www.libsdl.org/release/ PKG_LIBNAME:= libsdl @@ -24,10 +24,14 @@ PKGFB_WITH_TSLIB:= tslib DISTFILES:= SDL-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/SDL-${PKG_VERSION} +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +HOST_STYLE:= auto + ifeq ($(ADK_PACKAGE_SDL_WITH_TSLIB),y) CONFIGURE_ARGS+= --enable-input-tslib endif @@ -45,4 +49,5 @@ libsdl-install: $(INSTALL_DIR) $(IDIR_LIBSDL)/usr/lib $(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL)/usr/lib +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/squid/Makefile b/package/squid/Makefile index 205bd49da..a10de02ac 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -4,15 +4,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= squid -PKG_VERSION:= 3.3.11 +PKG_VERSION:= 3.4.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 1db9aa98a70e501ae8280bc5cfa33140 +PKG_MD5SUM:= da9f30aeff856bc8348494da2730f94e PKG_DESCR:= squid web and cache proxy PKG_SECTION:= proxy PKG_DEPENDS:= libopenssl libpthread libstdcxx libltdl PKG_BUILDDEP:= openssl libtool PKG_URL:= http://www.squid-cache.org/ -PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.3/ +PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.4/ PKG_MULTI:= 1 PKG_NEED_CXX:= 1 diff --git a/package/swig/Makefile b/package/swig/Makefile new file mode 100644 index 000000000..6bc9f2b05 --- /dev/null +++ b/package/swig/Makefile @@ -0,0 +1,26 @@ +# 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:= swig +PKG_VERSION:= 2.0.11 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 291ba57c0acd218da0b0916c280dcbae +PKG_DESCR:= swig utility +PKG_SECTION:= lang +PKG_URL:= http://www.swig.org/ +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=swig/} + +PKG_ARCH_DEPENDS:= native + +include $(TOPDIR)/mk/host.mk +include $(TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,SWIG,swig,$(PKG_VERSION)-${PKG_RELEASE})) + +HOST_STYLE:= auto +HOST_ALL_TARGET:= swig + +include ${TOPDIR}/mk/host-bottom.mk +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/systemd/Makefile b/package/systemd/Makefile index 52c45504f..030515f28 100644 --- a/package/systemd/Makefile +++ b/package/systemd/Makefile @@ -5,12 +5,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= systemd PKG_VERSION:= 208 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= df64550d92afbffb4f67a434193ee165 PKG_DESCR:= System and Service Manager PKG_SECTION:= utils PKG_DEPENDS:= libblkid libcap -PKG_BUILDDEP:= usbutils glib kmod util-linux libcap +PKG_BUILDDEP:= autotool usbutils glib kmod util-linux libcap +PKG_BUILDDEP+= libgcrypt PKG_URL:= http://freedesktop.org/wiki/Software/systemd/ PKG_SITES:= http://www.freedesktop.org/software/systemd/ PKG_LIBNAME:= libudev @@ -33,12 +34,12 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,UDEV,udev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBUDEV,libudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +AUTOTOOL_STYLE:= autoreconf TARGET_LDFLAGS+= -lrt -CONFIGURE_ARGS+= --disable-logging \ - --disable-static \ +CONFIGURE_ARGS+= --disable-static \ --without-python \ - --with-pci-ids-path=/usr/share/pci.ids \ - --disable-introspection + --disable-manpages \ + --disable-polkit udev-install: ${INSTALL_DIR} ${IDIR_UDEV}/usr/bin ${IDIR_UDEV}/etc/udev diff --git a/package/systemd/patches/patch-Makefile_am b/package/systemd/patches/patch-Makefile_am new file mode 100644 index 000000000..c35e6d461 --- /dev/null +++ b/package/systemd/patches/patch-Makefile_am @@ -0,0 +1,20 @@ +--- systemd-208.orig/Makefile.am 2013-10-02 04:57:09.000000000 +0200 ++++ systemd-208/Makefile.am 2013-12-14 16:18:32.000000000 +0100 +@@ -23,7 +23,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + AM_MAKEFLAGS = --no-print-directory + AUTOMAKE_OPTIONS = color-tests parallel-tests + +-SUBDIRS = . po ++SUBDIRS = . + + # remove targets if the command fails + .DELETE_ON_ERROR: +@@ -537,8 +537,6 @@ dist_doc_DATA = \ + LICENSE.MIT \ + DISTRO_PORTING + +-@INTLTOOL_POLICY_RULE@ +- + # ------------------------------------------------------------------------------ + + MANPAGES = diff --git a/package/systemd/patches/patch-configure_ac b/package/systemd/patches/patch-configure_ac new file mode 100644 index 000000000..e3aeaa5c0 --- /dev/null +++ b/package/systemd/patches/patch-configure_ac @@ -0,0 +1,12 @@ +--- systemd-208.orig/configure.ac 2013-10-02 01:54:26.000000000 +0200 ++++ systemd-208/configure.ac 2013-12-13 16:37:55.000000000 +0100 +@@ -47,9 +47,6 @@ LT_INIT([disable-static]) + AS_IF([test "x$enable_static" = "xyes"], [AC_MSG_ERROR([--enable-static is not supported by systemd])]) + AS_IF([test "x$enable_largefile" = "xno"], [AC_MSG_ERROR([--disable-largefile is not supported by systemd])]) + +-# i18n stuff for the PolicyKit policy files +-IT_PROG_INTLTOOL([0.40.0]) +- + GETTEXT_PACKAGE=systemd + AC_SUBST(GETTEXT_PACKAGE) + diff --git a/package/systemd/patches/patch-src_libudev_libudev_pc_in b/package/systemd/patches/patch-src_libudev_libudev_pc_in new file mode 100644 index 000000000..7bc3ab6f3 --- /dev/null +++ b/package/systemd/patches/patch-src_libudev_libudev_pc_in @@ -0,0 +1,15 @@ +--- systemd-208.orig/src/libudev/libudev.pc.in 2013-08-13 22:02:46.000000000 +0200 ++++ systemd-208/src/libudev/libudev.pc.in 2013-12-14 17:20:31.000000000 +0100 +@@ -6,9 +6,9 @@ + # (at your option) any later version. + + prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@ ++exec_prefix=${prefix}/usr ++libdir=${prefix}/lib ++includedir=${prefix}/include + + Name: libudev + Description: Library to access udev device information diff --git a/package/taglib/Makefile b/package/taglib/Makefile index 493cf5abf..a71973676 100644 --- a/package/taglib/Makefile +++ b/package/taglib/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= dcb8bd1b756f2843e18b1fdf3aaeee15 PKG_DESCR:= Audio Meta-Data library PKG_SECTION:= libs PKG_DEPENDS:= zlib -PKG_BUILDDEP:= zlib +PKG_BUILDDEP:= cmake-host zlib PKG_URL:= http://taglib.github.com/ PKG_SITES:= http://openadk.org/distfiles/ PKG_OPTS:= dev @@ -22,7 +22,7 @@ $(eval $(call PKG_template,TAGLIB,taglib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP CONFIG_STYLE:= manual do-configure: - (cd ${WRKBUILD} && cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr .) + (cd ${WRKBUILD} && PATH='${TARGET_PATH}' cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr .) pre-install: $(INSTALL_DATA) ./files/taglib.pc $(WRKBUILD)/ diff --git a/package/util-macros/Makefile b/package/util-macros/Makefile index 83f2827e9..6ebfb6171 100644 --- a/package/util-macros/Makefile +++ b/package/util-macros/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= util-macros -PKG_VERSION:= 1.8.0 +PKG_VERSION:= 1.18.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= fe73a69d02bd0be6cdf7c773bfd72041 +PKG_MD5SUM:= fd0ba21b3179703c071bbb4c3e5fb0f4 PKG_DESCR:= xorg macros PKG_SECTION:= x11/misc PKG_BUILDDEP:= autotool util-macros-host diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile index e0b509178..aa971d872 100644 --- a/package/xbmc/Makefile +++ b/package/xbmc/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xbmc PKG_VERSION:= 12.2 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 489f3877decae4e265ece54f9eaef0ba PKG_DESCR:= software media player PKG_SECTION:= multimedia @@ -17,13 +17,15 @@ PKG_DEPENDS+= yajl tinyxml libsqlite libpcrecpp libpng PKG_DEPENDS+= libpcre libcdio libfreetype libsamplerate PKG_DEPENDS+= taglib libjasper libmp3lame libmicrohttpd PKG_DEPENDS+= omxplayer libusb-compat libbluray libgpg-error +PKG_DEPENDS+= libssh libcec libnfs librtmp PKG_BUILDDEP:= autotool boost ffmpeg python2 MesaLib libglew libass PKG_BUILDDEP+= libmpeg2 libmad jpeg libogg libvorbis libmodplug PKG_BUILDDEP+= curl flac openssl bzip2 libtiff liblzo yajl PKG_BUILDDEP+= tinyxml sqlite pcre libpng libcdio freetype PKG_BUILDDEP+= libsamplerate taglib libjasper lame libmicrohttpd PKG_BUILDDEP+= bcm2835-vc libgpg-error dbus libusb-compat libbluray -PKG_BUILDDEP+= libgpg-error +PKG_BUILDDEP+= libssh libcec libnfs samba rtmpdump +PKG_BUILDDEP+= swig-host sdl-host sdl-image-host liblzo-host PKG_URL:= http://xbmc.org/ PKG_SITES:= http://mirrors.xbmc.org/releases/source/ @@ -41,19 +43,25 @@ TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/boost-1_54 \ -I$(STAGING_DIR)/opt/vc/include \ -I$(STAGING_DIR)/opt/vc/include/interface/vcos/pthreads \ -I$(STAGING_DIR)/opt/vc/include/interface/vmcs_host/linux -TARGET_LDFLAGS+= -L$(STAGING_DIR)/opt/vc/lib -lkhrn_static +TARGET_LDFLAGS+= -L$(STAGING_DIR)/opt/vc/lib -lkhrn_static \ + -L$(STAGING_DIR)/usr/lib/samba AUTOTOOL_STYLE:= autoreconf +CONFIGURE_ENV+= DESTDIR='${WRKINST}' \ + TEXTUREPACKER_NATIVE_ROOT='$(STAGING_HOST_DIR)/usr' CONFIGURE_ARGS+= --disable-optical-drive \ - --disable-ssh \ - --disable-samba \ --disable-mysql \ + --enable-samba \ + --enable-ssh \ + --enable-nfs \ --enable-libusb \ --enable-libbluray \ --enable-external-libraries \ --enable-player=omxplayer \ --enable-gles \ + --enable-rtmp \ --disable-sdl \ --disable-joystick \ + --disable-dvdcss \ --disable-x11 \ --with-platform=raspberry-pi diff --git a/package/xbmc/patches/patch-lib_libdvd_libdvdread_Makefile b/package/xbmc/patches/patch-lib_libdvd_libdvdread_Makefile new file mode 100644 index 000000000..799e54eeb --- /dev/null +++ b/package/xbmc/patches/patch-lib_libdvd_libdvdread_Makefile @@ -0,0 +1,13 @@ +--- xbmc-12.2.orig/lib/libdvd/libdvdread/Makefile 2013-05-03 07:57:40.000000000 +0200 ++++ xbmc-12.2/lib/libdvd/libdvdread/Makefile 2013-12-15 12:24:12.000000000 +0100 +@@ -131,8 +131,8 @@ distclean: clean + dvdread-config: $(.OBJDIR)/dvdread-config + $(.OBJDIR)/dvdread-config: $(BUILDDEPS) + @echo '#!/bin/sh' > $(.OBJDIR)/dvdread-config +- @echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdread-config +- @echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdread-config ++ @echo 'prefix='$(DESTDIR)$(PREFIX) >> $(.OBJDIR)/dvdread-config ++ @echo 'libdir='$(DESTDIR)$(shlibdir) >> $(.OBJDIR)/dvdread-config + @echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdread-config + @echo >> $(.OBJDIR)/dvdread-config + cat $(SRC_PATH_BARE)/misc/dvdread-config.sh >> $(.OBJDIR)/dvdread-config diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 5d4a80abc..4c201560a 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -105,11 +105,6 @@ if [[ -n $ADK_PACKAGE_EGLIBC ]]; then NEED_GPERF="$NEED_GPERF eglibc" fi -if [[ -n $ADK_PACKAGE_XBMC ]]; then - NEED_SDLDEV="$NEED_SDLDEV xbmc" - NEED_SDLIMAGEDEV="$NEED_SDLIMAGEDEV xbmc" -fi - if [[ -n $ADK_PACKAGE_FONT_BITSTREAM_100DPI ]]; then NEED_MKFONTDIR="$NEED_MKFONTDIR font-bitstream-100dpi" fi diff --git a/target/config/Config.in b/target/config/Config.in index f551e21a0..99b056546 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -20,7 +20,7 @@ config ADK_TARGET_KERNEL string default "zImage" if ADK_TARGET_KERNEL_ZIMAGE default "Image" if ADK_TARGET_KERNEL_IMAGE - default "simpleImage.system" if ADK_TARGET_KERNEL_LINUXBIN + default "linux.bin" if ADK_TARGET_KERNEL_LINUXBIN default "vmlinuz" if ADK_TARGET_KERNEL_VMLINUZ default "bzImage" if ADK_TARGET_KERNEL_BZIMAGE default "vmlinux" @@ -748,6 +748,17 @@ config ADK_TARGET_ROOTFS_MMC Use this option if you have a MMC/SDCARD based system. (ext2 filesystem is used.) +config ADK_TARGET_ROOTFS_ISO + bool "ISO image" + select ADK_KERNEL_ISO9660_FS + select ADK_KERNEL_JOLIET + select ADK_KERNEL_SCSI + select ADK_KERNEL_BLK_DEV_SR + depends on ADK_HOST_LINUX + depends on ADK_LINUX_X86 + help + Use this option to create a bootable ISO image. + config ADK_TARGET_ROOTFS_ARCHIVE bool "Archive usable for different filesystems" select ADK_KERNEL_EXT2_FS if ADK_HARDWARE_QEMU diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index bbd9ce745..fb5bf080f 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -28,6 +28,9 @@ config ADK_KERNEL_SCSI config ADK_KERNEL_BLK_DEV_SD boolean +config ADK_KERNEL_BLK_DEV_SR + boolean + config ADK_KERNEL_ISCSI_TCP boolean @@ -324,6 +327,7 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_SD config ADK_KPACKAGE_KMOD_BLK_DEV_SR prompt "kmod-scsi-cdrom................... SCSI CDROM support" depends on !ADK_KERNEL_SCSI + depends on !ADK_KERNEL_BLK_DEV_SR depends on ADK_KPACKAGE_KMOD_SCSI tristate help diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index ab048805e..9bdc6b9e5 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -227,7 +227,11 @@ config ADK_KPACKAGE_KMOD_FUSE_FS fuse-utils. config ADK_KERNEL_JOLIET - bool + boolean + default n + +config ADK_KERNEL_ISO9660_FS + boolean default n config ADK_KPACKAGE_KMOD_ISO9660_FS diff --git a/target/linux/patches/3.11.10/microblaze-dts.patch b/target/linux/patches/3.11.10/microblaze-dts.patch deleted file mode 100644 index e73959a73..000000000 --- a/target/linux/patches/3.11.10/microblaze-dts.patch +++ /dev/null @@ -1,475 +0,0 @@ -diff -Nur linux-3.11.10.orig/arch/microblaze/platform/generic/system.dts linux-3.11.10/arch/microblaze/platform/generic/system.dts ---- linux-3.11.10.orig/arch/microblaze/platform/generic/system.dts 2013-11-29 19:42:37.000000000 +0100 -+++ linux-3.11.10/arch/microblaze/platform/generic/system.dts 2013-12-08 13:01:59.000000000 +0100 -@@ -1,102 +1,72 @@ --/* -- * Device Tree Generator version: 1.1 -- * -- * (C) Copyright 2007-2008 Xilinx, Inc. -- * (C) Copyright 2007-2009 Michal Simek -- * -- * Michal SIMEK <monstr@monstr.eu> -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU General Public License as -- * published by the Free Software Foundation; either version 2 of -- * the License, or (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -- * MA 02111-1307 USA -- * -- * CAUTION: This file is automatically generated by libgen. -- * Version: Xilinx EDK 10.1.03 EDK_K_SP3.6 -- * -- * XPS project directory: Xilinx-ML505-ll_temac-sgdma-MMU-FDT-edk101 -- */ -- - /dts-v1/; -+ - / { -- #address-cells = <1>; -- #size-cells = <1>; -+ #address-cells = <0x1>; -+ #size-cells = <0x1>; - compatible = "xlnx,microblaze"; -- hard-reset-gpios = <&LEDs_8Bit 2 1>; - model = "testing"; -- DDR2_SDRAM: memory@90000000 { -+ -+ memory@90000000 { - device_type = "memory"; -- reg = < 0x90000000 0x10000000 >; -- } ; -- aliases { -- ethernet0 = &Hard_Ethernet_MAC; -- serial0 = &RS232_Uart_1; -- } ; -+ reg = <0x90000000 0x8000000>; -+ }; -+ - chosen { -- bootargs = "console=ttyUL0,115200 highres=on"; -+ bootargs = "console=ttyUL0,115200"; - linux,stdout-path = "/plb@0/serial@84000000"; -- } ; -+ }; -+ - cpus { -- #address-cells = <1>; -+ #address-cells = <0x1>; - #cpus = <0x1>; -- #size-cells = <0>; -- microblaze_0: cpu@0 { -- clock-frequency = <125000000>; -+ #size-cells = <0x0>; -+ -+ cpu@0 { -+ clock-frequency = <0x3b9aca0>; - compatible = "xlnx,microblaze-7.10.d"; - d-cache-baseaddr = <0x90000000>; -- d-cache-highaddr = <0x9fffffff>; -+ d-cache-highaddr = <0x97ffffff>; - d-cache-line-size = <0x10>; -- d-cache-size = <0x2000>; -+ d-cache-size = <0x800>; - device_type = "cpu"; - i-cache-baseaddr = <0x90000000>; -- i-cache-highaddr = <0x9fffffff>; -+ i-cache-highaddr = <0x97ffffff>; - i-cache-line-size = <0x10>; -- i-cache-size = <0x2000>; -+ i-cache-size = <0x800>; - model = "microblaze,7.10.d"; -- reg = <0>; -- timebase-frequency = <125000000>; -- xlnx,addr-tag-bits = <0xf>; -+ reg = <0x0>; -+ timebase-frequency = <0x3b9aca0>; -+ xlnx,addr-tag-bits = <0x10>; - xlnx,allow-dcache-wr = <0x1>; - xlnx,allow-icache-wr = <0x1>; - xlnx,area-optimized = <0x0>; -- xlnx,cache-byte-size = <0x2000>; -+ xlnx,cache-byte-size = <0x800>; - xlnx,d-lmb = <0x1>; - xlnx,d-opb = <0x0>; - xlnx,d-plb = <0x1>; - xlnx,data-size = <0x20>; -- xlnx,dcache-addr-tag = <0xf>; -- xlnx,dcache-always-used = <0x1>; -- xlnx,dcache-byte-size = <0x2000>; -+ xlnx,dcache-addr-tag = <0x10>; -+ xlnx,dcache-always-used = <0x0>; -+ xlnx,dcache-byte-size = <0x800>; - xlnx,dcache-line-len = <0x4>; - xlnx,dcache-use-fsl = <0x1>; - xlnx,debug-enabled = <0x1>; -- xlnx,div-zero-exception = <0x1>; -+ xlnx,div-zero-exception = <0x0>; - xlnx,dopb-bus-exception = <0x0>; - xlnx,dynamic-bus-sizing = <0x1>; - xlnx,edge-is-positive = <0x1>; -- xlnx,family = "virtex5"; -- xlnx,endianness = <0x1>; -- xlnx,fpu-exception = <0x1>; -+ xlnx,family = "spartan3adsp"; -+ xlnx,fpu-exception = <0x0>; - xlnx,fsl-data-size = <0x20>; - xlnx,fsl-exception = <0x0>; - xlnx,fsl-links = <0x0>; - xlnx,i-lmb = <0x1>; - xlnx,i-opb = <0x0>; - xlnx,i-plb = <0x1>; -- xlnx,icache-always-used = <0x1>; -+ xlnx,icache-always-used = <0x0>; - xlnx,icache-line-len = <0x4>; - xlnx,icache-use-fsl = <0x1>; -- xlnx,ill-opcode-exception = <0x1>; -+ xlnx,ill-opcode-exception = <0x0>; - xlnx,instance = "microblaze_0"; - xlnx,interconnect = <0x1>; - xlnx,interrupt-is-edge = <0x0>; -@@ -105,11 +75,11 @@ - xlnx,mmu-itlb-size = <0x2>; - xlnx,mmu-tlb-access = <0x3>; - xlnx,mmu-zones = <0x10>; -- xlnx,number-of-pc-brk = <0x1>; -- xlnx,number-of-rd-addr-brk = <0x0>; -- xlnx,number-of-wr-addr-brk = <0x0>; -- xlnx,opcode-0x0-illegal = <0x1>; -- xlnx,pvr = <0x2>; -+ xlnx,number-of-pc-brk = <0x3>; -+ xlnx,number-of-rd-addr-brk = <0x2>; -+ xlnx,number-of-wr-addr-brk = <0x2>; -+ xlnx,opcode-0x0-illegal = <0x0>; -+ xlnx,pvr = <0x1>; - xlnx,pvr-user1 = <0x0>; - xlnx,pvr-user2 = <0x0>; - xlnx,reset-msr = <0x0>; -@@ -117,29 +87,44 @@ - xlnx,unaligned-exceptions = <0x1>; - xlnx,use-barrel = <0x1>; - xlnx,use-dcache = <0x1>; -- xlnx,use-div = <0x1>; -+ xlnx,use-div = <0x0>; - xlnx,use-ext-brk = <0x1>; - xlnx,use-ext-nm-brk = <0x1>; - xlnx,use-extended-fsl-instr = <0x0>; -- xlnx,use-fpu = <0x2>; -- xlnx,use-hw-mul = <0x2>; -+ xlnx,use-fpu = <0x0>; -+ xlnx,use-hw-mul = <0x1>; - xlnx,use-icache = <0x1>; - xlnx,use-interrupt = <0x1>; - xlnx,use-mmu = <0x3>; - xlnx,use-msr-instr = <0x1>; - xlnx,use-pcmp-instr = <0x1>; -- } ; -- } ; -- mb_plb: plb@0 { -- #address-cells = <1>; -- #size-cells = <1>; -- compatible = "xlnx,plb-v46-1.03.a", "xlnx,plb-v46-1.00.a", "simple-bus"; -- ranges ; -- FLASH: flash@a0000000 { -- bank-width = <2>; -+ }; -+ }; -+ -+ plb@0 { -+ #address-cells = <0x1>; -+ #size-cells = <0x1>; -+ compatible = "xlnx,plb-v46-1.03.a", "simple-bus"; -+ ranges; -+ -+ ethernet@81000000 { -+ compatible = "xlnx,xps-ethernetlite-2.00.b"; -+ device_type = "network"; -+ interrupt-parent = <0x1>; -+ interrupts = <0x1 0x0>; -+ local-mac-address = [02 00 00 00 00 00]; -+ reg = <0x81000000 0x10000>; -+ xlnx,duplex = <0x1>; -+ xlnx,family = "spartan3adsp"; -+ xlnx,rx-ping-pong = <0x0>; -+ xlnx,tx-ping-pong = <0x0>; -+ }; -+ -+ flash@a0000000 { -+ bank-width = <0x1>; - compatible = "xlnx,xps-mch-emc-2.00.a", "cfi-flash"; -- reg = < 0xa0000000 0x2000000 >; -- xlnx,family = "virtex5"; -+ reg = <0xa0000000 0x1000000>; -+ xlnx,family = "spartan3adsp"; - xlnx,include-datawidth-matching-0 = <0x1>; - xlnx,include-datawidth-matching-1 = <0x0>; - xlnx,include-datawidth-matching-2 = <0x0>; -@@ -147,9 +132,9 @@ - xlnx,include-negedge-ioregs = <0x0>; - xlnx,include-plb-ipif = <0x1>; - xlnx,include-wrbuf = <0x1>; -- xlnx,max-mem-width = <0x10>; -+ xlnx,max-mem-width = <0x8>; - xlnx,mch-native-dwidth = <0x20>; -- xlnx,mch-plb-clk-period-ps = <0x1f40>; -+ xlnx,mch-plb-clk-period-ps = <0x3e80>; - xlnx,mch-splb-awidth = <0x20>; - xlnx,mch0-accessbuf-depth = <0x10>; - xlnx,mch0-protocol = <0x0>; -@@ -163,7 +148,7 @@ - xlnx,mch3-accessbuf-depth = <0x10>; - xlnx,mch3-protocol = <0x0>; - xlnx,mch3-rddatabuf-depth = <0x10>; -- xlnx,mem0-width = <0x10>; -+ xlnx,mem0-width = <0x8>; - xlnx,mem1-width = <0x20>; - xlnx,mem2-width = <0x20>; - xlnx,mem3-width = <0x20>; -@@ -178,31 +163,31 @@ - xlnx,synch-pipedelay-1 = <0x2>; - xlnx,synch-pipedelay-2 = <0x2>; - xlnx,synch-pipedelay-3 = <0x2>; -- xlnx,tavdv-ps-mem-0 = <0x1adb0>; -+ xlnx,tavdv-ps-mem-0 = <0x11170>; - xlnx,tavdv-ps-mem-1 = <0x3a98>; - xlnx,tavdv-ps-mem-2 = <0x3a98>; - xlnx,tavdv-ps-mem-3 = <0x3a98>; -- xlnx,tcedv-ps-mem-0 = <0x1adb0>; -+ xlnx,tcedv-ps-mem-0 = <0x11170>; - xlnx,tcedv-ps-mem-1 = <0x3a98>; - xlnx,tcedv-ps-mem-2 = <0x3a98>; - xlnx,tcedv-ps-mem-3 = <0x3a98>; -- xlnx,thzce-ps-mem-0 = <0x88b8>; -+ xlnx,thzce-ps-mem-0 = <0x61a8>; - xlnx,thzce-ps-mem-1 = <0x1b58>; - xlnx,thzce-ps-mem-2 = <0x1b58>; - xlnx,thzce-ps-mem-3 = <0x1b58>; -- xlnx,thzoe-ps-mem-0 = <0x1b58>; -+ xlnx,thzoe-ps-mem-0 = <0x61a8>; - xlnx,thzoe-ps-mem-1 = <0x1b58>; - xlnx,thzoe-ps-mem-2 = <0x1b58>; - xlnx,thzoe-ps-mem-3 = <0x1b58>; -- xlnx,tlzwe-ps-mem-0 = <0x88b8>; -+ xlnx,tlzwe-ps-mem-0 = <0x1388>; - xlnx,tlzwe-ps-mem-1 = <0x0>; - xlnx,tlzwe-ps-mem-2 = <0x0>; - xlnx,tlzwe-ps-mem-3 = <0x0>; -- xlnx,twc-ps-mem-0 = <0x2af8>; -+ xlnx,twc-ps-mem-0 = <0x11170>; - xlnx,twc-ps-mem-1 = <0x3a98>; - xlnx,twc-ps-mem-2 = <0x3a98>; - xlnx,twc-ps-mem-3 = <0x3a98>; -- xlnx,twp-ps-mem-0 = <0x11170>; -+ xlnx,twp-ps-mem-0 = <0xafc8>; - xlnx,twp-ps-mem-1 = <0x2ee0>; - xlnx,twp-ps-mem-2 = <0x2ee0>; - xlnx,twp-ps-mem-3 = <0x2ee0>; -@@ -214,154 +199,83 @@ - xlnx,xcl2-writexfer = <0x1>; - xlnx,xcl3-linesize = <0x4>; - xlnx,xcl3-writexfer = <0x1>; -- } ; -- Hard_Ethernet_MAC: xps-ll-temac@81c00000 { -- #address-cells = <1>; -- #size-cells = <1>; -- compatible = "xlnx,compound"; -- ranges ; -- ethernet@81c00000 { -- compatible = "xlnx,xps-ll-temac-1.01.b", "xlnx,xps-ll-temac-1.00.a"; -- device_type = "network"; -- interrupt-parent = <&xps_intc_0>; -- interrupts = < 5 2 >; -- llink-connected = <&PIM3>; -- local-mac-address = [ 00 0a 35 00 00 00 ]; -- reg = < 0x81c00000 0x40 >; -- xlnx,bus2core-clk-ratio = <0x1>; -- xlnx,phy-type = <0x1>; -- xlnx,phyaddr = <0x1>; -- xlnx,rxcsum = <0x0>; -- xlnx,rxfifo = <0x1000>; -- xlnx,temac-type = <0x0>; -- xlnx,txcsum = <0x0>; -- xlnx,txfifo = <0x1000>; -- } ; -- } ; -- IIC_EEPROM: i2c@81600000 { -- compatible = "xlnx,xps-iic-2.00.a"; -- interrupt-parent = <&xps_intc_0>; -- interrupts = < 6 2 >; -- reg = < 0x81600000 0x10000 >; -- xlnx,clk-freq = <0x7735940>; -- xlnx,family = "virtex5"; -- xlnx,gpo-width = <0x1>; -- xlnx,iic-freq = <0x186a0>; -- xlnx,scl-inertial-delay = <0x0>; -- xlnx,sda-inertial-delay = <0x0>; -- xlnx,ten-bit-adr = <0x0>; -- } ; -- LEDs_8Bit: gpio@81400000 { -+ }; -+ -+ gpio@81400000 { - compatible = "xlnx,xps-gpio-1.00.a"; -- interrupt-parent = <&xps_intc_0>; -- interrupts = < 7 2 >; -- reg = < 0x81400000 0x10000 >; -+ interrupt-parent = <0x1>; -+ interrupts = <0x2 0x2>; -+ reg = <0x81400000 0x10000>; - xlnx,all-inputs = <0x0>; - xlnx,all-inputs-2 = <0x0>; - xlnx,dout-default = <0x0>; - xlnx,dout-default-2 = <0x0>; -- xlnx,family = "virtex5"; -+ xlnx,family = "spartan3adsp"; - xlnx,gpio-width = <0x8>; - xlnx,interrupt-present = <0x1>; -- xlnx,is-bidir = <0x1>; -+ xlnx,is-bidir = <0x0>; - xlnx,is-bidir-2 = <0x1>; - xlnx,is-dual = <0x0>; - xlnx,tri-default = <0xffffffff>; - xlnx,tri-default-2 = <0xffffffff>; -- #gpio-cells = <2>; -- gpio-controller; -- } ; -- -- gpio-leds { -- compatible = "gpio-leds"; -- -- heartbeat { -- label = "Heartbeat"; -- gpios = <&LEDs_8Bit 4 1>; -- linux,default-trigger = "heartbeat"; -- }; -- -- yellow { -- label = "Yellow"; -- gpios = <&LEDs_8Bit 5 1>; -- }; -- -- red { -- label = "Red"; -- gpios = <&LEDs_8Bit 6 1>; -- }; -- -- green { -- label = "Green"; -- gpios = <&LEDs_8Bit 7 1>; -- }; -- } ; -- RS232_Uart_1: serial@84000000 { -- clock-frequency = <125000000>; -+ }; -+ -+ serial@84000000 { -+ clock-frequency = <0x3b9aca0>; - compatible = "xlnx,xps-uartlite-1.00.a"; -- current-speed = <115200>; -+ current-speed = <0x1c200>; - device_type = "serial"; -- interrupt-parent = <&xps_intc_0>; -- interrupts = < 8 0 >; -- port-number = <0>; -- reg = < 0x84000000 0x10000 >; -+ interrupt-parent = <0x1>; -+ interrupts = <0x3 0x0>; -+ port-number = <0x0>; -+ reg = <0x84000000 0x10000>; - xlnx,baudrate = <0x1c200>; - xlnx,data-bits = <0x8>; -- xlnx,family = "virtex5"; -+ xlnx,family = "spartan3adsp"; - xlnx,odd-parity = <0x0>; - xlnx,use-parity = <0x0>; -- } ; -- SysACE_CompactFlash: sysace@83600000 { -- compatible = "xlnx,xps-sysace-1.00.a"; -- interrupt-parent = <&xps_intc_0>; -- interrupts = < 4 2 >; -- reg = < 0x83600000 0x10000 >; -- xlnx,family = "virtex5"; -- xlnx,mem-width = <0x10>; -- } ; -- debug_module: debug@84400000 { -+ }; -+ -+ debug@84400000 { - compatible = "xlnx,mdm-1.00.d"; -- reg = < 0x84400000 0x10000 >; -- xlnx,family = "virtex5"; -+ reg = <0x84400000 0x10000>; -+ xlnx,family = "spartan3adsp"; - xlnx,interconnect = <0x1>; - xlnx,jtag-chain = <0x2>; - xlnx,mb-dbg-ports = <0x1>; - xlnx,uart-width = <0x8>; - xlnx,use-uart = <0x1>; - xlnx,write-fsl-ports = <0x0>; -- } ; -+ }; -+ - mpmc@90000000 { -- #address-cells = <1>; -- #size-cells = <1>; -- compatible = "xlnx,mpmc-4.02.a"; -- ranges ; -- PIM3: sdma@84600180 { -- compatible = "xlnx,ll-dma-1.00.a"; -- interrupt-parent = <&xps_intc_0>; -- interrupts = < 2 2 1 2 >; -- reg = < 0x84600180 0x80 >; -- } ; -- } ; -- xps_intc_0: interrupt-controller@81800000 { -+ #address-cells = <0x1>; -+ #size-cells = <0x1>; -+ compatible = "xlnx,mpmc-4.03.a"; -+ }; -+ -+ interrupt-controller@81800000 { - #interrupt-cells = <0x2>; - compatible = "xlnx,xps-intc-1.00.a"; -- interrupt-controller ; -- reg = < 0x81800000 0x10000 >; -- xlnx,kind-of-intr = <0x100>; -- xlnx,num-intr-inputs = <0x9>; -- } ; -- xps_timer_1: timer@83c00000 { -+ interrupt-controller; -+ reg = <0x81800000 0x10000>; -+ xlnx,kind-of-intr = <0xa>; -+ xlnx,num-intr-inputs = <0x4>; -+ linux,phandle = <0x1>; -+ }; -+ -+ timer@83c00000 { - compatible = "xlnx,xps-timer-1.00.a"; -- interrupt-parent = <&xps_intc_0>; -- interrupts = < 3 2 >; -- reg = < 0x83c00000 0x10000 >; -+ interrupt-parent = <0x1>; -+ interrupts = <0x0 0x2>; -+ reg = <0x83c00000 0x10000>; - xlnx,count-width = <0x20>; -- xlnx,family = "virtex5"; -+ xlnx,family = "spartan3adsp"; - xlnx,gen0-assert = <0x1>; - xlnx,gen1-assert = <0x1>; - xlnx,one-timer-only = <0x0>; - xlnx,trig0-assert = <0x1>; - xlnx,trig1-assert = <0x1>; -- } ; -- } ; --} ; -+ }; -+ }; -+}; diff --git a/target/x86/Makefile b/target/x86/Makefile index a3dc8ae70..b228810c7 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -66,3 +66,7 @@ ifeq ($(ADK_HARDWARE_QEMU),y) @echo 'qemu-system-i386 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL)' endif endif +ifeq (${ADK_TARGET_FS},iso) +imageinstall: ${BIN_DIR}/${ROOTFSISO} + @echo 'ISO image is at $<' +endif diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile index 2cce6bebc..f647939b5 100644 --- a/toolchain/musl/Makefile +++ b/toolchain/musl/Makefile @@ -12,6 +12,9 @@ endif ifeq ($(CPU_ARCH),mips64el) REAL_GNU_TARGET_NAME:= $(subst mips64el,mips,$(REAL_GNU_TARGET_NAME)) endif +ifeq ($(CPU_ARCH),microblazeel) +REAL_GNU_TARGET_NAME:= $(subst microblazeel,microblaze,$(REAL_GNU_TARGET_NAME)) +endif $(WRKBUILD)/.headers: (cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \ diff --git a/tools/Makefile b/tools/Makefile index ee096db61..4a5f1ec92 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -4,6 +4,9 @@ include $(TOPDIR)/rules.mk TARGETS:=adk mkcrypt cpio mkimage genext2fs +ifeq ($(ADK_TARGET_ROOTFS_ISO),y) +TARGETS+=cdrtools syslinux +endif TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS)) TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS)) diff --git a/tools/cdrtools/Makefile b/tools/cdrtools/Makefile new file mode 100644 index 000000000..965e3553d --- /dev/null +++ b/tools/cdrtools/Makefile @@ -0,0 +1,25 @@ +# 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:= cdrtools +PKG_VERSION:= 3.00 +PKG_RELEASE:= 1 +PKG_MD5SUM:= bb21cefefcfbb76cf249120e8978ffdd +PKG_SITES:= ftp://ftp.berlios.de/pub/cdrecord/ + +include ../rules.mk + +install: ${TOOLS_DIR}/mkisofs + +$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared + #(cd ${WRKBUILD}; ./configure) + ${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}' + touch $@ + +${TOOLS_DIR}/mkisofs: $(WRKBUILD)/.compiled + $(INSTALL_BIN) $(WRKBUILD)/mkisofs/OBJ/*/mkisofs \ + ${TOOLS_DIR} + +include $(TOPDIR)/mk/tools.mk diff --git a/tools/syslinux/Makefile b/tools/syslinux/Makefile new file mode 100644 index 000000000..1ac6ef672 --- /dev/null +++ b/tools/syslinux/Makefile @@ -0,0 +1,38 @@ +# 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:= syslinux +PKG_VERSION:= 6.02 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 086ac1c569d226a5e2ae3d605de09a1d +PKG_SITES:= http://www.kernel.org/pub/linux/utils/boot/syslinux/ + +include ../rules.mk +WRKINST:= ${WRKBUILD}/openadk_installroot + +install: ${TOOLS_DIR}/extlinux ${STAGING_HOST_DIR}/usr/share/syslinux/.installed + +$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared + #(cd ${WRKBUILD}; ./configure) + ${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}' bios installer + touch $@ + +$(WRKBUILD)/.installed: ${WRKBUILD}/.compiled + mkdir -p ${WRKINST} + ${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}' \ + INSTALLROOT='${WRKINST}' \ + bios install + touch $@ + +${TOOLS_DIR}/extlinux: $(WRKBUILD)/.installed + $(INSTALL_BIN) ${WRKINST}/sbin/extlinux \ + ${TOOLS_DIR} + +${STAGING_HOST_DIR}/usr/share/syslinux/.installed: ${WRKBUILD}/.installed + mkdir -p ${STAGING_HOST_DIR}/usr/share + ${CP} ${WRKINST}/usr/share/syslinux ${STAGING_HOST_DIR}/usr/share + touch ${STAGING_HOST_DIR}/usr/share/syslinux/.installed + +include $(TOPDIR)/mk/tools.mk |