Cleanup.

2014-08-19 18:26:49 +01:00 · 2014-08-19 18:26:49 +01:00 · 306e07e50c
commit 306e07e50c
parent 75c4714bca
12 changed files with 112 additions and 165 deletions
--- a/rules/gcc/patches-4.6.3/00-libjava-i786.patch
+++ b/rules/gcc/patches-4.6.3/00-libjava-i786.patch
@ -1,11 +0,0 @@
--- gcc-4.6.3/libjava/configure.host	2010-12-06 00:50:04.000000000 +0000
-+++ gcc-4.6.3.rasm/libjava/configure.host	2012-10-30 20:29:06.192935517 +0000
-@@ -115,7 +115,7 @@
-   mips*-*)
- 	libgcj_interpreter=yes
- 	;;
-  i686-*|i586-*|i486-*|i386-*)
-+  i786-*|i686-*|i586-*|i486-*|i386-*)
- 	sysdeps_dir=i386
- 	# With -fomit-frame-pointer -maccumulate-outgoing-args (implied),
- 	# the .text section of libgcj.so is 30k larger, and the .eh_frame
--- a/rules/gcc/patches-4.6.3/01-lib64-to-lib.patch
+++ b/rules/gcc/patches-4.6.3/01-lib64-to-lib.patch
@ -1,14 +0,0 @@
-diff -Nru gcc-4.6.3/gcc/config/i386/t-linux64 gcc-4.6.3.rasm/gcc/config/i386/t-linux64
--- gcc-4.6.3/gcc/config/i386/t-linux64	2009-04-21 20:03:23.000000000 +0100
-+++ gcc-4.6.3.rasm/gcc/config/i386/t-linux64	2012-12-11 19:01:42.549964639 +0000
-@@ -24,8 +24,8 @@
- # MULTILIB_OSDIRNAMES according to what is found on the target.
- 
- MULTILIB_OPTIONS = m64/m32
-MULTILIB_DIRNAMES = 64 32 
-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_DIRNAMES = 64 32
-+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
--- a/rules/linux/common.bash
+++ b/rules/linux/common.bash
@ -1,108 +0,0 @@
-post_unpack()
-{
-    patches=$(ls "$pkg_dir/patches-$version/"*.patch\
-	"$cfg_dir_system/patches/linux/patches-${version}/"*.patch 2>/dev/null)
-    if [ -n "$patches" ]; then
-        cat $patches | patch -p1
-    fi
-
-    if [ -d "$cfg_dir_toolchain/firmware" ]; then
-        tar -C "$cfg_dir_toolchain/firmware" -c -v -f - . | tar -C firmware -x -v -f -
-    fi
-}
-
-refresh()
-{
-    for rule in configure build target_install; do
-        if [ "$cfg_dir_system/cfg/linux-${version}.cfg" -nt "$cfg_dir_builds/linux/$pkg_var/.$rule" ]; then
-            rm "$cfg_dir_builds/linux/$pkg_var/.$rule"
-        fi
-    done
-}
-
-configure()
-{
-    $cmd_make \
-        ARCH=${cfg_target_linux} \
-        mrproper &&
-
-    cp "$cfg_dir_system/cfg/linux-${version}.cfg" .config &&
-
-    yes '' | $cmd_make \
-        CROSS_COMPILE=${cfg_target_canonical}- \
-        ARCH=${cfg_target_linux} \
-        oldconfig
-}
-
-build()
-{
-    $cmd_make \
-        CROSS_COMPILE=$cfg_target_canonical- \
-        ARCH=$cfg_target_linux &&
-    $cmd_make \
-        CROSS_COMPILE=$cfg_target_canonical- \
-        ARCH=$cfg_target_linux \
-        modules &&
-
-    if [ "$(basename $cfg_target_linux_kernel)" = 'uImage' ]; then
-        $cmd_make \
-            CROSS_COMPILE=$cfg_target_canonical- \
-            ARCH=$cfg_target_linux \
-            uImage
-    fi
-
-    # Compressed image.
-    if [ "$(basename $cfg_target_linux_kernel)" = 'zImage' ]; then
-        $cmd_make \
-            CROSS_COMPILE=$cfg_target_canonical- \
-            ARCH=$cfg_target_linux \
-            zImage
-    fi
-
-    # Device tree blob.
-    if [ -n "$cfg_target_linux_dtb" ]; then
-        $cmd_make \
-            CROSS_COMPILE=$cfg_target_canonical- \
-            ARCH=$cfg_target_linux \
-            dtbs
-    fi
-
-    if [ -n "${cfg_target_linux_size}" ]; then
-        dd if="$cfg_target_linux_kernel" of="${cfg_target_linux_kernel}.padded" \
-            ibs="${cfg_target_linux_size}" conv=sync &&
-        mv "${cfg_target_linux_kernel}.padded" "${cfg_target_linux_kernel}"
-    fi
-}
-
-target_install()
-{
-    kernel="$cfg_dir_base/${cfg_sys_family}/glued-${cfg_glued_version}-${cfg_sys_family}-kernel.bin"
-
-    if [ -n "$(file "$cfg_target_linux_kernel" | grep ELF)" ]; then
-        strip="$(echo $cfg_dir_toolchain/bin/*-strip)"
-        $strip -s -R .comment "$cfg_target_linux_kernel"
-    fi
-
-    # Kernel image.
-    if [ -n "$cfg_target_linux_kernel" ]; then
-        cp -v "$cfg_target_linux_kernel" "$kernel"
-        cp -v "$cfg_target_linux_kernel" "$cfg_dir_rootfs/boot/kernel"
-    fi
-
-    # Device tree blob.
-    if [ -n "$cfg_target_linux_dtb" ]; then
-        cp -v "$cfg_target_linux_dtb" "$cfg_dir_rootfs/boot/board.dtb"
-    fi
-
-    $cmd_make \
-        CROSS_COMPILE="$cfg_target_canonical-" \
-        ARCH="$cfg_target_linux" \
-        INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
-        modules_install
-
-    $cmd_make \
-        CROSS_COMPILE="$cfg_target_canonical-" \
-        ARCH="$cfg_target_linux" \
-        INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
-        firmware_install
-}
--- a/rules/linux/default.bash
+++ b/rules/linux/default.bash
@ -1,5 +1,3 @@
-source "$pkg_common"
-
 version=\
 (
    '3.14.16'
@ -26,3 +24,112 @@ requires=\
    'kmod/host'
    'lz4/host'
 )
+
+post_unpack()
+{
+    patches=$(ls "$pkg_dir/patches/$version/"*.patch\
+	"$cfg_dir_system/patches/linux/$version/"*.patch 2>/dev/null)
+    if [ -n "$patches" ]; then
+        cat $patches | patch -p1
+    fi
+
+    if [ -d "$cfg_dir_toolchain/firmware" ]; then
+        tar -C "$cfg_dir_toolchain/firmware" -c -v -f - . | tar -C firmware -x -v -f -
+    fi
+}
+
+refresh()
+{
+    for rule in configure build target_install; do
+        if [ "$cfg_dir_system/cfg/linux-${version}.cfg" -nt "$cfg_dir_builds/linux/$pkg_var/.$rule" ]; then
+            rm "$cfg_dir_builds/linux/$pkg_var/.$rule"
+        fi
+    done
+}
+
+configure()
+{
+    $cmd_make \
+        ARCH=${cfg_target_linux} \
+        mrproper &&
+
+    cp "$cfg_dir_system/cfg/linux-${version}.cfg" .config &&
+
+    yes '' | $cmd_make \
+        CROSS_COMPILE=${cfg_target_canonical}- \
+        ARCH=${cfg_target_linux} \
+        oldconfig
+}
+
+build()
+{
+    $cmd_make \
+        CROSS_COMPILE=$cfg_target_canonical- \
+        ARCH=$cfg_target_linux &&
+    $cmd_make \
+        CROSS_COMPILE=$cfg_target_canonical- \
+        ARCH=$cfg_target_linux \
+        modules &&
+
+    if [ "$(basename $cfg_target_linux_kernel)" = 'uImage' ]; then
+        $cmd_make \
+            CROSS_COMPILE=$cfg_target_canonical- \
+            ARCH=$cfg_target_linux \
+            uImage
+    fi
+
+    # Compressed image.
+    if [ "$(basename $cfg_target_linux_kernel)" = 'zImage' ]; then
+        $cmd_make \
+            CROSS_COMPILE=$cfg_target_canonical- \
+            ARCH=$cfg_target_linux \
+            zImage
+    fi
+
+    # Device tree blob.
+    if [ -n "$cfg_target_linux_dtb" ]; then
+        $cmd_make \
+            CROSS_COMPILE=$cfg_target_canonical- \
+            ARCH=$cfg_target_linux \
+            dtbs
+    fi
+
+    if [ -n "${cfg_target_linux_size}" ]; then
+        dd if="$cfg_target_linux_kernel" of="${cfg_target_linux_kernel}.padded" \
+            ibs="${cfg_target_linux_size}" conv=sync &&
+        mv "${cfg_target_linux_kernel}.padded" "${cfg_target_linux_kernel}"
+    fi
+}
+
+target_install()
+{
+    kernel="$cfg_dir_base/${cfg_sys_family}/glued-${cfg_glued_version}-${cfg_sys_family}-kernel.bin"
+
+    if [ -n "$(file "$cfg_target_linux_kernel" | grep ELF)" ]; then
+        strip="$(echo $cfg_dir_toolchain/bin/*-strip)"
+        $strip -s -R .comment "$cfg_target_linux_kernel"
+    fi
+
+    # Kernel image.
+    if [ -n "$cfg_target_linux_kernel" ]; then
+        cp -v "$cfg_target_linux_kernel" "$kernel"
+        cp -v "$cfg_target_linux_kernel" "$cfg_dir_rootfs/boot/kernel"
+    fi
+
+    # Device tree blob.
+    if [ -n "$cfg_target_linux_dtb" ]; then
+        cp -v "$cfg_target_linux_dtb" "$cfg_dir_rootfs/boot/board.dtb"
+    fi
+
+    $cmd_make \
+        CROSS_COMPILE="$cfg_target_canonical-" \
+        ARCH="$cfg_target_linux" \
+        INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
+        modules_install
+
+    $cmd_make \
+        CROSS_COMPILE="$cfg_target_canonical-" \
+        ARCH="$cfg_target_linux" \
+        INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
+        firmware_install
+}
--- a/rules/linux/igep.bash
+++ b/rules/linux/igep.bash
@ -1,27 +0,0 @@
-source "$pkg_common"
-
-version=\
-(
-    '3.5.4'
-)
-
-url=\
-(
-    "http://www.kernel.org/pub/linux/kernel/v3.0/linux-$version.tar.bz2"
-)
-
-md5=\
-(
-    '95d5c7271ad448bc965bdb29339b6923'
-)
-
-maintainer=\
-(
-    'Ricardo Martins <rasm@fe.up.pt>'
-)
-
-requires=\
-(
-    'u-boot'
-    'kmod/host'
-)
--- a/rules/u-boot/default.bash
+++ b/rules/u-boot/default.bash
@ -15,8 +15,8 @@ md5=\

 post_unpack()
 {
-    patches=$(ls "$pkg_dir/patches-$version/"*.patch\
-	"$cfg_dir_system/patches/u-boot/patches-${version}/"*.patch 2>/dev/null)
+    patches=$(ls "$pkg_dir/patches/$version/"*.patch\
+	"$cfg_dir_system/patches/u-boot/$version/"*.patch 2>/dev/null)
    if [ -n "$patches" ]; then
        cat $patches | patch -p1
    fi
--- a/systems/lctr-a6xx/config
+++ b/systems/lctr-a6xx/config
@ -4,7 +4,7 @@ cfg_services0='dropbear network storage upgrade syslog escc ptpd setserial'
 cfg_services1=''
 cfg_services2='dune'
 cfg_modules=''
-cfg_packages='zlib dropbear rsync busybox flashrom e2fsprogs socat linux escc syslinux syslinux/host ptpd ntp uswitch pciutils apache-ant/host bzip2 libantlr3c boost europa'
+cfg_packages='zlib dropbear rsync busybox flashrom e2fsprogs socat linux escc syslinux syslinux/host ptpd ntp uswitch pciutils bzip2'
 cfg_terminal='ttyS0'
 cfg_target_linux_kernel='arch/x86/boot/bzImage'
 cfg_ptpd_master='true'
--- a/systems/lctr-a6xx/patches/linux/patches-3.13.11/00-aim104-com8.patch
+++ b/systems/lctr-a6xx/patches/linux/patches-3.13.11/00-aim104-com8.patch
--- a/systems/lctr-a9xx/patches/linux/patches-3.14.16/00-lctr-a9xx-dts.patch
+++ b/systems/lctr-a9xx/patches/linux/patches-3.14.16/00-lctr-a9xx-dts.patch
--- a/systems/lctr-a9xx/patches/u-boot/patches-2014.07/00-igep0020-lsts.patch
+++ b/systems/lctr-a9xx/patches/u-boot/patches-2014.07/00-igep0020-lsts.patch
--- a/systems/lctr-b2xx/patches/linux/patches-3.14.16/00-lctr-b2xx-dts.patch
+++ b/systems/lctr-b2xx/patches/linux/patches-3.14.16/00-lctr-b2xx-dts.patch
--- a/systems/lctr-b2xx/patches/u-boot/patches-2014.07/01-am335x-bbb.patch
+++ b/systems/lctr-b2xx/patches/u-boot/patches-2014.07/01-am335x-bbb.patch