blob: eb9c9e850dd496978e0ce8af89d07f5c09723f29 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
. $(dirname $0)/functions
vertonumber () {
local VERSIONID=$1
local V1=$(echo $VERSIONID | cut -d. -f1)
local V2=$(echo $VERSIONID | cut -d. -f2)
local V3=$(echo $VERSIONID | cut -d. -f3)
local V="$V1$V2$V3"
echo -n $V
}
numbertover () {
local VERSIONID=$1
local V1=$(echo $VERSIONID | cut -d. -f1)
local V2=$(echo $VERSIONID | cut -d. -f2)
local V3=$(echo $VERSIONID | cut -d. -f3)
local V="v$V1.$V2.$V3"
echo -n $V
}
cd $SRC/platform/external
if [ -d libusb-upstream ]; then
cd libusb-upstream
git checkout master
git pull
else
#git clone git://git.libusb.org/libusb.git libusb-upstream
git clone git://github.com/libusb/libusb.git libusb-upstream
cd libusb-upstream
fi
#NEW_VERSION=$(latest $(git tag | grep ^v | cut -c 2-))
#NEW_VERSION=$(latest $(git tag | grep ^v | cut -d '-' -f1 | cut -c2-))
NEW_VERSION=$(grep 'define LIBUSB_MAJOR' libusb/version.h |cut -d' ' -f3).$(grep 'define LIBUSB_MINOR' libusb/version.h |cut -d' ' -f3).$(grep 'define LIBUSB_MICRO' libusb/version.h |cut -d' ' -f3)
NEW_VERSION_LIBUSB_NANO=$(grep 'define LIBUSB_NANO' libusb/version_nano.h |cut -d' ' -f3)
NEW_VERSION_LIBUSB_RC=$(grep 'define LIBUSB_RC' libusb/version.h |cut -d' ' -f3 | cut -d \" -f2)
echo "NEW_VERSION = $NEW_VERSION"
echo "NEW_VERSION_LIBUSB_RC = $NEW_VERSION_LIBUSB_RC"
echo "NEW_VERSION_LIBUSB_NANO = $NEW_VERSION_LIBUSB_NANO"
checkout platform/external/libusb
cd $SRC/platform/external/libusb
if git branch -a | grep -q linaro-upstream-$NEW_VERSION; then
ok "libusb is up to date."
exit 0
fi
git checkout -b linaro-upstream-work-$TIMESTAMP aosp/master
#AOSPVER=$(grep PACKAGE_VERSION config.h | cut -d \" -f2)
AOSPVER=$(grep 'define LIBUSB_MAJOR' libusb/version.h |cut -d' ' -f3).$(grep 'define LIBUSB_MINOR' libusb/version.h |cut -d' ' -f3).$(grep 'define LIBUSB_MICRO' libusb/version.h |cut -d' ' -f3)
AOSPVER_LIBUSB_NANO=$(grep 'define LIBUSB_NANO' libusb/version_nano.h |cut -d' ' -f3)
AOSPVER_LIBUSB_RC=$(grep 'define LIBUSB_RC' libusb/version.h |cut -d' ' -f3 | cut -d \" -f2)
echo "AOSPVER = $AOSPVER"
echo "AOSPVER_LIBUSB_RC = $AOSPVER_LIBUSB_RC"
echo "AOSPVER_LIBUSB_NANO = $AOSPVER_LIBUSB_NANO"
if [ "$(vertonumber $NEW_VERSION)" -lt "$(vertonumber $AOSPVER)" ]; then
notice "libusb is up to date in AOSP master, copying its work"
else
if [[ "$(vertonumber $NEW_VERSION)" -eq "$(vertonumber $AOSPVER)" ]] && [[ "$NEW_VERSION_LIBUSB_NANO" -le "$AOSPVER_LIBUSB_NANO" ]]; then
notice "libusb is up to date in AOSP master, copying its work"
exit 0
fi
LATEST_LINARO=$(latest $(git branch -a |grep origin/linaro-upstream |sed -e 's,.*-,,'))
echo "LATEST_LINARO = $LATEST_LINARO"
if [ -n "$LATEST_LINARO" ]; then
if [ "$(latest $LATEST_LINARO $AOSPVER)" != "$AOSPVER" ]; then
git checkout linaro-upstream-$LATEST_LINARO || git checkout -b linaro-upstream-$LATEST_LINARO origin/linaro-upstream-$LATEST_LINARO
fi
fi
notice "Updating libusb to $NEW_VERSION"
rm -f Android.patch
cd ../libusb-upstream
git checkout -b linaro-upstream-work-$TIMESTAMP $(numbertover $AOSPVER$AOSPVER_LIBUSB_RC)
cd ../libusb
diff -ruN ../libusb-upstream/libusb libusb > Android.patch
cd ../libusb-upstream
git checkout master
git branch -D linaro-upstream-work-$TIMESTAMP
git checkout -b linaro-upstream-work-$TIMESTAMP $(numbertover $NEW_VERSION$NEW_VERSION_LIBUSB_RC)
cd ../libusb
rm -rf libusb
cp -rf ../libusb-upstream/libusb .
if patch -p0 < Android.patch; then
notice "Auto-updated libusb to $NEW_VERSION$NEW_VERSION_LIBUSB_RC."
git commit -asm "Update to libusb $NEW_VERSION"
git clean -d -f -x
else
error "Couldn't auto-update libusb - patch failed to apply."
error "Please fix manually and commit to a branch called"
error "linaro-upstream-$NEW_VERSION."
exit 1
fi
cd ../libusb-upstream
git checkout master
git branch -D linaro-upstream-work-$TIMESTAMP
cd ../libusb
fi
git push origin linaro-upstream-work-$TIMESTAMP:linaro-upstream-$AOSPVER
git pull
git checkout -b linaro-upstream-$AOSPVER origin/linaro-upstream-$AOSPVER
git branch -D linaro-upstream-work-$TIMESTAMP
pwd
|
