Skip to content

Commit 705f569

Browse files
committed
sync this script so i can use it
Signed-off-by: Robert Nelson <[email protected]>
1 parent 62dd256 commit 705f569

File tree

2 files changed

+102
-103
lines changed

2 files changed

+102
-103
lines changed

build_mainline.sh

Lines changed: 87 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ function patch_kernel {
3030
export DIR GIT_OPTS
3131
/bin/bash -e ${DIR}/patch.sh || { git add . ; exit 1 ; }
3232

33-
git add .
34-
git commit --allow-empty -a -m "${KERNEL_TAG}-${BUILD} patchset"
33+
if [ ! "${RUN_BISECT}" ] ; then
34+
git add .
35+
git commit --allow-empty -a -m "${KERNEL_TAG}-${BUILD} patchset"
36+
fi
3537

3638
#Test Patches:
3739
#exit
@@ -45,18 +47,18 @@ function patch_kernel {
4547
}
4648

4749
function copy_defconfig {
48-
cd ${DIR}/KERNEL/
49-
make ARCH=arm CROSS_COMPILE=${CC} distclean
50-
make ARCH=arm CROSS_COMPILE=${CC} ${config}
51-
cp -v .config ${DIR}/patches/HEAD_${config}
52-
cd ${DIR}/
50+
cd ${DIR}/KERNEL/
51+
make ARCH=arm CROSS_COMPILE=${CC} distclean
52+
make ARCH=arm CROSS_COMPILE=${CC} ${config}
53+
cp -v .config ${DIR}/patches/HEAD_${config}
54+
cd ${DIR}/
5355
}
5456

5557
function make_menuconfig {
56-
cd ${DIR}/KERNEL/
57-
make ARCH=arm CROSS_COMPILE=${CC} menuconfig
58-
cp -v .config ${DIR}/patches/MOD_${config}
59-
cd ${DIR}/
58+
cd ${DIR}/KERNEL/
59+
make ARCH=arm CROSS_COMPILE=${CC} menuconfig
60+
cp -v .config ${DIR}/patches/MOD_${config}
61+
cd ${DIR}/
6062
}
6163

6264
function make_kernel {
@@ -98,19 +100,19 @@ function make_uImage {
98100
}
99101

100102
function make_modules_pkg {
101-
cd ${DIR}/KERNEL/
102-
103-
echo ""
104-
echo "Building Module Archive"
105-
echo ""
106-
107-
rm -rf ${DIR}/deploy/mod &> /dev/null || true
108-
mkdir -p ${DIR}/deploy/mod
109-
make ARCH=arm CROSS_COMPILE=${CC} modules_install INSTALL_MOD_PATH=${DIR}/deploy/mod
110-
echo "Building ${KERNEL_UTS}-modules.tar.gz"
111-
cd ${DIR}/deploy/mod
112-
tar czf ../${KERNEL_UTS}-modules.tar.gz *
113-
cd ${DIR}/
103+
cd ${DIR}/KERNEL/
104+
105+
echo ""
106+
echo "Building Module Archive"
107+
echo ""
108+
109+
rm -rf ${DIR}/deploy/mod &> /dev/null || true
110+
mkdir -p ${DIR}/deploy/mod
111+
make ARCH=arm CROSS_COMPILE=${CC} modules_install INSTALL_MOD_PATH=${DIR}/deploy/mod
112+
echo "Building ${KERNEL_UTS}-modules.tar.gz"
113+
cd ${DIR}/deploy/mod
114+
tar czf ../${KERNEL_UTS}-modules.tar.gz *
115+
cd ${DIR}/
114116
}
115117

116118
function make_dtbs_pkg {
@@ -131,76 +133,73 @@ function make_dtbs_pkg {
131133
}
132134

133135
function make_headers_pkg {
134-
cd ${DIR}/KERNEL/
135-
136-
echo ""
137-
echo "Building Header Archive"
138-
echo ""
139-
140-
rm -rf ${DIR}/deploy/headers &> /dev/null || true
141-
mkdir -p ${DIR}/deploy/headers/usr
142-
make ARCH=arm CROSS_COMPILE=${CC} headers_install INSTALL_HDR_PATH=${DIR}/deploy/headers/usr
143-
cd ${DIR}/deploy/headers
144-
echo "Building ${KERNEL_UTS}-headers.tar.gz"
145-
tar czf ../${KERNEL_UTS}-headers.tar.gz *
146-
cd ${DIR}/
136+
cd ${DIR}/KERNEL/
137+
138+
echo ""
139+
echo "Building Header Archive"
140+
echo ""
141+
142+
rm -rf ${DIR}/deploy/headers &> /dev/null || true
143+
mkdir -p ${DIR}/deploy/headers/usr
144+
make ARCH=arm CROSS_COMPILE=${CC} headers_install INSTALL_HDR_PATH=${DIR}/deploy/headers/usr
145+
cd ${DIR}/deploy/headers
146+
echo "Building ${KERNEL_UTS}-headers.tar.gz"
147+
tar czf ../${KERNEL_UTS}-headers.tar.gz *
148+
cd ${DIR}/
147149
}
148150

149151
/bin/bash -e ${DIR}/tools/host_det.sh || { exit 1 ; }
150152

151-
if [ -e ${DIR}/system.sh ] ; then
152-
unset CC
153-
unset DEBUG_SECTION
154-
unset LATEST_GIT
155-
unset LINUX_GIT
156-
unset LOCAL_PATCH_DIR
157-
source ${DIR}/system.sh
158-
/bin/bash -e "${DIR}/scripts/gcc.sh" || { exit 1 ; }
159-
160-
source ${DIR}/version.sh
161-
export LINUX_GIT
162-
export LATEST_GIT
163-
164-
if [ "${LATEST_GIT}" ] ; then
165-
echo ""
166-
echo "Warning LATEST_GIT is enabled from system.sh I hope you know what your doing.."
167-
echo ""
168-
fi
153+
if [ ! -f ${DIR}/system.sh ] ; then
154+
cp ${DIR}/system.sh.sample ${DIR}/system.sh
155+
fi
169156

170-
unset CONFIG_DEBUG_SECTION
171-
if [ "${DEBUG_SECTION}" ] ; then
172-
CONFIG_DEBUG_SECTION="CONFIG_DEBUG_SECTION_MISMATCH=y"
173-
fi
157+
unset CC
158+
unset DEBUG_SECTION
159+
unset LATEST_GIT
160+
unset LINUX_GIT
161+
unset LOCAL_PATCH_DIR
162+
source ${DIR}/system.sh
163+
/bin/bash -e "${DIR}/scripts/gcc.sh" || { exit 1 ; }
174164

175-
LATEST_GIT=1
176-
/bin/bash -e "${DIR}/scripts/git.sh" || { exit 1 ; }
177-
#patch_kernel
178-
copy_defconfig
179-
make_menuconfig
180-
if [ "x${GCC_OVERRIDE}" != "x" ] ; then
181-
sed -i -e 's:CROSS_COMPILE)gcc:CROSS_COMPILE)'$GCC_OVERRIDE':g' ${DIR}/KERNEL/Makefile
182-
fi
183-
make_kernel
184-
if [ "${BUILD_UIMAGE}" ] ; then
185-
make_uImage
186-
else
187-
echo ""
188-
echo "NOTE: enable BUILD_UIMAGE variables in system.sh to build uImage's"
189-
echo ""
190-
fi
191-
make_modules_pkg
192-
if [ "x${DTBS}" != "x" ] ; then
193-
make_dtbs_pkg
194-
fi
195-
make_headers_pkg
196-
if [ "x${GCC_OVERRIDE}" != "x" ] ; then
197-
sed -i -e 's:CROSS_COMPILE)'$GCC_OVERRIDE':CROSS_COMPILE)gcc:g' ${DIR}/KERNEL/Makefile
198-
fi
199-
else
200-
echo ""
201-
echo "ERROR: Missing (your system) specific system.sh, please copy system.sh.sample to system.sh and edit as needed."
165+
source ${DIR}/version.sh
166+
export LINUX_GIT
167+
export LATEST_GIT
168+
169+
if [ "${LATEST_GIT}" ] ; then
202170
echo ""
203-
echo "example: cp system.sh.sample system.sh"
204-
echo "example: gedit system.sh"
171+
echo "Warning LATEST_GIT is enabled from system.sh I hope you know what your doing.."
205172
echo ""
206173
fi
174+
175+
unset CONFIG_DEBUG_SECTION
176+
if [ "${DEBUG_SECTION}" ] ; then
177+
CONFIG_DEBUG_SECTION="CONFIG_DEBUG_SECTION_MISMATCH=y"
178+
fi
179+
180+
/bin/bash -e "${DIR}/scripts/git.sh" || { exit 1 ; }
181+
182+
if [ "${RUN_BISECT}" ] ; then
183+
/bin/bash -e "${DIR}/scripts/bisect.sh" || { exit 1 ; }
184+
fi
185+
186+
#patch_kernel
187+
copy_defconfig
188+
if [ ! ${AUTO_BUILD} ] ; then
189+
make_menuconfig
190+
fi
191+
if [ "x${GCC_OVERRIDE}" != "x" ] ; then
192+
sed -i -e 's:CROSS_COMPILE)gcc:CROSS_COMPILE)'$GCC_OVERRIDE':g' ${DIR}/KERNEL/Makefile
193+
fi
194+
make_kernel
195+
if [ "${BUILD_UIMAGE}" ] ; then
196+
make_uImage
197+
fi
198+
make_modules_pkg
199+
if [ "x${DTBS}" != "x" ] ; then
200+
make_dtbs_pkg
201+
fi
202+
make_headers_pkg
203+
if [ "x${GCC_OVERRIDE}" != "x" ] ; then
204+
sed -i -e 's:CROSS_COMPILE)'$GCC_OVERRIDE':CROSS_COMPILE)gcc:g' ${DIR}/KERNEL/Makefile
205+
fi

patches/defconfig

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2349,22 +2349,22 @@ CONFIG_W1_CON=y
23492349
#
23502350
# 1-wire Bus Masters
23512351
#
2352-
# CONFIG_W1_MASTER_DS2490 is not set
2353-
# CONFIG_W1_MASTER_DS2482 is not set
2354-
# CONFIG_W1_MASTER_DS1WM is not set
2355-
CONFIG_W1_MASTER_GPIO=m
2352+
CONFIG_W1_MASTER_DS2490=m
2353+
CONFIG_W1_MASTER_DS2482=m
2354+
CONFIG_W1_MASTER_DS1WM=m
2355+
CONFIG_W1_MASTER_GPIO=y
23562356
CONFIG_HDQ_MASTER_OMAP=m
23572357

23582358
#
23592359
# 1-wire Slaves
23602360
#
2361-
CONFIG_W1_SLAVE_THERM=m
2362-
CONFIG_W1_SLAVE_SMEM=m
2361+
CONFIG_W1_SLAVE_THERM=y
2362+
CONFIG_W1_SLAVE_SMEM=y
23632363
CONFIG_W1_SLAVE_DS2408=m
23642364
CONFIG_W1_SLAVE_DS2423=m
23652365
CONFIG_W1_SLAVE_DS2431=m
23662366
CONFIG_W1_SLAVE_DS2433=m
2367-
# CONFIG_W1_SLAVE_DS2433_CRC is not set
2367+
CONFIG_W1_SLAVE_DS2433_CRC=y
23682368
CONFIG_W1_SLAVE_DS2760=m
23692369
CONFIG_W1_SLAVE_DS2780=m
23702370
CONFIG_W1_SLAVE_DS2781=m
@@ -2373,7 +2373,7 @@ CONFIG_W1_SLAVE_BQ27000=m
23732373
CONFIG_POWER_SUPPLY=y
23742374
# CONFIG_POWER_SUPPLY_DEBUG is not set
23752375
# CONFIG_PDA_POWER is not set
2376-
# CONFIG_GENERIC_ADC_BATTERY is not set
2376+
CONFIG_GENERIC_ADC_BATTERY=m
23772377
# CONFIG_TEST_POWER is not set
23782378
# CONFIG_BATTERY_DS2760 is not set
23792379
# CONFIG_BATTERY_DS2780 is not set
@@ -2387,7 +2387,7 @@ CONFIG_POWER_SUPPLY=y
23872387
# CONFIG_CHARGER_MAX8903 is not set
23882388
# CONFIG_CHARGER_TWL4030 is not set
23892389
# CONFIG_CHARGER_LP8727 is not set
2390-
# CONFIG_CHARGER_GPIO is not set
2390+
CONFIG_CHARGER_GPIO=m
23912391
# CONFIG_CHARGER_MANAGER is not set
23922392
# CONFIG_CHARGER_SMB347 is not set
23932393
CONFIG_POWER_AVS=y
@@ -3879,13 +3879,13 @@ CONFIG_DMA_VIRTUAL_CHANNELS=y
38793879
#
38803880
# DMA Clients
38813881
#
3882-
# CONFIG_NET_DMA is not set
3883-
# CONFIG_ASYNC_TX_DMA is not set
3884-
# CONFIG_DMATEST is not set
3882+
CONFIG_NET_DMA=y
3883+
CONFIG_ASYNC_TX_DMA=y
3884+
CONFIG_DMATEST=m
38853885
# CONFIG_AUXDISPLAY is not set
3886-
CONFIG_UIO=m
3887-
CONFIG_UIO_PDRV=m
3888-
CONFIG_UIO_PDRV_GENIRQ=m
3886+
CONFIG_UIO=y
3887+
CONFIG_UIO_PDRV=y
3888+
CONFIG_UIO_PDRV_GENIRQ=y
38893889
# CONFIG_VFIO is not set
38903890
CONFIG_VIRTIO=m
38913891

0 commit comments

Comments
 (0)