From 60d819329833d5efaabf131bf4b15c2f1316b484 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 20 Feb 2020 18:52:34 +0100 Subject: s3c24xx-gpio, s3c64xx-gpio, sjf2410-linux-native, usbpath, wmiconfig: use git fetcher instead of svn fetcher * svn checkouts from http://svn.openmoko.org/ are now redirected to github: svn --non-interactive --trust-server-cert co --no-auth-cache --ignore-externals -r 4949 http://svn.openmoko.org/trunk/src/target/gpio@4949 gpio Redirecting to URL 'https://github.com/openmoko/openmoko-svn': A gpio/branches A gpio/branches/oe A gpio/branches/oe/pre-20070305 A gpio/branches/oe/pre-20070305/README A gpio/branches/oe/pre-20070305/classes A gpio/branches/oe/pre-20070305/classes/autotools.bbclass A gpio/branches/oe/pre-20070305/classes/base.bbclass A gpio/branches/oe/pre-20070305/classes/openmoko-base.bbclass A gpio/branches/oe/pre-20070305/classes/openmoko-panel-plugin.bbclass * unfortunately this is causing the checkout to start from trunk, not the subdirectory specified in the URL (e.g. /trunk/src/target/gpio) and then S variable points to incorrect directory as discussed here: http://lists.openembedded.org/pipermail/openembedded-devel/2020-February/205028.html * use git fetcher directly to remove the dependency on subversion-native * for simplicity use the same SRCREV and PV for all of these, there wasn't any commit in last 8 years (not anyone can expect new commits), I don't expect anyone nowadays actually using these recipes which I've imported from meta-smartphone in 2011 - that's why I will send their removal in follow-up commit. Signed-off-by: Martin Jansa Signed-off-by: Khem Raj (cherry picked from commit 6902dcd2edc3a08f6929e19e9a9c18493883f9d2) [ak: fixes build issue WARNING: s3c24xx-gpio-1.0+svnr4949-r2 do_populate_lic: Could not copy license file /home/build/builds/zeus/tmp-glibc/work/core2-64-oe-linux/s3c24xx-gpio/1.0+svnr4949-r2/gpio/gpio.c to /home/build/builds/zeus/tmp-glibc/work/core2-64-oe-linux/s3c24xx-gpio/1.0+svnr4949-r2/license-destdir/s3c24xx-gpio/gpio.c: [Errno 2] No such file or directory: '/home/build/builds/zeus/tmp-glibc/work/core2-64-oe-linux/s3c24xx-gpio/1.0+svnr4949-r2/gpio/gpio.c' ERROR: s3c24xx-gpio-1.0+svnr4949-r2 do_populate_lic: QA Issue: s3c24xx-gpio: LIC_FILES_CHKSUM points to an invalid file: /home/build/builds/zeus/tmp-glibc/work/core2-64-oe-linux/s3c24xx-gpio/1.0+svnr4949-r2/gpio/gpio.c [license-checksum] ] Signed-off-by: Armin Kuster --- .../samsung-soc-utils/s3c24xx-gpio_git.bb | 21 ++++++++++++++ .../samsung-soc-utils/s3c24xx-gpio_svn.bb | 22 --------------- .../samsung-soc-utils/s3c64xx-gpio_git.bb | 21 ++++++++++++++ .../samsung-soc-utils/s3c64xx-gpio_svn.bb | 21 -------------- .../samsung-soc-utils/sjf2410-linux-native_git.bb | 32 +++++++++++++++++++++ .../samsung-soc-utils/sjf2410-linux-native_svn.bb | 33 ---------------------- meta-oe/recipes-support/usbpath/usbpath_git.bb | 21 ++++++++++++++ meta-oe/recipes-support/usbpath/usbpath_svn.bb | 21 -------------- meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb | 24 ++++++++++++++++ meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb | 25 ---------------- 10 files changed, 119 insertions(+), 122 deletions(-) create mode 100644 meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_git.bb delete mode 100644 meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb create mode 100644 meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_git.bb delete mode 100644 meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb create mode 100644 meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_git.bb delete mode 100644 meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb create mode 100644 meta-oe/recipes-support/usbpath/usbpath_git.bb delete mode 100644 meta-oe/recipes-support/usbpath/usbpath_svn.bb create mode 100644 meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb delete mode 100644 meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_git.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_git.bb new file mode 100644 index 0000000000..98573a062c --- /dev/null +++ b/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_git.bb @@ -0,0 +1,21 @@ +SUMMARY = "A user-space tool to show and modify the state of GPIOs on the S3c24xx platform" +SECTION = "console/utils" +AUTHOR = "Werner Almesberger " +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://gpio.c;endline=12;md5=cfb91c686857b2e60852b4925d90a3e1" +PV = "1.0+git${SRCPV}" + +SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" +SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/gpio" +S = "${WORKDIR}/gpio" + +CLEANBROKEN = "1" + +do_compile() { + ${CC} ${CFLAGS} ${LDFLAGS} -o ${PN} gpio.c +} + +do_install() { + install -d ${D}${sbindir} + install -m 0755 ${PN} ${D}${sbindir} +} diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb deleted file mode 100644 index 255754d5d1..0000000000 --- a/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "A user-space tool to show and modify the state of GPIOs on the S3c24xx platform" -SECTION = "console/utils" -AUTHOR = "Werner Almesberger " -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://gpio.c;endline=12;md5=cfb91c686857b2e60852b4925d90a3e1" -SRCREV = "4949" -PV = "1.0+svnr${SRCPV}" -PR = "r2" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;protocol=http" -S = "${WORKDIR}/gpio" - -CLEANBROKEN = "1" - -do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} -o ${PN} gpio.c -} - -do_install() { - install -d ${D}${sbindir} - install -m 0755 ${PN} ${D}${sbindir} -} diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_git.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_git.bb new file mode 100644 index 0000000000..99781718c8 --- /dev/null +++ b/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_git.bb @@ -0,0 +1,21 @@ +SUMMARY = "A user-space tool to show and modify the state of GPIOs on the S3c64xx platform" +SECTION = "console/utils" +AUTHOR = "Werner Almesberger " +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://gpio-s3c6410.c;endline=12;md5=060cda1be945ad9194593f11d56d55c7" +PV = "1.0+git${SRCPV}" + +SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" +SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/gpio" +S = "${WORKDIR}/gpio" + +CLEANBROKEN = "1" + +do_compile() { + ${CC} ${CFLAGS} ${LDFLAGS} -o ${PN} gpio-s3c6410.c +} + +do_install() { + install -d ${D}${sbindir} + install -m 0755 ${PN} ${D}${sbindir} +} diff --git a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb deleted file mode 100644 index 976a4f15ec..0000000000 --- a/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "A user-space tool to show and modify the state of GPIOs on the S3c64xx platform" -SECTION = "console/utils" -AUTHOR = "Werner Almesberger " -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://gpio-s3c6410.c;endline=12;md5=060cda1be945ad9194593f11d56d55c7" -SRCREV = "4949" -PV = "1.0+svnr${SRCPV}" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;protocol=http" -S = "${WORKDIR}/gpio" - -CLEANBROKEN = "1" - -do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} -o ${PN} gpio-s3c6410.c -} - -do_install() { - install -d ${D}${sbindir} - install -m 0755 ${PN} ${D}${sbindir} -} diff --git a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_git.bb b/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_git.bb new file mode 100644 index 0000000000..7d468bae18 --- /dev/null +++ b/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_git.bb @@ -0,0 +1,32 @@ +SUMMARY = "JTAG utility to interface w/ a S3C2410 device" +SECTION = "devel" +AUTHOR = "Harald Welte " +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://parport.c;endline=19;md5=b5681091b0fd8c5f7068835c441bf0c8" +PV = "1.0+git${SRCPV}" + +SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" +SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/host/sjf2410-linux \ + file://0001-ppt.c-Do-not-include-sys-io.h.patch \ +" +S = "${WORKDIR}/sjf2410-linux" + +inherit native deploy +do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" + +CFLAGS += "-DLINUX_PPDEV" + +do_compile() { + oe_runmake +} + +do_install() { + install -d ${D}/${bindir} + install -m 0755 sjf2410 ${D}/${bindir} +} + +do_deploy() { + install -m 0755 sjf2410 ${DEPLOYDIR}/sjf2410-${PV} +} + +addtask deploy before do_build after do_install diff --git a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb b/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb deleted file mode 100644 index 9e609c4dd8..0000000000 --- a/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "JTAG utility to interface w/ a S3C2410 device" -SECTION = "devel" -AUTHOR = "Harald Welte " -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://parport.c;endline=19;md5=b5681091b0fd8c5f7068835c441bf0c8" -SRCREV = "4268" -PV = "0.1+svnr${SRCPV}" -PR = "r1" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;protocol=http \ - file://0001-ppt.c-Do-not-include-sys-io.h.patch \ - " -S = "${WORKDIR}/sjf2410-linux" - -inherit native deploy -do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}" - -CFLAGS += "-DLINUX_PPDEV" - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}/${bindir} - install -m 0755 sjf2410 ${D}/${bindir} -} - -do_deploy() { - install -m 0755 sjf2410 ${DEPLOYDIR}/sjf2410-${PV} -} - -addtask deploy before do_build after do_install diff --git a/meta-oe/recipes-support/usbpath/usbpath_git.bb b/meta-oe/recipes-support/usbpath/usbpath_git.bb new file mode 100644 index 0000000000..a3c75901fb --- /dev/null +++ b/meta-oe/recipes-support/usbpath/usbpath_git.bb @@ -0,0 +1,21 @@ +SUMMARY = "Convert the physical locations of a USB device to/from its number" +AUTHOR = "Werner Almesberger " +SECTION = "console/utils" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://usbpath.c;endline=20;md5=0aa8c7d2af9110c78a99fbf9a504dc3f" +DEPENDS = "virtual/libusb0" +DEPENDS_class-native = "virtual/libusb0-native" + +BBCLASSEXTEND = "native" + +PV = "1.0+git${SRCPV}" + +SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" +SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/host/usbpath \ + file://configure.patch \ +" +S = "${WORKDIR}/usbpath" + +inherit autotools pkgconfig + +RDEPENDS_${PN} += "perl" diff --git a/meta-oe/recipes-support/usbpath/usbpath_svn.bb b/meta-oe/recipes-support/usbpath/usbpath_svn.bb deleted file mode 100644 index 6c9cd049fe..0000000000 --- a/meta-oe/recipes-support/usbpath/usbpath_svn.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Convert the physical locations of a USB device to/from its number" -AUTHOR = "Werner Almesberger " -SECTION = "console/utils" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://usbpath.c;endline=20;md5=0aa8c7d2af9110c78a99fbf9a504dc3f" -DEPENDS = "virtual/libusb0" -DEPENDS_class-native = "virtual/libusb0-native" - -BBCLASSEXTEND = "native" - -SRCREV = "3172" -PV = "0.0+svnr${SRCPV}" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/host;module=usbpath;protocol=http \ - file://configure.patch" - -S = "${WORKDIR}/usbpath" - -inherit autotools pkgconfig - -RDEPENDS_${PN} += "perl" diff --git a/meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb b/meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb new file mode 100644 index 0000000000..23273caf8e --- /dev/null +++ b/meta-oe/recipes-support/wmiconfig/wmiconfig_git.bb @@ -0,0 +1,24 @@ +SUMMARY = "Atheros 6K Wifi configuration utility" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://wmiconfig.c;endline=19;md5=4394a56bca1c5b2446c9f8e406c82911" +SECTION = "console/network" +PV = "1.0+git${SRCPV}" + +SRCREV = "0bde889e6fc09a330d0e0b9eb9808b20b2bf13d1" +SRC_URI = "git://github.com/openmoko/openmoko-svn.git;protocol=https;subpath=src/target/AR6kSDK.build_sw.18 \ + file://0001-makefile-Pass-CFLAGS-to-compile.patch \ + file://0002-fix-err-API-to-have-format-string.patch \ +" +S = "${WORKDIR}/AR6kSDK.build_sw.18/host/tools/wmiconfig" + +CLEANBROKEN = "1" + +EXTRA_OEMAKE = "-e MAKEFLAGS=" + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_install() { + install -d ${D}${bindir} + install -m 0755 wmiconfig ${D}${bindir} +} + diff --git a/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb b/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb deleted file mode 100644 index c66572b1c1..0000000000 --- a/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Atheros 6K Wifi configuration utility" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://wmiconfig.c;endline=19;md5=4394a56bca1c5b2446c9f8e406c82911" -SECTION = "console/network" -SRCREV = "5394" -PV = "0.0.0+svnr${SRCPV}" -PR = "r2" - -SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=AR6kSDK.build_sw.18;protocol=http \ - file://0001-makefile-Pass-CFLAGS-to-compile.patch \ - file://0002-fix-err-API-to-have-format-string.patch \ - " -S = "${WORKDIR}/AR6kSDK.build_sw.18/host/tools/wmiconfig" - -CLEANBROKEN = "1" - -EXTRA_OEMAKE = "-e MAKEFLAGS=" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install() { - install -d ${D}${bindir} - install -m 0755 wmiconfig ${D}${bindir} -} - -- cgit 1.2.3-korg