Skip to content

Commit

Permalink
fix patch
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesknap committed Mar 6, 2024
1 parent c3f5793 commit 71bb33b
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 22 deletions.
7 changes: 3 additions & 4 deletions .devcontainer/postCreateCommand
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,16 @@
################################################################################

if [[ $USER != "root" ]] ; then
# make sure the non-root user can build iocs and (mounted in) support modules
sudo chown -R ${USER}:${USER} /epics/ibek-defs /epics/pvi-defs /epics/support/configure /venv
sudo chown -h ${USER}:${USER} /epics /epics/ioc /epics/support
# make sure the non-root user can interact with the rtems BSP and RSB
sudo chown -R ${USER}:${USER} /rtems*/rsb /rtems*/rtems
fi

################################################################################
# Shell customizations for Generic IOC devcontainers
################################################################################

# pick a theme that does not cause completion corruption in zsh
sed -i $HOME/.zshrc -e 's/ZSH_THEME="devcontainers"/ZSH_THEME="eastwood"/'
sed -i $HOME/.zshrc -e 's/ZSH_THEME="devcontainers"/ZSH_THEME="dst"/'

# allow personalization of all devcontainers in this subdirectory
# by placing a .devcontainer_rc file in the workspace root
Expand Down
19 changes: 1 addition & 18 deletions local_patch/patch-rsb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,4 @@ set -xe
mkdir -p $RSB/rtems/patches
cp $THIS/gcc.patch $RSB/rtems/patches

# patch the gcc config file to use the above patch
echo '
--- a/rsb/rtems/config/tools/rtems-gcc-13.2-newlib-head.cfg
+++ b/rsb/rtems/config/tools/rtems-gcc-13.2-newlib-head.cfg
@@ -13,12 +13,8 @@
%hash sha512 newlib-%{newlib_version}.tar.gz \
ia0ce+bdENUO3qYj00jrZB8FjSejmTWuRqEdNE8nI2llf30mh8leUn5fCoHB0Oa7rRVBjEu3n0F12ZK9skuegQ==
-%patch add gcc file:///local_patch/gcc.patch
-%hash sha256 gcc.patch f3fd225acc18ddd16543e02d014a2cc1541216c9d9e9dd0143aa5cf74c09b54b
-
%define with_threads 1
%define with_plugin 0
%define with_iconv 1
%include %{_configdir}/gcc-13.cfg
-
' | git apply
cp $THIS/rtems-gcc-13.2-newlib-head.cfg /rtems6-beatnik-legacy/rsb/rtems/config/tools/rtems-gcc-13.2-newlib-head.cfg
20 changes: 20 additions & 0 deletions local_patch/rtems-gcc-13.2-newlib-head.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
%include %{_configdir}/checks.cfg
%include %{_configdir}/base.cfg

%define gcc_version 13.2.0
%source set gcc https://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-%{gcc_version}.tar.xz
%hash sha512 gcc-%{gcc_version}.tar.xz \
2Z5IJqcNsEUERn40np+67apYcHZs2nxcq1DN6+3EvnVevKW3ieEjKjSiC+GgtgCX3pKA7+R723HHMlHjCwhiog==

%define newlib_version 3cacedb
%define newlib_external 1
%define newlib_expand_name sourceware-mirror-newlib-cygwin-%{newlib_version}
%source set newlib --rsb-file=newlib-%{newlib_version}.tar.gz https://codeload.github.com/RTEMS/sourceware-mirror-newlib-cygwin/tar.gz/%{newlib_version}
%hash sha512 newlib-%{newlib_version}.tar.gz \
ia0ce+bdENUO3qYj00jrZB8FjSejmTWuRqEdNE8nI2llf30mh8leUn5fCoHB0Oa7rRVBjEu3n0F12ZK9skuegQ==

%define with_threads 1
%define with_plugin 0
%define with_iconv 1

%include %{_configdir}/gcc-13.cfg

0 comments on commit 71bb33b

Please sign in to comment.