archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-11-18 22:54:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Trying to fix the build, it is not accepting the current PKGBUILD.

Browse source
This commit is contained in:
Willam Christensen 2014-07-26 11:03:25 -06:00
parent b29437b3a8
commit a07c1e1773
1 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
alarm/uboot-sunxi/PKGBUILD
View file

@ -23,18 +23,11 @@ source=("https://github.com/linux-sunxi/u-boot-sunxi/archive/${_commit}.tar.gz"
'iteaduino_plus_a20.fex' 'iteaduino_plus_a20.env'
'hackberry.fex' 'hackberry.env'
'a20-olinuxino_micro.fex' 'a20-olinuxino_micro.env'
<<<<<<< HEAD
'a13-olinuxinom.fex' 'a13-olinuxinom.env'
'a10s-olinuxino-m.fex' 'a10s-olinuxino-m.env'
'a10s-olinuxino-m-lcd7.fex' 'a10s-olinuxino-m-lcd7.env')
md5sums=('7b28f844d7b143b4f214cab9582681c8'
'c52abd6e8b1bc6d367809b5a7950d733'
=======
'a13-olinuxino.fex' 'a13-olinuxino.env'
'a10s-olinuxino-m.fex' 'a10s-olinuxino-m.env')
md5sums=('8e4f2a2c1384f31eca5d3864b86e8351'
'234ac383320992dea6734cc442075558'
>>>>>>> c7c1bb301bf87a96f084c1a80113eb3141ef05b4
'36c04988cecd53151f3f5ff5c48d76a9'
'd41d8cd98f00b204e9800998ecf8427e'
'c898ab1b57f474d620f5704b2a53d87c'
@ -47,20 +40,12 @@ md5sums=('8e4f2a2c1384f31eca5d3864b86e8351'
'd41d8cd98f00b204e9800998ecf8427e'
'2cac23939b761d1ea668faa2c68b3688'
'd41d8cd98f00b204e9800998ecf8427e'
<<<<<<< HEAD
'0e4011773c1ec3aff4d5ca18fae84672'
'd41d8cd98f00b204e9800998ecf8427e'
'42275d119245b774231f596b02a1886e'
'd41d8cd98f00b204e9800998ecf8427e'
'a85c332f2ed96b02354bd16275aeca3f'
'd41d8cd98f00b204e9800998ecf8427e')
=======
'140dfb45c5babf413937605b347c7321'
'd41d8cd98f00b204e9800998ecf8427e'
'42275d119245b774231f596b02a1886e'
'd41d8cd98f00b204e9800998ecf8427e')
>>>>>>> c7c1bb301bf87a96f084c1a80113eb3141ef05b4
prepare() {
cd u-boot-sunxi-${_commit}
patch -p1 -i "${srcdir}"/alarm.patch