From 3772c9687505f2bf04e9c66082321fa245377f05 Mon Sep 17 00:00:00 2001 From: Gottox Date: Thu, 23 Jan 2014 00:32:40 +0100 Subject: [PATCH 1/5] odroid-u2-ubootcfg: correct bootcmd; the common naming for uncompiled scr files is .ini. So they are renamed now. --- .../{boot-1024x768-noedid.txt => boot-1024x768-noedid.ini} | 2 +- .../files/{boot-1080p-edid.txt => boot-1080p-edid.ini} | 2 +- .../files/{boot-1080p-noedid.txt => boot-1080p-noedid.ini} | 2 +- .../files/{boot-720p-edid.txt => boot-720p-edid.ini} | 2 +- .../files/{boot-720p-noedid.txt => boot-720p-noedid.ini} | 2 +- srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.ini | 5 +++++ srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.txt | 5 ----- srcpkgs/odroid-u2-ubootcfg/template | 6 +++--- 8 files changed, 13 insertions(+), 13 deletions(-) rename srcpkgs/odroid-u2-ubootcfg/files/{boot-1024x768-noedid.txt => boot-1024x768-noedid.ini} (67%) rename srcpkgs/odroid-u2-ubootcfg/files/{boot-1080p-edid.txt => boot-1080p-edid.ini} (66%) rename srcpkgs/odroid-u2-ubootcfg/files/{boot-1080p-noedid.txt => boot-1080p-noedid.ini} (67%) rename srcpkgs/odroid-u2-ubootcfg/files/{boot-720p-edid.txt => boot-720p-edid.ini} (66%) rename srcpkgs/odroid-u2-ubootcfg/files/{boot-720p-noedid.txt => boot-720p-noedid.ini} (67%) create mode 100644 srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.ini delete mode 100644 srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.txt diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.txt b/srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.ini similarity index 67% rename from srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.txt rename to srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.ini index 8c1909aefca..f04278a8f80 100644 --- a/srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.txt +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.ini @@ -1,6 +1,6 @@ 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 bootcmd "fatload mmc 0:1 0x40008000 /zImage; bootm 0x40008000" 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" boot diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-edid.txt b/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-edid.ini similarity index 66% rename from srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-edid.txt rename to srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-edid.ini index 0b381679d87..00feab17199 100644 --- a/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-edid.txt +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-edid.ini @@ -1,6 +1,6 @@ setenv initrd_high "0xffffffff" setenv fdt_high "0xffffffff" 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" boot diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-noedid.txt b/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-noedid.ini similarity index 67% rename from srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-noedid.txt rename to srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-noedid.ini index 48d3c45c721..3b051d85963 100644 --- a/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-noedid.txt +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-noedid.ini @@ -1,6 +1,6 @@ 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 bootcmd "fatload mmc 0:1 0x40008000 /zImage; bootm 0x40008000" 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" boot diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-edid.txt b/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-edid.ini similarity index 66% rename from srcpkgs/odroid-u2-ubootcfg/files/boot-720p-edid.txt rename to srcpkgs/odroid-u2-ubootcfg/files/boot-720p-edid.ini index 7e798659f8e..994a8cf080e 100644 --- a/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-edid.txt +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-edid.ini @@ -1,6 +1,6 @@ setenv initrd_high "0xffffffff" setenv fdt_high "0xffffffff" 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" boot diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-noedid.txt b/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-noedid.ini similarity index 67% rename from srcpkgs/odroid-u2-ubootcfg/files/boot-720p-noedid.txt rename to srcpkgs/odroid-u2-ubootcfg/files/boot-720p-noedid.ini index 3e5db2abe77..b8692e27d45 100644 --- a/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-noedid.txt +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-noedid.ini @@ -1,6 +1,6 @@ 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 bootcmd "fatload mmc 0:1 0x40008000 /zImage; bootm 0x40008000" 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" boot diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.ini b/srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.ini new file mode 100644 index 00000000000..914df3d5e5c --- /dev/null +++ b/srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.ini @@ -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 diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.txt b/srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.txt deleted file mode 100644 index ea48cc74e95..00000000000 --- a/srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.txt +++ /dev/null @@ -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 diff --git a/srcpkgs/odroid-u2-ubootcfg/template b/srcpkgs/odroid-u2-ubootcfg/template index d75577811a7..5721c68500c 100644 --- a/srcpkgs/odroid-u2-ubootcfg/template +++ b/srcpkgs/odroid-u2-ubootcfg/template @@ -1,7 +1,7 @@ # Template file for 'odroid-u2-bootcfg' pkgname=odroid-u2-ubootcfg version=1.0 -revision=1 +revision=2 homepage="http://hardkernel.com" hostmakedepends="uboot-mkimage" short_desc="odroid u2/u3 boot configuration" @@ -11,8 +11,8 @@ license="GPL-2.0" _default_scr="boot-auto_edid.scr" do_build() { - for source in ${FILESDIR}/*.txt; do - 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 done cp ${_default_scr} boot.scr From 1291b005594bad3fbf4b2379ff322c2e5f630048 Mon Sep 17 00:00:00 2001 From: Gottox Date: Thu, 23 Jan 2014 01:33:45 +0100 Subject: [PATCH 2/5] renaming kernel-odroid-u2 to odroid-u2-kernel; version bump; enable AUTOFS4 --- srcpkgs/kernel-headers-odroid-u2 | 1 - srcpkgs/odroid-u2-kernel-headers | 1 + .../template | 21 ++++++++++++------- 3 files changed, 14 insertions(+), 9 deletions(-) delete mode 120000 srcpkgs/kernel-headers-odroid-u2 create mode 120000 srcpkgs/odroid-u2-kernel-headers rename srcpkgs/{kernel-odroid-u2 => odroid-u2-kernel}/template (88%) diff --git a/srcpkgs/kernel-headers-odroid-u2 b/srcpkgs/kernel-headers-odroid-u2 deleted file mode 120000 index b3a59db17e5..00000000000 --- a/srcpkgs/kernel-headers-odroid-u2 +++ /dev/null @@ -1 +0,0 @@ -kernel-odroid-u2/ \ No newline at end of file diff --git a/srcpkgs/odroid-u2-kernel-headers b/srcpkgs/odroid-u2-kernel-headers new file mode 120000 index 00000000000..61543d3a459 --- /dev/null +++ b/srcpkgs/odroid-u2-kernel-headers @@ -0,0 +1 @@ +odroid-u2-kernel \ No newline at end of file diff --git a/srcpkgs/kernel-odroid-u2/template b/srcpkgs/odroid-u2-kernel/template similarity index 88% rename from srcpkgs/kernel-odroid-u2/template rename to srcpkgs/odroid-u2-kernel/template index 6f48c1a4684..ba1435ed045 100644 --- a/srcpkgs/kernel-odroid-u2/template +++ b/srcpkgs/odroid-u2-kernel/template @@ -1,9 +1,9 @@ -# Template file for 'kernel-odroid-u2' +# Template file for 'odroid-u2-kernel' # -# Latest commit as of 20140121 -_githash="9277d733a276fb27da1061d5210ac3c45a16ac18" +# Latest commit as of 20140123 +_githash="452f4a053d69404a1f69fd3aa4af8ee6524ab2b2" -pkgname=kernel-odroid-u2 +pkgname=odroid-u2-kernel version=3.8.13.14 revision=1 maintainer="Enno Boland " @@ -12,8 +12,10 @@ license="GPL-2" short_desc="The Linux kernel and modules for the Odroid U2/U3 (3.12 series [git ${_githash}])" create_srcdir=yes distfiles="https://github.com/hardkernel/linux/archive/${_githash}.tar.gz" -checksum=894cdbbdd0e5ef3ec4b57e4aef57f52fd83ed6fa99a2dc11aaca96ef028a9c99 +checksum=b351402dda80802c006574e319f39c22ef8ca48e049d65a9224fb518d67ffa3c wrksrc="linux-${_githash}" +provides="kernel-odroid-u2-${version}_${revision}" +replaces="kernel-odroid-u2>=0" _kernver="${version}_${revision}" @@ -45,6 +47,9 @@ do_configure() { # Always use our revision to CONFIG_LOCALVERSION to match our pkg version. 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() { @@ -67,7 +72,7 @@ do_install() { 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. vmkdir usr @@ -75,7 +80,7 @@ do_install() { cd ${DESTDIR}/usr/lib/modules/${_kernver} rm -f source build - ln -sf ../../../src/kernel-headers-odroid-${_kernver} build + ln -sf ../../../src/odroid-u2-kernel-headers-${_kernver} build cd ${wrksrc} @@ -152,7 +157,7 @@ do_install() { depmod -b ${DESTDIR}/usr -F System.map ${_kernver} } -kernel-headers-odroid-u2_package() { +odroid-u2-kernel-headers_package() { nostrip=yes noverifyrdeps=yes short_desc="Linux kernel headers for the Odroid U2/U3 (3.12 series [${_githash}])" From 8bcef889561fb9776fc0575dab8864e697176ef0 Mon Sep 17 00:00:00 2001 From: Gottox Date: Thu, 23 Jan 2014 01:41:54 +0100 Subject: [PATCH 3/5] rename odroid-u2-ubootcfg odroid-u2-base --- .../files/boot-1024x768-noedid.ini | 0 .../files/boot-1080p-edid.ini | 0 .../files/boot-1080p-noedid.ini | 0 .../files/boot-720p-edid.ini | 0 .../files/boot-720p-noedid.ini | 0 .../files/boot-auto_edid.ini | 0 .../template | 15 ++++++++++----- 7 files changed, 10 insertions(+), 5 deletions(-) rename srcpkgs/{odroid-u2-ubootcfg => odroid-u2-base}/files/boot-1024x768-noedid.ini (100%) rename srcpkgs/{odroid-u2-ubootcfg => odroid-u2-base}/files/boot-1080p-edid.ini (100%) rename srcpkgs/{odroid-u2-ubootcfg => odroid-u2-base}/files/boot-1080p-noedid.ini (100%) rename srcpkgs/{odroid-u2-ubootcfg => odroid-u2-base}/files/boot-720p-edid.ini (100%) rename srcpkgs/{odroid-u2-ubootcfg => odroid-u2-base}/files/boot-720p-noedid.ini (100%) rename srcpkgs/{odroid-u2-ubootcfg => odroid-u2-base}/files/boot-auto_edid.ini (100%) rename srcpkgs/{odroid-u2-ubootcfg => odroid-u2-base}/template (58%) diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.ini b/srcpkgs/odroid-u2-base/files/boot-1024x768-noedid.ini similarity index 100% rename from srcpkgs/odroid-u2-ubootcfg/files/boot-1024x768-noedid.ini rename to srcpkgs/odroid-u2-base/files/boot-1024x768-noedid.ini diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-edid.ini b/srcpkgs/odroid-u2-base/files/boot-1080p-edid.ini similarity index 100% rename from srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-edid.ini rename to srcpkgs/odroid-u2-base/files/boot-1080p-edid.ini diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-noedid.ini b/srcpkgs/odroid-u2-base/files/boot-1080p-noedid.ini similarity index 100% rename from srcpkgs/odroid-u2-ubootcfg/files/boot-1080p-noedid.ini rename to srcpkgs/odroid-u2-base/files/boot-1080p-noedid.ini diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-edid.ini b/srcpkgs/odroid-u2-base/files/boot-720p-edid.ini similarity index 100% rename from srcpkgs/odroid-u2-ubootcfg/files/boot-720p-edid.ini rename to srcpkgs/odroid-u2-base/files/boot-720p-edid.ini diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-720p-noedid.ini b/srcpkgs/odroid-u2-base/files/boot-720p-noedid.ini similarity index 100% rename from srcpkgs/odroid-u2-ubootcfg/files/boot-720p-noedid.ini rename to srcpkgs/odroid-u2-base/files/boot-720p-noedid.ini diff --git a/srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.ini b/srcpkgs/odroid-u2-base/files/boot-auto_edid.ini similarity index 100% rename from srcpkgs/odroid-u2-ubootcfg/files/boot-auto_edid.ini rename to srcpkgs/odroid-u2-base/files/boot-auto_edid.ini diff --git a/srcpkgs/odroid-u2-ubootcfg/template b/srcpkgs/odroid-u2-base/template similarity index 58% rename from srcpkgs/odroid-u2-ubootcfg/template rename to srcpkgs/odroid-u2-base/template index 5721c68500c..89605782e14 100644 --- a/srcpkgs/odroid-u2-ubootcfg/template +++ b/srcpkgs/odroid-u2-base/template @@ -1,16 +1,20 @@ -# Template file for 'odroid-u2-bootcfg' -pkgname=odroid-u2-ubootcfg +# Template file for 'odroid-u2-base' +pkgname=odroid-u2-base version=1.0 -revision=2 -homepage="http://hardkernel.com" +revision=1 +homepage="http://www.voidlinux.eu" hostmakedepends="uboot-mkimage" -short_desc="odroid u2/u3 boot configuration" +depends="base-system" +short_desc="ODROID U2/U3 base files" maintainer="Enno Boland " license="GPL-2.0" +provides="odroid-ubootcfg-${version}_${revision}" +replaces="odroid-ubootcfg>=0" _default_scr="boot-auto_edid.scr" do_build() { + # Building uboot scr's for source in ${FILESDIR}/*.ini; do name=$(basename ${source%.ini}) mkimage -A arm -T script -C none -n "${name}" -d $source ${name}.scr @@ -19,6 +23,7 @@ do_build() { } do_install() { + # Installing uboot scr's for scr in *.scr; do echo $scr vinstall $scr 600 boot From f71059343f2a41ba2d3943b255c16cce0c0f66a5 Mon Sep 17 00:00:00 2001 From: Gottox Date: Thu, 23 Jan 2014 01:47:57 +0100 Subject: [PATCH 4/5] odroid-u2-bootcfg: switch to noarch again. --- srcpkgs/odroid-u2-base/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/odroid-u2-base/template b/srcpkgs/odroid-u2-base/template index 89605782e14..e3a9cd1fd85 100644 --- a/srcpkgs/odroid-u2-base/template +++ b/srcpkgs/odroid-u2-base/template @@ -10,6 +10,7 @@ maintainer="Enno Boland " license="GPL-2.0" provides="odroid-ubootcfg-${version}_${revision}" replaces="odroid-ubootcfg>=0" +noarch=yes _default_scr="boot-auto_edid.scr" From 01b8f365b9d3eaa02dae378b7e17bcdf1f170053 Mon Sep 17 00:00:00 2001 From: Gottox Date: Thu, 23 Jan 2014 01:54:07 +0100 Subject: [PATCH 5/5] odroid-u2-base: remove base-system depency --- srcpkgs/odroid-u2-base/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/odroid-u2-base/template b/srcpkgs/odroid-u2-base/template index e3a9cd1fd85..262f44ea302 100644 --- a/srcpkgs/odroid-u2-base/template +++ b/srcpkgs/odroid-u2-base/template @@ -4,7 +4,6 @@ version=1.0 revision=1 homepage="http://www.voidlinux.eu" hostmakedepends="uboot-mkimage" -depends="base-system" short_desc="ODROID U2/U3 base files" maintainer="Enno Boland " license="GPL-2.0"