diff options
33 files changed, 193 insertions, 42 deletions
@@ -1,14 +1,11 @@ -- tzdata split + update +- check gold for mozilla compile - getty + serial rework - add daemon() function to functions.sh - add printing of OK/FAIL (optional verbose bootup) - fixup rework libgcc --export-symbols - libgcc static? -- remove 32 bit kernel for 64 bit targets - static toolchain support - toolchain in /usr , check gcj -- rework startup, maybe use init.c, start gettys after bootup ready -- more output for initscripts on bootup - try Preset Loops per Jiffy for faster bootup via lpj= - port uuterm - hash-style=gnu for non-mips and non-musl diff --git a/mk/image.mk b/mk/image.mk index bbe9d47ac..ff95c5cb0 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -224,8 +224,8 @@ ifeq ($(ADK_KERNEL_COMP_BZIP2),y) echo "CONFIG_INITRAMFS_COMPRESSION_BZIP2=y" >> ${LINUX_DIR}/.config endif @-rm $(LINUX_DIR)/usr/initramfs_data.cpio* 2>/dev/null - $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \ - ARCH=$(ARCH) CC="$(TARGET_CC)" -j${ADK_MAKE_JOBS} $(ADK_TARGET_KERNEL) $(MAKE_TRACE) + env $(KERNEL_MAKE_ENV) $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKE_OPTS) \ + -j${ADK_MAKE_JOBS} $(ADK_TARGET_KERNEL) $(MAKE_TRACE) ${FW_DIR}/${ROOTFSISO}: ${TARGET_DIR} kernel-package mkdir -p ${TARGET_DIR}/boot/syslinux diff --git a/package/cryptodev-linux/Makefile b/package/cryptodev-linux/Makefile index ecb827b09..64b27a8da 100644 --- a/package/cryptodev-linux/Makefile +++ b/package/cryptodev-linux/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= cryptodev-linux PKG_VERSION:= 1.6 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= eade38998313c25fd7934719cdf8a2ea PKG_DESCR:= cryptodev-linux kernel module PKG_SECTION:= crypto @@ -26,7 +26,7 @@ INSTALL_STYLE:= manual do-build: ${MAKE} -C "${WRKBUILD}"/tests check ${MAKE} -C "${WRKBUILD}" version.h - GCC_HONOUR_COPTS=0 LDFLAGS="" ${MAKE} ${KERNEL_MAKE_OPTS} \ + GCC_HONOUR_COPTS=0 LDFLAGS="" ${MAKE} -C ${LINUX_DIR} ${KERNEL_MAKE_OPTS} \ M="${WRKBUILD}" modules ${INSTALL_DIR} ${WRKINST}/usr/include/crypto ${INSTALL_DATA} ${WRKBUILD}/crypto/cryptodev.h \ diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile index 157d9db03..4cd6a9697 100644 --- a/package/kexec-tools/Makefile +++ b/package/kexec-tools/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= kexec-tools PKG_VERSION:= 2.0.5 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= da5887e30eec16895e9d98ef072dc257 PKG_DESCR:= kexec tools PKG_SECTION:= misc diff --git a/package/kexec-tools/patches/patch-kexec_kexec_c b/package/kexec-tools/patches/patch-kexec_kexec_c index 68dc2bee9..8ce2ac370 100644 --- a/package/kexec-tools/patches/patch-kexec_kexec_c +++ b/package/kexec-tools/patches/patch-kexec_kexec_c @@ -1,6 +1,6 @@ ---- kexec-tools-2.0.2.orig/kexec/kexec.c 2010-07-29 06:19:59.000000000 +0200 -+++ kexec-tools-2.0.2/kexec/kexec.c 2011-09-05 18:50:27.679232756 +0200 -@@ -796,17 +796,14 @@ int k_unload (unsigned long kexec_flags) +--- kexec-tools-2.0.5.orig/kexec/kexec.c 2013-12-13 01:52:47.000000000 +0100 ++++ kexec-tools-2.0.5/kexec/kexec.c 2014-03-18 14:46:58.000000000 +0100 +@@ -807,17 +807,14 @@ static int k_unload (unsigned long kexec static int my_shutdown(void) { char *args[] = { diff --git a/package/pcrepp/Makefile b/package/pcrepp/Makefile index e96d04e38..5d662f20f 100644 --- a/package/pcrepp/Makefile +++ b/package/pcrepp/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= pcrepp PKG_VERSION:= 0.9.5 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 1fe6ea8e23ece01fde2ce5fb4746acc2 PKG_DESCR:= Cpp Wrapper classes for PCRE PKG_SECTION:= libs diff --git a/package/pcrepp/patches/patch-configure b/package/pcrepp/patches/patch-configure index 0ee82218e..da7ab7b3e 100644 --- a/package/pcrepp/patches/patch-configure +++ b/package/pcrepp/patches/patch-configure @@ -1,5 +1,23 @@ --- pcre++-0.9.5.orig/configure 2004-08-25 01:38:03.000000000 +0200 -+++ pcre++-0.9.5/configure 2011-08-05 07:30:53.000000000 +0200 ++++ pcre++-0.9.5/configure 2014-03-17 20:07:03.000000000 +0100 +@@ -3844,7 +3844,7 @@ irix5* | irix6* | nonstopux*) + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-*) + case $host_cpu in + alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*) + lt_cv_deplibs_check_method=pass_all ;; +@@ -6598,7 +6598,7 @@ linux-gnuoldld* | linux-gnuaout* | linux + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-*) + version_type=linux + need_lib_prefix=no + need_version=no @@ -8612,7 +8612,7 @@ if test "x$with_pcre_include" = "x"; the CPPFLAGS="$CPPFLAGS -I/include" ;; diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile index 4bad787ef..570febc37 100644 --- a/package/sane-backends/Makefile +++ b/package/sane-backends/Makefile @@ -5,12 +5,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= sane-backends PKG_VERSION:= 1.0.22 -PKG_RELEASE:= 1 +PKG_RELEASE:= 3 PKG_MD5SUM:= fadf56a60f4776bfb24491f66b617cf5 PKG_DESCR:= Scanner access now easy PKG_SECTION:= misc PKG_DEPENDS:= libpthread -PKG_BUILDDEP:= libpthread libusb +PKG_BUILDDEP:= libpthread libusb libusb-compat PKG_URL:= http://www.sane-project.org/ PKG_SITES:= ftp://ftp2.sane-project.org/pub/sane/${PKG_NAME}-${PKG_VERSION}/ PKG_MULTI:= 1 @@ -165,6 +165,7 @@ $(eval $(call PKG_mod_template,SANE_BACKEND_UMAX1220U,umax1220u)) $(eval $(call PKG_mod_template,SANE_BACKEND_UMAX_PP,umax_pp)) $(eval $(call PKG_mod_template,SANE_BACKEND_UMAX,umax)) +TARGET_CFLAGS+= -D_GNU_SOURCE CONFIGURE_ENV+= ac_cv_func_ioperm=no have_libv4l1=no CONFIGURE_ARGS+= --disable-translations \ --without-gphoto2 \ diff --git a/package/sane-backends/patches/patch-backend_canon630u-common_c b/package/sane-backends/patches/patch-backend_canon630u-common_c new file mode 100644 index 000000000..d9acb4bf1 --- /dev/null +++ b/package/sane-backends/patches/patch-backend_canon630u-common_c @@ -0,0 +1,12 @@ +--- sane-backends-1.0.22.orig/backend/canon630u-common.c 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/backend/canon630u-common.c 2014-03-18 08:33:31.000000000 +0100 +@@ -58,9 +58,7 @@ + #include <unistd.h> /* usleep */ + #include <time.h> + #include <math.h> /* exp() */ +-#ifdef HAVE_OS2_H + #include <sys/types.h> /* mode_t */ +-#endif + #include <sys/stat.h> + #include "lm9830.h" + diff --git a/package/sane-backends/patches/patch-backend_epson2-commands_c b/package/sane-backends/patches/patch-backend_epson2-commands_c new file mode 100644 index 000000000..3b2c46841 --- /dev/null +++ b/package/sane-backends/patches/patch-backend_epson2-commands_c @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/backend/epson2-commands.c 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/backend/epson2-commands.c 2014-03-18 08:34:27.000000000 +0100 +@@ -19,6 +19,7 @@ + + #include "sane/config.h" + ++#include <sys/types.h> + #include <byteorder.h> + #include <math.h> + diff --git a/package/sane-backends/patches/patch-backend_genesys_c b/package/sane-backends/patches/patch-backend_genesys_c new file mode 100644 index 000000000..fc0398856 --- /dev/null +++ b/package/sane-backends/patches/patch-backend_genesys_c @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/backend/genesys.c 2011-02-14 00:10:18.000000000 +0100 ++++ sane-backends-1.0.22/backend/genesys.c 2014-03-18 08:36:00.000000000 +0100 +@@ -65,6 +65,7 @@ + #include <errno.h> + #include <string.h> + #include <stdlib.h> ++#include <sys/types.h> + #include <unistd.h> + #include <math.h> + diff --git a/package/sane-backends/patches/patch-backend_genesys_h b/package/sane-backends/patches/patch-backend_genesys_h new file mode 100644 index 000000000..efc830be1 --- /dev/null +++ b/package/sane-backends/patches/patch-backend_genesys_h @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/backend/genesys.h 2011-01-16 02:01:28.000000000 +0100 ++++ sane-backends-1.0.22/backend/genesys.h 2014-03-18 08:36:42.000000000 +0100 +@@ -52,6 +52,7 @@ + */ + #undef UNIT_TESTING + ++#include <sys/types.h> + #include "genesys_low.h" + + #define FREE_IFNOT_NULL(x) if(x!=NULL) { free(x); x=NULL;} diff --git a/package/sane-backends/patches/patch-backend_genesys_low_c b/package/sane-backends/patches/patch-backend_genesys_low_c new file mode 100644 index 000000000..430ab3791 --- /dev/null +++ b/package/sane-backends/patches/patch-backend_genesys_low_c @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/backend/genesys_low.c 2011-02-14 00:10:18.000000000 +0100 ++++ sane-backends-1.0.22/backend/genesys_low.c 2014-03-18 08:37:27.000000000 +0100 +@@ -46,6 +46,7 @@ + #include <errno.h> + #include <string.h> + #include <stdlib.h> ++#include <sys/types.h> + #include <unistd.h> + #include <math.h> + diff --git a/package/sane-backends/patches/patch-backend_hp3900_rts8822_c b/package/sane-backends/patches/patch-backend_hp3900_rts8822_c new file mode 100644 index 000000000..59b9b5a9b --- /dev/null +++ b/package/sane-backends/patches/patch-backend_hp3900_rts8822_c @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/backend/hp3900_rts8822.c 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/backend/hp3900_rts8822.c 2014-03-18 08:38:21.000000000 +0100 +@@ -64,6 +64,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> /* bzero() */ ++#include <sys/types.h> + #include <time.h> /* clock() */ + #include <math.h> /* truncf() */ + #include <ctype.h> /* tolower() */ diff --git a/package/sane-backends/patches/patch-backend_hp5400_sanei_c b/package/sane-backends/patches/patch-backend_hp5400_sanei_c new file mode 100644 index 000000000..7f340d607 --- /dev/null +++ b/package/sane-backends/patches/patch-backend_hp5400_sanei_c @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/backend/hp5400_sanei.c 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/backend/hp5400_sanei.c 2014-03-18 08:39:35.000000000 +0100 +@@ -56,6 +56,7 @@ + #include "hp5400_xfer.h" + #include "hp5400_debug.h" + #include <stdio.h> ++#include <sys/types.h> + #include "../include/sane/sanei_usb.h" + + #define CMD_INITBULK1 0x0087 /* send 0x14 */ diff --git a/package/sane-backends/patches/patch-backend_hp5590_low_c b/package/sane-backends/patches/patch-backend_hp5590_low_c new file mode 100644 index 000000000..7812886dc --- /dev/null +++ b/package/sane-backends/patches/patch-backend_hp5590_low_c @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/backend/hp5590_low.c 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/backend/hp5590_low.c 2014-03-18 08:38:55.000000000 +0100 +@@ -46,6 +46,7 @@ + + #include <stdio.h> + #include <string.h> ++#include <sys/types.h> + #include <errno.h> + #ifdef HAVE_NETINET_IN_H + # include <netinet/in.h> diff --git a/package/sane-backends/patches/patch-backend_kvs20xx_opt_c b/package/sane-backends/patches/patch-backend_kvs20xx_opt_c new file mode 100644 index 000000000..253699d14 --- /dev/null +++ b/package/sane-backends/patches/patch-backend_kvs20xx_opt_c @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/backend/kvs20xx_opt.c 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/backend/kvs20xx_opt.c 2014-03-18 08:41:24.000000000 +0100 +@@ -8,6 +8,7 @@ + + #include "../include/sane/config.h" + ++#include <sys/types.h> + #include <string.h> + + #define DEBUG_DECLARE_ONLY diff --git a/package/sane-backends/patches/patch-backend_rts88xx_lib_c b/package/sane-backends/patches/patch-backend_rts88xx_lib_c new file mode 100644 index 000000000..060f0a10e --- /dev/null +++ b/package/sane-backends/patches/patch-backend_rts88xx_lib_c @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/backend/rts88xx_lib.c 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/backend/rts88xx_lib.c 2014-03-18 08:42:41.000000000 +0100 +@@ -54,6 +54,7 @@ + + #include <stdio.h> + #include <sys/time.h> ++#include <sys/types.h> + + #include "../include/_stdint.h" + diff --git a/package/sane-backends/patches/patch-backend_xerox_mfp_c b/package/sane-backends/patches/patch-backend_xerox_mfp_c new file mode 100644 index 000000000..d58262197 --- /dev/null +++ b/package/sane-backends/patches/patch-backend_xerox_mfp_c @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/backend/xerox_mfp.c 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/backend/xerox_mfp.c 2014-03-18 08:44:56.000000000 +0100 +@@ -22,6 +22,7 @@ + #include <math.h> + #include <unistd.h> + #include <sys/time.h> ++#include <sys/types.h> + #include "../include/sane/sane.h" + #include "../include/sane/sanei.h" + #include "../include/sane/saneopts.h" diff --git a/package/sane-backends/patches/patch-include_sane_sanei_tcp_h b/package/sane-backends/patches/patch-include_sane_sanei_tcp_h new file mode 100644 index 000000000..4ba390003 --- /dev/null +++ b/package/sane-backends/patches/patch-include_sane_sanei_tcp_h @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/include/sane/sanei_tcp.h 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/include/sane/sanei_tcp.h 2014-03-18 08:31:07.000000000 +0100 +@@ -20,6 +20,7 @@ + + #include <sane/sane.h> + ++#include <sys/types.h> + #include <netinet/in.h> + #include <netdb.h> + diff --git a/package/sane-backends/patches/patch-include_sane_sanei_udp_h b/package/sane-backends/patches/patch-include_sane_sanei_udp_h new file mode 100644 index 000000000..3d70edada --- /dev/null +++ b/package/sane-backends/patches/patch-include_sane_sanei_udp_h @@ -0,0 +1,10 @@ +--- sane-backends-1.0.22.orig/include/sane/sanei_udp.h 2010-12-02 00:49:58.000000000 +0100 ++++ sane-backends-1.0.22/include/sane/sanei_udp.h 2014-03-18 08:31:40.000000000 +0100 +@@ -20,6 +20,7 @@ + + #include <sane/sane.h> + ++#include <sys/types.h> + #include <netinet/in.h> + #include <netdb.h> + diff --git a/package/tzdata/Makefile b/package/tzdata/Makefile index dc038027f..8fd111b3d 100644 --- a/package/tzdata/Makefile +++ b/package/tzdata/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= tzdata PKG_VERSION:= 2013d -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 65b6818162230fc02f86f293376c73df 4616a9560270f180eeb9a08540636890 PKG_DESCR:= Timezone data (/usr/share/zoneinfo) PKG_SECTION:= utils @@ -39,8 +39,12 @@ ALL_TARGET:= ALL INSTALL_TARGET:= INSTALL tzdata-install: - $(INSTALL_DIR) $(IDIR_TZDATA)/usr/share $(IDIR_TZDATA)/etc - $(CP) $(WRKINST)/usr/share/zoneinfo $(IDIR_TZDATA)/usr/share + $(INSTALL_DIR) $(IDIR_TZDATA)/usr/share/zoneinfo $(IDIR_TZDATA)/etc + cd ${WRKINST} && for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \ + test -s usr/share/zoneinfo/"$$f" || continue; \ + echo usr/share/zoneinfo/"$$f" | \ + ${STAGING_HOST_DIR}/usr/bin/cpio -pdu ${IDIR_TZDATA}/; \ + done tz=; cd $(IDIR_TZDATA)/usr/share/zoneinfo || exit 1; \ for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \ test -s "$$f" || continue; \ diff --git a/target/arm/Makefile b/target/arm/Makefile index a652003eb..a2bd23a8b 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -71,10 +71,10 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM)$(ADK_TARGET_SYSTEM_QEMU_ARMHF),y) endif endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(FW_DIR)/$(INITRAMFS) diff --git a/target/m68k/Makefile b/target/m68k/Makefile index d68393b84..0e7324c25 100644 --- a/target/m68k/Makefile +++ b/target/m68k/Makefile @@ -16,10 +16,10 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(FW_DIR)/$(INITRAMFS) diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile index c60545e56..5ab2345e7 100644 --- a/target/microblaze/Makefile +++ b/target/microblaze/Makefile @@ -62,8 +62,8 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif diff --git a/target/mips/Makefile b/target/mips/Makefile index 9fd479d5d..436b570e3 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -113,10 +113,10 @@ ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) endif endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(FW_DIR)/$(INITRAMFS) diff --git a/target/ppc/Makefile b/target/ppc/Makefile index ceb31e5f5..aae63f1c0 100644 --- a/target/ppc/Makefile +++ b/target/ppc/Makefile @@ -23,10 +23,10 @@ ifeq ($(ADK_HARDWARE_QEMU),y) endif endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(FW_DIR)/$(INITRAMFS) diff --git a/target/ppc64/Makefile b/target/ppc64/Makefile index 0ad0843c0..6ee949a09 100644 --- a/target/ppc64/Makefile +++ b/target/ppc64/Makefile @@ -23,10 +23,10 @@ ifeq ($(ADK_HARDWARE_QEMU),y) endif endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(FW_DIR)/$(INITRAMFS) diff --git a/target/sh/Makefile b/target/sh/Makefile index 160ed6b74..0d5706eb3 100644 --- a/target/sh/Makefile +++ b/target/sh/Makefile @@ -23,10 +23,10 @@ ifneq ($(ADK_HARDWARE_QEMU),) endif endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(FW_DIR)/$(INITRAMFS) diff --git a/target/sparc/Makefile b/target/sparc/Makefile index abe521e66..1e15ee7f0 100644 --- a/target/sparc/Makefile +++ b/target/sparc/Makefile @@ -22,10 +22,10 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC),y) endif endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(FW_DIR)/$(INITRAMFS) diff --git a/target/sparc64/Makefile b/target/sparc64/Makefile index 0d3dc560b..882189284 100644 --- a/target/sparc64/Makefile +++ b/target/sparc64/Makefile @@ -33,10 +33,10 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC64),y) endif endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: $(FW_DIR)/$(INITRAMFS) diff --git a/target/x86/Makefile b/target/x86/Makefile index 489d4dd1d..15d980d7c 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -14,7 +14,6 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" @echo "To install everything to CompactFlash use scripts/genext2.sh" endif - ifeq ($(ADK_TARGET_FS),cf) imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" @@ -43,10 +42,10 @@ ifeq ($(ADK_HARDWARE_VBOX),y) endif endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),usb) imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index 7087c9ca1..c94c3a1a6 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -21,10 +21,10 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64),y) endif endif ifeq ($(ADK_TARGET_FS),initramfsarchive) -imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) +imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif ifeq ($(ADK_TARGET_FS),usb) imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) |