Added Rhel as possible build platform

2026-05-05 01:17:09 -05:00 · 2018-12-13 13:21:58 +01:00
parent b897f11787
commit 928b066e4b
3 changed files with 43 additions and 24 deletions
--- a/Buildroot/package/partclone/partclone-0.2.89.patch
+++ b/Buildroot/package/partclone/partclone-0.2.89.patch
@@ -1,19 +1,27 @@
 diff -rupN partclone-0.2.89_orig/fail-mbr/compile-mbr.sh partclone-0.2.89_new/fail-mbr/compile-mbr.sh
--- partclone-0.2.89_orig/fail-mbr/compile-mbr.sh	2017-08-10 20:20:27.659003090 -0400
-+++ partclone-0.2.89_new/fail-mbr/compile-mbr.sh	2017-08-10 21:05:32.559055136 -0400
-@@ -2,10 +2,10 @@
- if dpkg-architecture -e amd64 || dpkg-architecture -e i386; then
+--- partclone-0.2.89_orig/fail-mbr/compile-mbr.sh	2016-06-23 06:14:56.000000000 +0200
+++ partclone-0.2.89_new/fail-mbr/compile-mbr.sh	2018-12-17 12:31:23.069930338 +0100
+@@ -1,13 +1,14 @@
+ ############### compiles source file for x86 architectures ##################
+-if dpkg-architecture -e amd64 || dpkg-architecture -e i386; then
+if dpkg-architecture -e amd64 || dpkg-architecture -e i386 || [ "$RPM_ARCH" = "x86_64" ] || [ "$RPM_ARCH" = "i386" ]; then
    # compile the file fail-mbr.bin
-     echo -n "Compiling: fail-mbr.S -> fail-mbr.o -> "
+-    echo -n "Compiling: fail-mbr.S -> fail-mbr.o -> "
 -    gcc -Wall -Werror -m32 -nostdlib -o fail-mbr.o fail-mbr.S
-+    gcc -no-pie -Wall -Werror -m32 -nostdlib -o fail-mbr.o fail-mbr.S
+    #echo -n "Compiling: fail-mbr.S -> fail-mbr.o -> "
+    #gcc -Wall -Werror -m32 -nostdlib -static -o fail-mbr.o fail-mbr.S
 
-     echo -n "fail-mbr.image -> "
+-    echo -n "fail-mbr.image -> "
 -    gcc -Os -Wall -W -Wshadow -Wpointer-arith -Wmissing-prototypes -Wundef -Wstrict-prototypes -g -falign-jumps=1 -falign-loops=1 -falign-functions=1 -mno-mmx -mno-sse -mno-sse2 -mno-3dnow -fno-dwarf2-cfi-asm -fno-asynchronous-unwind-tables -m32 -fno-stack-protector -mno-stack-arg-probe -Werror -Wno-trampolines -DUSE_ASCII_FAILBACK=1 -DHAVE_UNIFONT_WIDTHSPEC=1  -mrtd -mregparm=3       -fno-builtin   -m32 -Wl,--build-id=none   -nostdlib -Wl,-N,-S -Wl,-N -Wl,-Ttext,0x7C00   -o fail-mbr.image fail-mbr.o
-+    gcc -no-pie -Os -Wall -W -Wshadow -Wpointer-arith -Wmissing-prototypes -Wundef -Wstrict-prototypes -g -falign-jumps=1 -falign-loops=1 -falign-functions=1 -mno-mmx -mno-sse -mno-sse2 -mno-3dnow -fno-dwarf2-cfi-asm -fno-asynchronous-unwind-tables -m32 -fno-stack-protector -mno-stack-arg-probe -Werror -Wno-trampolines -DUSE_ASCII_FAILBACK=1 -DHAVE_UNIFONT_WIDTHSPEC=1  -mrtd -mregparm=3       -fno-builtin   -m32 -Wl,--build-id=none   -nostdlib -Wl,-N,-S -Wl,-N -Wl,-Ttext,0x7C00   -o fail-mbr.image fail-mbr.o
+    #echo -n "fail-mbr.image -> "
+    #gcc -Os -Wall -W -Wshadow -Wpointer-arith -Wmissing-prototypes -Wundef -Wstrict-prototypes -g -falign-jumps=1 -falign-loops=1 -falign-functions=1 -mno-mmx -mno-sse -mno-sse2 -mno-3dnow -fno-dwarf2-cfi-asm -fno-asynchronous-unwind-tables -m32 -fno-stack-protector -mno-stack-arg-probe -Werror -Wno-trampolines -DUSE_ASCII_FAILBACK=1 -DHAVE_UNIFONT_WIDTHSPEC=1  -mrtd -mregparm=3       -fno-builtin   -m32 -Wl,--build-id=none   -nostdlib -Wl,-N,-S -Wl,-N -Wl,-Ttext,0x7C00   -o fail-mbr.image fail-mbr.o
 
-     echo "fail-mbr.bin [Done]. "
+-    echo "fail-mbr.bin [Done]. "
+    #echo "fail-mbr.bin [Done]. "
+    gcc -c fail-mbr.S -o fail-mbr.image
     objcopy  -O binary  --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn fail-mbr.image fail-mbr.bin
+ else
+     echo "The architecture is not x86, so the file 'fail-mbr.bin' is not compiled"
 diff -rupN partclone-0.2.89_orig/src/hfsplusclone.c partclone-0.2.89_new/src/hfsplusclone.c
 --- partclone-0.2.89_orig/src/hfsplusclone.c	2017-08-10 20:20:27.695004471 -0400
 +++ partclone-0.2.89_new/src/hfsplusclone.c	2017-08-10 20:21:39.197749892 -0400
--- a/2
+++ b/2
@@ -10,7 +10,7 @@ pipeline {
  }
  environment {
    KERNEL_VERSION = '4.19.6'
-    BUILDROOT_VERSION = '2018.08.2'
+    BUILDROOT_VERSION = '2018.08.3'
  }
  stages {
    stage('SCM') {
--- a/build.sh
+++ b/build.sh
@@ -112,14 +112,25 @@ while getopts "$optspec" o; do
 done
 brURL="https://buildroot.org/downloads/buildroot-$BUILDROOT_VERSION.tar.bz2"
 kernelURL="https://www.kernel.org/pub/linux/kernel/v4.x/linux-$KERNEL_VERSION.tar.xz"
-deps="git meld build-essential rsync libncurses5-dev bison flex gcc-arm-linux-gnueabi gcc-aarch64-linux-gnu"
+debDeps="git meld build-essential rsync libncurses5-dev bison flex gcc-arm-linux-gnueabi gcc-aarch64-linux-gnu"
+rhelDeps="git meld rsync ncurses-devel bison flex gcc-arm-linux-gnu gcc-aarch64-linux-gnu"
 [[ -z $arch ]] && arch="x64 x86 arm arm64"
 [[ -z $buildPath ]] && buildPath=$(dirname $(readlink -f $0))
 [[ -z $confirm ]] && confirm="y"
 echo "Checking packages needed for building"
-for pkg in $deps
+if grep -iqE "Debian" /proc/version ; then
+    os="deb"
+    eabi="eabi"
+    pkgmgr="dpkg -s"
+elif grep -iqE "Red Hat|Redhat" /proc/version ; then
+    os="rhel"
+    eabi=""
+    pkgmgr="rpm -qi"
+fi
+osDeps=${os}Deps
+for pkg in ${!osDeps}
 do
-    dpkg -s $pkg >/dev/null 2>&1
+    $pkgmgr $pkg >/dev/null 2>&1
    if [[ $? != 0 ]]; then
        echo " * Package $pkg missing!"
        fail=1
@@ -166,7 +177,7 @@ function buildFilesystem() {
                ;;
            arm)
                echo Skipping
-                #make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- oldconfig
+                #make ARCH=arm CROSS_COMPILE=arm-linux-gnu${eabi}- oldconfig
                ;;
            arm64)
                make ARCH=aarch64 CROSS_COMPILE=aarch64-linux-gnu- oldconfig
@@ -189,7 +200,7 @@ function buildFilesystem() {
                    ;;
                arm)
                    echo Skipping
-                    #make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- menuconfig
+                    #make ARCH=arm CROSS_COMPILE=arm-linux-gnu${eabi}- menuconfig
                    ;;
                arm64)
                    make ARCH=aarch64 CROSS_COMPILE=aarch64-linux-gnu- menuconfig
@@ -209,7 +220,7 @@ function buildFilesystem() {
                    ;;
                arm)
                    echo Skipping
-                    #make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- oldconfig
+                    #make ARCH=arm CROSS_COMPILE=arm-linux-gnu${eabi}- oldconfig
                    ;;
                arm64)
                    make ARCH=aarch64 CROSS_COMPILE=aarch64-linux-gnu- oldconfig
@@ -241,7 +252,7 @@ function buildFilesystem() {
            ;;
        arm)
            echo Skipping
-            #make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- -j $(nproc) >buildroot$arch.log 2>&1
+            #make ARCH=arm CROSS_COMPILE=arm-linux-gnu${eabi}- -j $(nproc) >buildroot$arch.log 2>&1
            ;;
        arm64)
            make ARCH=aarch64 CROSS_COMPILE=aarch64-linux-gnu- >buildroot$arch.log 2>&1
@@ -257,10 +268,10 @@ function buildFilesystem() {
    [[ ! -d dist ]] && mkdir dist
    case "${arch}" in
        x*)
-	    compiledfile="fssource$arch/output/images/rootfs.ext2.xz"
+           compiledfile="fssource$arch/output/images/rootfs.ext2.xz"
            ;;
        arm*)
-	    compiledfile="fssource$arch/output/images/rootfs.cpio.gz"
+           compiledfile="fssource$arch/output/images/rootfs.cpio.gz"
            ;;
    esac
    case "${arch}" in
@@ -320,7 +331,7 @@ function buildKernel() {
                    make ARCH=i386 menuconfig
                    ;;
                arm)
-                    make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- menuconfig
+                    make ARCH=arm CROSS_COMPILE=arm-linux-gnu${eabi}- menuconfig
                    ;;
                arm64)
                    make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- menuconfig
@@ -339,7 +350,7 @@ function buildKernel() {
                    make ARCH=i386 oldconfig
                    ;;
                arm)
-                    make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- oldconfig
+                    make ARCH=arm CROSS_COMPILE=arm-linux-gnu${eabi}- oldconfig
                    ;;
                arm64)
                    make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- oldconfig
@@ -363,7 +374,7 @@ function buildKernel() {
                    [[ $status -gt 0 ]] && exit $status
                    ;;
                arm)
-                    make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- -j $(nproc) Image
+                    make ARCH=arm CROSS_COMPILE=arm-linux-gnu${eabi}- -j $(nproc) Image
                    ;;
                arm64)
                    make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- -j $(nproc) Image
@@ -394,8 +405,8 @@ function buildKernel() {
                [[ $status -gt 0 ]] && exit $status
                ;;
            arm)
-                make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- oldconfig
-                make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- -j $(nproc) Image
+                make ARCH=arm CROSS_COMPILE=arm-linux-gnu${eabi}- oldconfig
+                make ARCH=arm CROSS_COMPILE=arm-linux-gnu${eabi}- -j $(nproc) Image
                ;;
            arm64)
                make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- oldconfig