snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

Merge pull request #257 from Gottox/master 

rename odroid packages to comply to the platform-naming-rules
This commit is contained in:
Juan RP 2014-01-23 00:15:43 -08:00
parent 6577bafde8 01b8f365b9
commit 051c9c1fd6
11 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
srcpkgs/kernel-headers-odroid-u2
View File

@ -1 +0,0 @@
kernel-odroid-u2/

2
srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.txt → srcpkgs/odroid-u2-base/files/boot-1024x768-noedid.ini
View File

@ -1,6 +1,6 @@
setenv initrd_high "0xffffffff" setenv initrd_high "0xffffffff"
setenv fdt_high "0xffffffff" setenv fdt_high "0xffffffff"
setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; fatload mmc 0:1 0x42000000 uInitrd; bootm 0x40008000 0x42000000" setenv bootcmd "fatload mmc 0:1 0x40008000 /zImage; bootm 0x40008000"
setenv edid_load "drm_kms_helper.edid_firmware=edid/1024x768.bin" setenv edid_load "drm_kms_helper.edid_firmware=edid/1024x768.bin"
setenv bootargs "console=tty1 console=ttySAC1,115200n8 ${edid_load} root=/dev/mmcblk0p2 rootwait ro mem=2047M" setenv bootargs "console=tty1 console=ttySAC1,115200n8 ${edid_load} root=/dev/mmcblk0p2 rootwait ro mem=2047M"
boot boot

2
srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-edid.txt → srcpkgs/odroid-u2-base/files/boot-1080p-edid.ini
View File

@ -1,6 +1,6 @@
setenv initrd_high "0xffffffff" setenv initrd_high "0xffffffff"
setenv fdt_high "0xffffffff" setenv fdt_high "0xffffffff"
setenv drm_video_mode "HDMI-A-1:1920x1080@60" setenv drm_video_mode "HDMI-A-1:1920x1080@60"
setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; fatload mmc 0:1 0x42000000 uInitrd; bootm 0x40008000 0x42000000" setenv bootcmd "fatload mmc 0:1 0x40008000 /zImage; bootm 0x40008000"
setenv bootargs "console=tty1 console=ttySAC1,115200n8 video=${drm_video_mode} root=/dev/mmcblk0p2 rootwait ro mem=2047M" setenv bootargs "console=tty1 console=ttySAC1,115200n8 video=${drm_video_mode} root=/dev/mmcblk0p2 rootwait ro mem=2047M"
boot boot

2
srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-noedid.txt → srcpkgs/odroid-u2-base/files/boot-1080p-noedid.ini
View File

@ -1,6 +1,6 @@
setenv initrd_high "0xffffffff" setenv initrd_high "0xffffffff"
setenv fdt_high "0xffffffff" setenv fdt_high "0xffffffff"
setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; fatload mmc 0:1 0x42000000 uInitrd; bootm 0x40008000 0x42000000" setenv bootcmd "fatload mmc 0:1 0x40008000 /zImage; bootm 0x40008000"
setenv edid_load "drm_kms_helper.edid_firmware=edid/1920x1080.bin" setenv edid_load "drm_kms_helper.edid_firmware=edid/1920x1080.bin"
setenv bootargs "console=tty1 console=ttySAC1,115200n8 ${edid_load} root=/dev/mmcblk0p2 rootwait ro mem=2047M" setenv bootargs "console=tty1 console=ttySAC1,115200n8 ${edid_load} root=/dev/mmcblk0p2 rootwait ro mem=2047M"
boot boot

2
srcpkgs/odroid-u2-ubootcfg/files/boot-720p-edid.txt → srcpkgs/odroid-u2-base/files/boot-720p-edid.ini
View File

@ -1,6 +1,6 @@
setenv initrd_high "0xffffffff" setenv initrd_high "0xffffffff"
setenv fdt_high "0xffffffff" setenv fdt_high "0xffffffff"
setenv drm_video_mode "HDMI-A-1:1280x720M@60" setenv drm_video_mode "HDMI-A-1:1280x720M@60"
setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; fatload mmc 0:1 0x42000000 uInitrd; bootm 0x40008000 0x42000000" setenv bootcmd "fatload mmc 0:1 0x40008000 /zImage; bootm 0x40008000"
setenv bootargs "console=tty1 console=ttySAC1,115200n8 video=${drm_video_mode} root=/dev/mmcblk0p2 rootwait ro mem=2047M" setenv bootargs "console=tty1 console=ttySAC1,115200n8 video=${drm_video_mode} root=/dev/mmcblk0p2 rootwait ro mem=2047M"
boot boot

2
srcpkgs/odroid-u2-ubootcfg/files/boot-720p-noedid.txt → srcpkgs/odroid-u2-base/files/boot-720p-noedid.ini
View File

@ -1,6 +1,6 @@
setenv initrd_high "0xffffffff" setenv initrd_high "0xffffffff"
setenv fdt_high "0xffffffff" setenv fdt_high "0xffffffff"
setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; fatload mmc 0:1 0x42000000 uInitrd; bootm 0x40008000 0x42000000" setenv bootcmd "fatload mmc 0:1 0x40008000 /zImage; bootm 0x40008000"
setenv edid_load "drm_kms_helper.edid_firmware=edid/1280x720.bin" setenv edid_load "drm_kms_helper.edid_firmware=edid/1280x720.bin"
setenv bootargs "console=tty1 console=ttySAC1,115200n8 ${edid_load} root=/dev/mmcblk0p2 rootwait ro mem=2047M" setenv bootargs "console=tty1 console=ttySAC1,115200n8 ${edid_load} root=/dev/mmcblk0p2 rootwait ro mem=2047M"
boot boot

5
srcpkgs/odroid-u2-base/files/boot-auto_edid.ini Normal file
View File

@ -0,0 +1,5 @@
setenv initrd_high "0xffffffff"
setenv fdt_high "0xffffffff"
setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; bootm 0x40008000"
setenv bootargs "console=tty1 console=ttySAC1,115200n8 root=root=/dev/mmcblk0p2 rootwait ro mem=2047M"
boot

20
srcpkgs/odroid-u2-ubootcfg/template → srcpkgs/odroid-u2-base/template
View File

@ -1,25 +1,29 @@
# Template file for 'odroid-u2-bootcfg' # Template file for 'odroid-u2-base'
pkgname=odroid-u2-ubootcfg pkgname=odroid-u2-base
version=1.1 version=1.0
revision=1 revision=1
homepage="http://hardkernel.com" homepage="http://www.voidlinux.eu"
hostmakedepends="uboot-mkimage" hostmakedepends="uboot-mkimage"
short_desc="odroid u2/u3 boot configuration" short_desc="ODROID U2/U3 base files"
maintainer="Enno Boland <eb@s01.de>" maintainer="Enno Boland <eb@s01.de>"
license="GPL-2.0" license="GPL-2.0"
provides="odroid-ubootcfg-${version}_${revision}"
replaces="odroid-ubootcfg>=0"
noarch=yes noarch=yes
_default_scr="boot-auto_edid.scr" _default_scr="boot-auto_edid.scr"
do_build() { do_build() {
for source in ${FILESDIR}/*.txt; do # Building uboot scr's
name=$(basename ${source%.txt}) for source in ${FILESDIR}/*.ini; do
name=$(basename ${source%.ini})
mkimage -A arm -T script -C none -n "${name}" -d $source ${name}.scr mkimage -A arm -T script -C none -n "${name}" -d $source ${name}.scr
done done
cp ${_default_scr} boot.scr cp ${_default_scr} boot.scr
} }
do_install() { do_install() {
# Installing uboot scr's
for scr in *.scr; do for scr in *.scr; do
echo $scr echo $scr
vinstall $scr 600 boot vinstall $scr 600 boot

1
srcpkgs/odroid-u2-kernel-headers Symbolic link
View File

@ -0,0 +1 @@
odroid-u2-kernel

21
srcpkgs/kernel-odroid-u2/template → srcpkgs/odroid-u2-kernel/template
View File

@ -1,9 +1,9 @@
# Template file for 'kernel-odroid-u2' # Template file for 'odroid-u2-kernel'
# #
# Latest commit as of 20140121 # Latest commit as of 20140123
_githash="9277d733a276fb27da1061d5210ac3c45a16ac18" _githash="452f4a053d69404a1f69fd3aa4af8ee6524ab2b2"
pkgname=kernel-odroid-u2 pkgname=odroid-u2-kernel
version=3.8.13.14 version=3.8.13.14
revision=1 revision=1
maintainer="Enno Boland <eb@s01.de>" maintainer="Enno Boland <eb@s01.de>"
@ -12,8 +12,10 @@ license="GPL-2"
short_desc="The Linux kernel and modules for the Odroid U2/U3 (3.12 series [git ${_githash}])" short_desc="The Linux kernel and modules for the Odroid U2/U3 (3.12 series [git ${_githash}])"
create_srcdir=yes create_srcdir=yes
distfiles="https://github.com/hardkernel/linux/archive/${_githash}.tar.gz" distfiles="https://github.com/hardkernel/linux/archive/${_githash}.tar.gz"
checksum=894cdbbdd0e5ef3ec4b57e4aef57f52fd83ed6fa99a2dc11aaca96ef028a9c99 checksum=b351402dda80802c006574e319f39c22ef8ca48e049d65a9224fb518d67ffa3c
wrksrc="linux-${_githash}" wrksrc="linux-${_githash}"
provides="kernel-odroid-u2-${version}_${revision}"
replaces="kernel-odroid-u2>=0"
_kernver="${version}_${revision}" _kernver="${version}_${revision}"
@ -45,6 +47,9 @@ do_configure() {
# Always use our revision to CONFIG_LOCALVERSION to match our pkg version. # Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
# Enable Autofs for systemd
sed -i -e "s|.*CONFIG_AUTOFS4_FS.*|CONFIG_AUTOFS4_FS=y|" .config
} }
do_build() { do_build() {
@ -67,7 +72,7 @@ do_install() {
vinstall arch/arm/boot/zImage 644 boot vinstall arch/arm/boot/zImage 644 boot
hdrdest=${DESTDIR}/usr/src/kernel-headers-odroid-${_kernver} hdrdest=${DESTDIR}/usr/src/odroid-u2-kernel-headers-${_kernver}
# Switch to /usr. # Switch to /usr.
vmkdir usr vmkdir usr
@ -75,7 +80,7 @@ do_install() {
cd ${DESTDIR}/usr/lib/modules/${_kernver} cd ${DESTDIR}/usr/lib/modules/${_kernver}
rm -f source build rm -f source build
ln -sf ../../../src/kernel-headers-odroid-${_kernver} build ln -sf ../../../src/odroid-u2-kernel-headers-${_kernver} build
cd ${wrksrc} cd ${wrksrc}
@ -152,7 +157,7 @@ do_install() {
depmod -b ${DESTDIR}/usr -F System.map ${_kernver} depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
} }
kernel-headers-odroid-u2_package() { odroid-u2-kernel-headers_package() {
nostrip=yes nostrip=yes
noverifyrdeps=yes noverifyrdeps=yes
short_desc="Linux kernel headers for the Odroid U2/U3 (3.12 series [${_githash}])" short_desc="Linux kernel headers for the Odroid U2/U3 (3.12 series [${_githash}])"

5
srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.txt
View File

@ -1,5 +0,0 @@
setenv initrd_high "0xffffffff"
setenv fdt_high "0xffffffff"
setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; fatload mmc 0:1 0x42000000 uInitrd; bootm 0x40008000 0x42000000"
setenv bootargs "console=tty1 console=ttySAC1,115200n8 root=/dev/mmcblk0p2 rootwait ro mem=2047M"
boot