Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update zoneinfo-utils to 2023c #702

Merged
merged 16 commits into from
Jan 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pr-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
jobs:
check-labels:
name: Check that PRs against the stable branch are labelled correctly
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Check labels
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
jobs:
lint:
name: Check that it conforms to the style guide
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout the Git repository
uses: actions/checkout@v3
Expand All @@ -16,15 +16,15 @@ jobs:
run: make lint
pr:
name: Check that it builds without error
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: lint
steps:
- name: Checkout the Git repository
uses: actions/checkout@v3
- name: Setup Toltec dependencies
uses: ./.github/actions/setup
- name: Build packages
run: make repo-new FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}'
run: FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}' make repo-new
- name: Save the build output
uses: actions/upload-artifact@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
stable:
name: Build and publish the stable channel
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout the Git repository
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
testing:
name: Build and publish the testing channel
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout the Git repository
uses: actions/checkout@v3
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ RECIPES=$(shell ls package/)
RECIPES_PUSH=$(foreach app, $(RECIPES), $(app)-push)
RECIPES_CLEAN=$(foreach app, $(RECIPES), $(app)-clean)

ifeq ($(RUNNER_DEBUG), 1)
FLAGS+= --verbose
endif

define USAGE
Building packages:

Expand Down
24 changes: 14 additions & 10 deletions package/zoneinfo-utils/package
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,24 @@
pkgnames=(zoneinfo-utils)
pkgdesc="Utilities for interacting with zoneinfo files"
url=https://www.iana.org/time-zones
_tzver=2021a
pkgver="$_tzver"-2
timestamp=2020-05-04T06:16Z
_tzver=2023c
pkgver="$_tzver"-1
timestamp=2023-03-28T00:00Z
section=utils
maintainer="Eeems <eeems@eeems.email>"
license="custom: public domain"
installdepends=(zoneinfo-core)
makedepends=(build:gawk)
flags=(nostrip)

image=base:v2.1
image=base:v3.0
source=(
"https://www.iana.org/time-zones/repository/releases/tzcode${_tzver}.tar.gz"
"https://www.iana.org/time-zones/repository/releases/tzdata${_tzver}.tar.gz"
)
sha256sums=(
eb46bfa124b5b6bd13d61a609bfde8351bd192894708d33aa06e5c1e255802d0
39e7d2ba08c68cbaefc8de3227aab0dec2521be8042cf56855f7dc3a9fb14e08
46d17f2bb19ad73290f03a203006152e0fa0d7b11e5b71467c4a823811b214e7
3f510b5d1b4ae9bb38e485aa302a776b317fb3637bdb6404c4adf7b6cadd965c
)

prepare() {
Expand All @@ -35,17 +36,20 @@ build() {
pushd .x86 > /dev/null

shopt -s extglob
cp -r ../* .
make VERSION="$_tzver"
ln -s ../* .
make VERSION="$_tzver" zic
mv zic ../zic.x86

popd > /dev/null

rm -r .x86
make VERSION="$_tzver" CC=arm-linux-gnueabihf-cc
"${CROSS_COMPILE}strip" --strip-all zic zdump
}

package() {
pushd "${srcdir}" > /dev/null
local zic=.x86/zic

local zic=./zic.x86
# install tzcode stuff
make DESTDIR="${pkgdir}" zic="$zic" install
# install license
Expand Down